From 18f0339f1f27958b6b387697bafa1e3249aa55de Mon Sep 17 00:00:00 2001
From: "Dr. Ernie Prabhakar" <19791+drernie@users.noreply.github.com>
Date: Sat, 21 Dec 2024 15:45:21 -0800
Subject: [PATCH] use javaLangVersion for toolchain

---
 build.gradle                                              | 6 +++---
 .../groovy/io.nextflow.groovy-common-conventions.gradle   | 8 ++++----
 gradle.properties                                         | 2 +-
 plugins/nf-quilt/build.gradle                             | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index d51dcfac..e2f6da64 100644
--- 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
index 86c9fef2..4a077d92 100644
--- 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
index f3c9761e..e25f3a34 100644
--- 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
index 69bcf21e..b348d25d 100644
--- 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 {