use Java 21 with language level 17 for JavaFX

xzel23 · Nov 2, 2024 · feff093 · feff093
1 parent 4f1c873
commit feff093
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/meja-fx/build.gradle.kts b/meja-fx/build.gradle.kts
@@ -4,6 +4,8 @@ java {
     toolchain { languageVersion.set(JavaLanguageVersion.of(21)) }
     withJavadocJar()
     withSourcesJar()
+
+    // JavaFX 21 is needed, but it is compatible with Java 17, so use Java 17 as language setting
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }

diff --git a/meja-samples-fx/build.gradle.kts b/meja-samples-fx/build.gradle.kts
@@ -4,6 +4,23 @@ plugins {
 
 description = "Meja spreadsheet library - samples (JavaFX)"
 
+val javaToolVersion = JavaLanguageVersion.of(21)
+val javaCompatibility = JavaVersion.VERSION_17
+
+java {
+    toolchain { languageVersion.set(javaToolVersion) }
+
+    // JavaFX 21 is needed, but it is compatible with Java 17, so use Java 17 as language setting
+    sourceCompatibility = javaCompatibility
+    targetCompatibility = javaCompatibility
+}
+
+fun JavaExec.useToolchain() {
+    javaLauncher.set(javaToolchains.launcherFor {
+        languageVersion.set(javaToolVersion)
+    })
+}
+
 dependencies {
     implementation(project(":meja"))
     implementation(project(":meja-generic"))
@@ -24,12 +41,14 @@ val runExcelViewer = task<JavaExec>("runExcelViewer") {
     classpath = sourceSets["main"].runtimeClasspath
     mainClass.set("com.dua3.meja.fx.samples.FxExcelViewer")
     enableAssertions = true
+    useToolchain()
 }
 
 val runKitchenSink = task<JavaExec>("runKitchenSink") {
     classpath = sourceSets["main"].runtimeClasspath
     mainClass.set("com.dua3.meja.fx.samples.FxKitchenSink")
     enableAssertions = true
+    useToolchain()
 }
 /*
 val runTableModel = task<JavaExec>("runTableModel") {
@@ -48,10 +67,12 @@ val runShowTestXlsx = task<JavaExec>("runFxShowTestXlsx") {
     classpath = sourceSets["main"].runtimeClasspath
     mainClass.set("com.dua3.meja.fx.samples.FxShowTestXlsx")
     enableAssertions = true
+    useToolchain()
 }
 
 val runShowTestXlsxNoEA = task<JavaExec>("runFxShowTestXlsx (no assertions)") {
     classpath = sourceSets["main"].runtimeClasspath
     mainClass.set("com.dua3.meja.fx.samples.FxShowTestXlsx")
     enableAssertions = false
+    useToolchain()
 }