revert compatibility changes

seqeralabs · May 27, 2024 · 28c6278 · 28c6278
1 parent 99225fd
commit 28c6278
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [17]
+        java_version: [11, 17]
 
     steps:
       - name: Environment
@@ -44,6 +44,9 @@ jobs:
           architecture: x64
           cache: gradle
 
+      - name: Set JAVA_VERSION environment variable
+        run: echo "JAVA_VERSION=${{ matrix.java-version }}" >> $GITHUB_ENV
+
       - name: Compile
         run: |
           ./gradlew compileJava

diff --git a/buildSrc/src/main/groovy/io.seqera.groovy-common-conventions.gradle b/buildSrc/src/main/groovy/io.seqera.groovy-common-conventions.gradle
@@ -22,9 +22,13 @@ compileJava {
     options.release.set(11)
 }
 
+// Read the javaVersion from environment variable or Gradle property
+def javaVersion = System.getenv('JAVA_VERSION') ?: project.findProperty('javaVersion') ?: '17'
+
+// Configure the Groovy compile tasks using the javaVersion
 tasks.withType(GroovyCompile) {
-    sourceCompatibility = '17'
-    targetCompatibility = '17'
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
 }
 
 group = 'io.seqera'