Use JVM Toolchain

.github/workflows/callable.build.yml

@@ -11,10 +11,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

.github/workflows/callable.code-analysis.codeql.yml

@@ -35,10 +35,6 @@ jobs:
           # queries: security-extended,security-and-quality
           queries: security-extended,security-and-quality
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

.github/workflows/callable.code-analysis.trivy.yml

@@ -17,10 +17,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

.github/workflows/callable.gradle-release.yml

@@ -27,10 +27,6 @@ jobs:
         with:
           ref: main
           token: ${{ secrets.CI_GITHUB_TOKEN }}
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

.github/workflows/callable.integration-test.yml

@@ -11,10 +11,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

.github/workflows/callable.publish-javadoc.yml

@@ -14,10 +14,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

.github/workflows/callable.publish-sonatype.yml

@@ -10,10 +10,6 @@ jobs:
       - name: Checkout project sources
         uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
-        with:
-          distribution: 'corretto'
-          java-version: '21'
       - uses: gradle/wrapper-validation-action@v2
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3.1.0

java-library-template/build.gradle.kts

@@ -1,3 +1,13 @@
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
+
+plugins {
+    // Apply the java-library plugin for API and implementation separation.
+    `java-library`
+    `maven-publish`
+    signing
+}
+
 group = "dev.thriving.oss"
 
 object Meta {
@@ -14,14 +24,10 @@ object Meta {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_21
-}
-
-plugins {
-    // Apply the java-library plugin for API and implementation separation.
-    `java-library`
-    `maven-publish`
-    signing
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.AMAZON)
+    }
 }
 
 repositories {

settings.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "java-library-template"
 
 include("java-library-template")