Update to the latest build conventions and workflows

creek-service · Mar 22, 2023 · 2fccd43 · 2fccd43
1 parent 35182cb
commit 2fccd43
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
         with:
-          java-version: '11' # Gradle 6.4 requires an older JDK
+          java-version: '17'
           distribution: 'adopt'
           cache: gradle
       - name: Build

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
         with:
-          java-version: '11' # Gradle 6.4 requires an older JDK
+          java-version: '17'
           distribution: 'adopt'
           cache: gradle
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
         with:
-          java-version: '11' # Gradle 6.4 requires an older JDK
+          java-version: '17'
           distribution: 'adopt'
           cache: gradle
       - name: Ensure build is green

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
         with:
-          java-version: '11' # Gradle 6.4 requires an older JDK
+          java-version: '17'
           distribution: 'adopt'
           cache: gradle
       - name: Increment version

diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts
@@ -19,7 +19,8 @@
  *
  * <p>Apply to all java modules, usually excluding the root project in multi-module sets.
  *
- * <p>Version: 1.5
+ * <p>Version: 1.7
+ *  - 1.7: Switch to setting Java version via toolchain
  *  - 1.6: Remove GitHub packages for snapshots
  *  - 1.5: Add filters to exclude generated sources
  *  - 1.4: Add findsecbugs-plugin
@@ -36,8 +37,9 @@ plugins {
 group = "org.creekservice"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 repositories {