ci: switch to using language toolchains

daschl · daschl · commit 81b009db9de9 · 2025-10-02T14:53:58.000+02:00
diff --git a/.github/workflows/ci-netty-snapshot.yml b/.github/workflows/ci-netty-snapshot.yml
@@ -20,12 +20,17 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 21 (Gradle Execution)
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'zulu'
           cache: 'gradle'
+      - name: Set up JDK ${{ matrix.java }} (Toolchain)
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
       - name: Print JDK Version
         run: java -version
       - name: Make gradlew Executable
@@ -37,6 +42,8 @@ jobs:
       - name: Clean Gradle project
         run: ./gradlew --parallel clean
       - name: Build and Test
+        env:
+          ORG_GRADLE_PROJECT_testJavaVersion: ${{ matrix.java }}
         run:  sudo -E env "PATH=$PATH" bash -c "ulimit -l 65536 && ulimit -a && ./gradlew --no-daemon --parallel test"
       - name: Publish Test Results
         if: always()
diff --git a/.github/workflows/ci-prb.yml b/.github/workflows/ci-prb.yml
@@ -13,7 +13,7 @@ on:
       - '**.txt'
 jobs:
   build:
-    name: JDK ${{ matrix.java }} ${{ matrix.os_label }}
+    name: JDK ${{ matrix.java }} Toolchain (Gradle on JDK 21)
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -27,12 +27,17 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 21 (Gradle Execution)
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'zulu'
           cache: 'gradle'
+      - name: Set up JDK ${{ matrix.java }} (Toolchain)
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
       - name: Print JDK Version
         run: java -version
       - name: Make gradlew Executable
@@ -51,11 +56,13 @@ jobs:
         if: runner.os == 'Linux'
         env:
           JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+          ORG_GRADLE_PROJECT_testJavaVersion: ${{ matrix.java }}
         run:  sudo -E env "PATH=$PATH" bash -c "ulimit -l 65536 && ulimit -a && ./gradlew --no-daemon --parallel test"
       - name: Build and Test (non-Linux)
         if: runner.os != 'Linux'
         env:
           JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8
+          ORG_GRADLE_PROJECT_testJavaVersion: ${{ matrix.java }}
         run: ./gradlew --no-daemon --parallel test
       - name: Upload Test Results
         if: always()
diff --git a/.github/workflows/ci-prq.yml b/.github/workflows/ci-prq.yml
@@ -12,20 +12,25 @@ on:
       - '*.txt'
 jobs:
   quality:
-    name: JDK ${{ matrix.java }}
+    name: JDK ${{ matrix.java }} Toolchain (Gradle on JDK 21)
     runs-on: ubuntu-latest
     strategy:
       matrix:
         java: [ 8, 11 ] # These are the JDK's we publish artifacts with.
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 21 (Gradle Execution)
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'zulu'
           cache: 'gradle'
+      - name: Set up JDK ${{ matrix.java }} (Toolchain)
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
       - name: Print JDK Version
         run: java -version
       - name: Make gradlew Executable
@@ -37,6 +42,8 @@ jobs:
       - name: Clean Gradle project
         run: ./gradlew --parallel clean
       - name: Build with Gradle
+        env:
+          ORG_GRADLE_PROJECT_testJavaVersion: ${{ matrix.java }}
         run: ./gradlew --parallel -Pdependency.analysis.print.build.health=true quality
       - name: Upload CheckStyle Results
         if: always()
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
@@ -6,7 +6,7 @@ on:
       - "[0-9]+.[0-9]+.[0-9]+.[0-9]+"
 jobs:
   build:
-    name: Release JDK ${{ matrix.java }}
+    name: Release JDK ${{ matrix.java }} Toolchain (Gradle on JDK 21)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -17,12 +17,17 @@ jobs:
         uses: actions/checkout@v4
       - name: Check NO SNAPSHOT version suffix
         run: if [[ $(cat gradle.properties | grep version= | sed 's/^version=//') =~ .*-SNAPSHOT ]]; then exit 1; else exit 0; fi
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 21 (Gradle Execution)
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'zulu'
           cache: 'gradle'
+      - name: Set up JDK ${{ matrix.java }} (Toolchain)
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
       - name: Print JDK Version
         run: java -version
       - name: Make gradlew Executable
@@ -35,6 +40,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_TOKEN: ${{ secrets.SONATYPE_TOKEN }}
+          ORG_GRADLE_PROJECT_testJavaVersion: ${{ matrix.java }}
         run: |
           # Build arguments to feed to the single gradlew publish command
           if [ "${{ matrix.java }}" = "8" ]; then
diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml
@@ -16,7 +16,7 @@ on:
       - '*.txt'
 jobs:
   build:
-    name: Snapshot JDK ${{ matrix.java }}
+    name: Snapshot JDK ${{ matrix.java }} Toolchain (Gradle on JDK 21)
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -27,12 +27,17 @@ jobs:
         uses: actions/checkout@v4
       - name: Check SNAPSHOT version suffix
         run: if [[ $(cat gradle.properties | grep version= | sed 's/^version=//') =~ .*-SNAPSHOT ]]; then exit 0; else exit 1; fi
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK 21 (Gradle Execution)
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
           distribution: 'zulu'
           cache: 'gradle'
+      - name: Set up JDK ${{ matrix.java }} (Toolchain)
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'zulu'
       - name: Print JDK Version
         run: java -version
       - name: Make gradlew Executable
@@ -45,6 +50,7 @@ jobs:
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.ORG_GRADLE_PROJECT_SIGNINGPASSWORD }}
           SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
           SONATYPE_TOKEN: ${{ secrets.SONATYPE_TOKEN }}
+          ORG_GRADLE_PROJECT_testJavaVersion: ${{ matrix.java }}
         run: |
           # Build arguments to feed to the single gradlew publish command
           if [ "${{ matrix.java }}" = "8" ]; then
diff --git a/build.gradle b/build.gradle
@@ -50,44 +50,40 @@ buildscript {
     }
   }
   dependencies {
-    if (JavaVersion.current().isJava11Compatible()) {
-      classpath("com.autonomousapps:dependency-analysis-gradle-plugin:$dependencyAnalysisPluginVersion")
-    }
+    // With toolchains, the dependency analysis plugin can always be applied since Gradle runs on JDK 17+
+    classpath("com.autonomousapps:dependency-analysis-gradle-plugin:$dependencyAnalysisPluginVersion")
   }
 }
 
 apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-root"
 
