Use "release" option to fix Java 8 binary compatibility

marianobarrios · Jul 6, 2024 · 1b3f183 · 1b3f183
1 parent 8263cd5
commit 1b3f183
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,6 +14,7 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
+          # The target JDK is used to build, the latest one to run Gradle itself
           java-version: |
             ${{ matrix.java-version }}
             21

diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,7 @@ plugins {
 var javaToolchain = System.getenv('JAVA_TOOLCHAIN')
 
 java {
+    // If running from CI, the tool chain will be present
     if (javaToolchain != null) {
         toolchain {
             languageVersion = JavaLanguageVersion.of(javaToolchain)
@@ -17,14 +18,16 @@ java {
 }
 
 compileJava {
-    sourceCompatibility = '8'
-    targetCompatibility = '8'
+    if (JavaVersion.current().getMajorVersion() >= JavaVersion.VERSION_1_9.getMajorVersion()) {
+        options.release = 8
+    }
     options.compilerArgs.add('-Xlint')
 }
 
 compileTestJava {
-    sourceCompatibility = '8'
-    targetCompatibility = '8'
+    if (JavaVersion.current() >= JavaVersion.VERSION_1_9) {
+        options.release = 8
+    }
     options.compilerArgs.add('-Xlint')
 }