use javaLangVersion for toolchain

quiltdata · Dec 21, 2024 · 18f0339 · 18f0339
1 parent d1f4621
commit 18f0339
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,7 +66,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(19)
+            languageVersion = JavaLanguageVersion.of(javaLangVersion)
         }
     }
 
@@ -75,8 +75,8 @@ allprojects {
     }
 
     tasks.withType(GroovyCompile).configureEach {
-        sourceCompatibility = javaLangVersion
-        targetCompatibility = javaLangVersion
+        sourceCompatibility = jdkVersion
+        targetCompatibility = jdkVersion
     }
 
     idea {

diff --git a/buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle b/buildSrc/src/main/groovy/io.nextflow.groovy-common-conventions.gradle
@@ -14,12 +14,12 @@ repositories {
 
 ext {
     jdkVersion = '11'
-    javaLanguageVersion = JavaLanguageVersion.of(jdkVersion)
+    javaLangVersion = 19
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(19) // from nf-schema
+        languageVersion = JavaLanguageVersion.of(javaLangVersion) // from nf-schema
     }
 }
 
@@ -28,8 +28,8 @@ compileJava {
 }
 
 tasks.withType(GroovyCompile) {
-    sourceCompatibility = javaLanguageVersion
-    targetCompatibility = javaLanguageVersion
+    sourceCompatibility = jdkVersion
+    targetCompatibility = jdkVersion
 }
 
 tasks.withType(Test) {

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 nextflowVersion = 23.10.0
 groovyVersion = 3.0.19
 jdkVersion = 11
-javaLangVersion = 11
+javaLangVersion = 19
diff --git a/plugins/nf-quilt/build.gradle b/plugins/nf-quilt/build.gradle
@@ -27,7 +27,7 @@ group = 'io.nextflow'
 // THE VERSION FOR PLUGINS IS DEFINED IN THE `/resources/META-INF/MANIFEST.NF` file
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(19)
+        languageVersion = JavaLanguageVersion.of(javaLangVersion)
     }
 }
 
@@ -36,8 +36,8 @@ compileJava {
 }
 
 tasks.withType(GroovyCompile) {
-    sourceCompatibility = javaLanguageVersion
-    targetCompatibility = javaLanguageVersion
+    sourceCompatibility = jdkVersion
+    targetCompatibility = jdkVersion
 }
 
 idea {