chore: Updates Eclipse dependencies

Note SWT now requires Java 17 https://www.eclipse.org/lists/cross-project-issues-dev/msg19636.html
bric3 · Jun 19, 2023 · 62b05bb · 62b05bb
1 parent b4167b9
commit 62b05bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -206,7 +206,7 @@ configure(listOf(project(":fireplace-swt-experiment-app"), project(":fireplace-s
                 }
 
                 substitute(module("org.eclipse.platform:org.eclipse.swt.\${osgi.platform}"))
-                    .using(module("org.eclipse.platform:org.eclipse.swt.$osId.$archId:${rootProject.libs.versions.swt.get()}"))
+                    .using(module("org.eclipse.platform:org.eclipse.swt.$osId.$archId:${rootProject.libs.versions.eclipse.swt.get()}"))
                     .because("The maven property '\${osgi.platform}' that appear in the artifact coordinate is not handled by Gradle, it is required to replace the dependency")
             }
         }

diff --git a/fireplace-swt-experiment-app/build.gradle.kts b/fireplace-swt-experiment-app/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -50,7 +50,9 @@ tasks.jar {
         "Implementation-Title" to project.name,
         "Implementation-Version" to project.version,
         "Automatic-Module-Name" to project.name.replace('-', '.'),
-        "Created-By" to "${providers.systemProperty("java.version").get()} (${providers.systemProperty("java.specification.vendor").get()})",
+        "Created-By" to "${
+            providers.systemProperty("java.version").get()
+        } (${providers.systemProperty("java.specification.vendor").get()})",
     )
 }
 
@@ -60,7 +62,7 @@ tasks.test {
 
 tasks.withType(JavaCompile::class) {
     options.compilerArgs.addAll(arrayOf("-Xlint"))
-    options.release.set(11)
+    options.release.set(17)
 }
 
 
@@ -70,7 +72,7 @@ tasks.withType<JavaExec>().configureEach {
     classpath(sourceSets.main.get().runtimeClasspath)
 
     // Need to set the toolchain https://github.com/gradle/gradle/issues/16791
-    // javaLauncher.set(javaToolchains.launcherFor(java.toolchain))  // Project toolchain
+    javaLauncher.set(javaToolchains.launcherFor(java.toolchain))
 
     if (DefaultNativePlatform.getCurrentOperatingSystem().isMacOsX) {
         jvmArgs("-XstartOnFirstThread")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,9 @@ assertj = "3.24.2"
 
 batik = "1.16"
 
-swt = "3.123.0"
+eclipse-swt = "3.124.0"
+eclipse-jface = "3.30.0"
+eclipse-ui-forms = "3.12.0"
 
 kotlin-coroutines = "1.7.1"
 
@@ -43,9 +45,9 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te
 batik-svggen = { module = "org.apache.xmlgraphics:batik-svggen", version.ref = "batik" }
 batik-dom = { module = "org.apache.xmlgraphics:batik-dom", version.ref = "batik" }
 
-eclipse-swt = { module ="org.eclipse.platform:org.eclipse.swt", version.ref = "swt" }
-eclipse-jface = { module ="org.eclipse.platform:org.eclipse.jface", version = "3.29.0" }
-eclipse-ui-forms = { module ="org.eclipse.platform:org.eclipse.ui.forms", version = "3.11.600" }
+eclipse-swt = { module = "org.eclipse.platform:org.eclipse.swt", version.ref = "eclipse-swt" }
+eclipse-jface = { module = "org.eclipse.platform:org.eclipse.jface", version.ref = "eclipse-jface" }
+eclipse-ui-forms = { module = "org.eclipse.platform:org.eclipse.ui.forms", version.ref = "eclipse-ui-forms" }
 
 [bundles]
 junit-jupiter = ["junit-jupiter-api", "junit-jupiter-engine"]