Merge pull request #278 from Yubico/gradle-jdk

Don't prescribe which Java toolchain to use

Author: emlun

.github/workflows/build.yml

@@ -44,9 +44,6 @@ jobs:
     - name: Compile libraries and tests
       run: ./gradlew clean testClasses
 
-    - name: Build archives
-      run: ./gradlew assemble
-
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v3
       with:
@@ -56,6 +53,19 @@ jobs:
     - name: Run tests against JDK17-compiled code
       run: ./gradlew test --exclude-task compileJava
 
+    - name: Archive HTML test report on failure
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: test-reports-java17-java${{ matrix.java }}-${{ matrix.distribution }}-html
+        path: "*/build/reports/**"
+
+    - name: Build and test with JDK ${{ matrix.java }}
+      run: ./gradlew clean test
+
+    - name: Build archives
+      run: ./gradlew assemble
+
     - name: Archive HTML test report
       if: ${{ always() }}
       uses: actions/upload-artifact@v3
@@ -71,6 +81,7 @@ jobs:
         path: "*/build/test-results/**/*.xml"
 
     - name: Check binary reproducibility
+      if: ${{ matrix.java != 8 }}  # JDK 8 does not produce reproducible binaries
       run: |
         ./gradlew clean primaryPublishJar
         find . -name '*.jar' | xargs sha256sum | tee checksums.sha256sum

buildSrc/src/main/kotlin/project-convention-java.gradle.kts

@@ -2,22 +2,15 @@ plugins {
     java
 }
 
-java {
-    toolchain {
-        // Java 8 binaries are not reproducible
-        languageVersion.set(JavaLanguageVersion.of(11))
-    }
-}
-
 tasks.withType(JavaCompile::class) {
     options.compilerArgs.add("-Xlint:deprecation")
     options.compilerArgs.add("-Xlint:unchecked")
     options.encoding = "UTF-8"
-    options.release.set(8)
-}
 
-tasks.withType(Test::class) {
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    })
+    if (JavaVersion.current().isJava9Compatible) {
+        options.release.set(8)
+    } else {
+        targetCompatibility = "1.8"
+        sourceCompatibility = "1.8"
+    }
 }

buildSrc/src/main/kotlin/project-convention-scala.gradle.kts

@@ -8,7 +8,4 @@ tasks.withType(ScalaCompile::class) {
     // See: https://github.com/gradle/gradle/pull/23198
     // See: https://github.com/gradle/gradle/pull/23751
     scalaCompileOptions.additionalParameters = mutableListOf("-Wunused")
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    })
 }