Bump java settings

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
seqeralabs · Jan 27, 2025 · 1f6b94d · 1f6b94d
1 parent facbf99
commit 1f6b94d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/buildSrc/src/main/groovy/io.seqera.wave.groovy-common-conventions.gradle b/buildSrc/src/main/groovy/io.seqera.wave.groovy-common-conventions.gradle
@@ -13,18 +13,12 @@ repositories {
 }
 
 java {
+    // these settings apply to all jvm tooling, including groovy
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
     }
-}
-
-compileJava {
-    options.release.set(17)
-}
-
-tasks.withType(GroovyCompile).configureEach {
-    sourceCompatibility = '17'
-    targetCompatibility = '17'
+    sourceCompatibility = 17
+    targetCompatibility = 17
 }
 
 group = 'io.seqera'
diff --git a/buildSrc/src/main/groovy/io.seqera.wave.java-library-conventions.gradle b/buildSrc/src/main/groovy/io.seqera.wave.java-library-conventions.gradle
@@ -15,18 +15,12 @@ repositories {
 }
 
 java {
+    // these settings apply to all jvm tooling, including groovy
     toolchain {
         languageVersion = JavaLanguageVersion.of(21)
     }
-}
-
-compileJava {
-    options.release.set(17)
-}
-
-tasks.withType(GroovyCompile).configureEach {
-    sourceCompatibility = '17'
-    targetCompatibility = '17'
+    sourceCompatibility = 17
+    targetCompatibility = 17
 }
 
 test {