-// Unfortunately, we can not make this validation part of our servicetalk-gradle-plugin-internal because it requires
-// JDK11 while we build and package our plugin with JDK8.
-if (JavaVersion.current().isJava11Compatible()) {
-  apply plugin: "com.autonomousapps.dependency-analysis"
+// With toolchains, Gradle always runs on JDK 17+ so dependency analysis can always be applied
+apply plugin: "com.autonomousapps.dependency-analysis"
 
-  dependencyAnalysis {
-    issues {
-      all {
-        onAny {
-          severity("fail")
-        }
-        onUnusedDependencies {
-          // We use it for log4j2.xml configuration
-          exclude(":servicetalk-test-resources")
-        }
-        onUsedTransitiveDependencies {
-          // We import it as api dependency via :servicetalk-annotations
-          exclude("com.google.code.findbugs:jsr305")
-        }
-        onIncorrectConfiguration {
-          // We import it as api dependency via :servicetalk-annotations
-          exclude("com.google.code.findbugs:jsr305")
-        }
+dependencyAnalysis {
+  issues {
+    all {
+      onAny {
+        severity("fail")
+      }
+      onUnusedDependencies {
+        // We use it for log4j2.xml configuration
+        exclude(":servicetalk-test-resources")
+      }
+      onUsedTransitiveDependencies {
+        // We import it as api dependency via :servicetalk-annotations
+        exclude("com.google.code.findbugs:jsr305")
+      }
+      onIncorrectConfiguration {
+        // We import it as api dependency via :servicetalk-annotations
+        exclude("com.google.code.findbugs:jsr305")
       }
     }
   }
-
-  quality.dependsOn buildHealth
 }
 
+quality.dependsOn buildHealth
+
 task validateLocalDocSite(type: Exec) {
   group = 'Documentation'
   description = 'Generate and validate servicetalk.io site documentation'
@@ -97,8 +93,11 @@ task validateLocalDocSite(type: Exec) {
 quality.dependsOn validateLocalDocSite
 
 subprojects {
-  // mockito 5 only supports jdk11+
-  if (JavaVersion.current() < JavaVersion.VERSION_11) {
+  // mockito 5 only supports jdk11+, but with toolchains we check the toolchain version, not Gradle's JVM
+  def toolchainVersion = project.hasProperty('testJavaVersion')
+    ? Integer.parseInt(project.property('testJavaVersion').toString())
+    : 8
+  if (toolchainVersion < 11) {
     project.setProperty("mockitoCoreVersion", mockitoCorePreJdk11Version)
   } else {
     apply plugin: "com.autonomousapps.dependency-analysis"
diff --git a/gradle.properties b/gradle.properties
@@ -19,6 +19,7 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.java.installations.auto-download=false
+org.gradle.java.installations.auto-detect=true
 org.gradle.jvmargs=-Xms2g -Xmx4g -dsa -da -ea:io.servicetalk... -XX:+HeapDumpOnOutOfMemoryError
 
 # project metadata used for publications
diff --git a/servicetalk-concurrent-jdkflow/build.gradle b/servicetalk-concurrent-jdkflow/build.gradle
@@ -19,7 +19,10 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_1_9
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
     project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-data-jackson-jersey3-jakarta10/build.gradle b/servicetalk-data-jackson-jersey3-jakarta10/build.gradle
@@ -19,7 +19,10 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_11
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
   project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-data-jackson-jersey3-jakarta9/build.gradle b/servicetalk-data-jackson-jersey3-jakarta9/build.gradle
@@ -19,7 +19,10 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_11
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
   project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle b/servicetalk-data-protobuf-jersey3-jakarta10/build.gradle
@@ -26,7 +26,10 @@ apply plugin: "com.google.protobuf"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_11
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
   project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle b/servicetalk-data-protobuf-jersey3-jakarta9/build.gradle
@@ -26,7 +26,10 @@ apply plugin: "com.google.protobuf"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_11
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
   project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy b/servicetalk-gradle-plugin-internal/src/main/groovy/io/servicetalk/gradle/plugin/internal/ServiceTalkLibraryPlugin.groovy
@@ -24,6 +24,7 @@ import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 
 import static io.servicetalk.gradle.plugin.internal.ProjectUtils.addManifestAttributes
 import static io.servicetalk.gradle.plugin.internal.ProjectUtils.addQualityTask
@@ -57,13 +58,29 @@ final class ServiceTalkLibraryPlugin extends ServiceTalkCorePlugin {
       pluginManager.apply("java-library")
 
       java {
+        // Keep explicit source/target compatibility
         sourceCompatibility = TARGET_VERSION
         targetCompatibility = TARGET_VERSION
+
+        // Configure Java toolchain - defaults to Java 8, but can be overridden via testJavaVersion property
+        toolchain {
+          languageVersion = JavaLanguageVersion.of(
+            project.hasProperty('testJavaVersion')
+              ? project.property('testJavaVersion') as Integer
+              : Integer.parseInt(TARGET_VERSION.getMajorVersion())
+          )
+        }
       }
 
       def javaRelease = Integer.parseInt(TARGET_VERSION.getMajorVersion())
 
-      if (JavaVersion.current().isJava9Compatible()) {
+      // Determine the toolchain version being used
+      def toolchainVersion = project.hasProperty('testJavaVersion')
+        ? Integer.parseInt(project.property('testJavaVersion').toString())
+        : Integer.parseInt(TARGET_VERSION.getMajorVersion())
+
+      // Only use --release flag if toolchain is Java 9+, since --release was added in Java 9
+      if (toolchainVersion >= 9) {
         compileJava {
           options.release = javaRelease
         }
diff --git a/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle b/servicetalk-http-router-jersey3-jakarta10-internal/build.gradle
@@ -19,7 +19,10 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_11
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
   project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-http-router-jersey3-jakarta10/build.gradle b/servicetalk-http-router-jersey3-jakarta10/build.gradle
@@ -19,7 +19,10 @@ apply plugin: "io.servicetalk.servicetalk-gradle-plugin-internal-library"
 // Required version for module
 def javaLanguageVersion = JavaVersion.VERSION_11
 
-if (!JavaVersion.current().isCompatibleWith(javaLanguageVersion)) {
+def toolchainVersion = project.hasProperty('testJavaVersion')
+  ? Integer.parseInt(project.property('testJavaVersion').toString())
+  : 8
+if (toolchainVersion < Integer.parseInt(javaLanguageVersion.getMajorVersion())) {
   project.tasks.all { task -> task.enabled = false }
 }
 
diff --git a/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle b/servicetalk-http-router-jersey3-jakarta9-internal/build.gradle
diff --git a/servicetalk-http-router-jersey3-jakarta9/build.gradle b/servicetalk-http-router-jersey3-jakarta9/build.gradle
diff --git a/servicetalk-http-security-jersey3-jakarta10/build.gradle b/servicetalk-http-security-jersey3-jakarta10/build.gradle
diff --git a/servicetalk-http-security-jersey3-jakarta9/build.gradle b/servicetalk-http-security-jersey3-jakarta9/build.gradle
