Upgrade to Gradle 8 allowing build with Java 17

gocd-contrib · Jul 15, 2023 · f4011a9 · f4011a9
1 parent 2529998
commit f4011a9
Show file tree

Hide file tree

Showing 9 changed files with 195 additions and 128 deletions.
diff --git a/.github/workflows/pr_workflow.yml b/.github/workflows/pr_workflow.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Build with Gradle
         run: ./gradlew assemble check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Release
         run: ./gradlew githubRelease
diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Test with Gradle
         run: ./gradlew assemble check
@@ -32,7 +32,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Test with Gradle
         run: ./gradlew githubRelease
diff --git a/build.gradle b/build.gradle
@@ -15,14 +15,12 @@
  */
 plugins {
     id 'java'
-    id 'co.riiid.gradle' version '0.4.2'
+    id 'io.github.humblerookie.gradle' version '0.5.0'
 }
 
 apply from: 'plugin-helpers.gradle'
-apply plugin: 'co.riiid.gradle'
 
-
-project.ext.pluginVersion = '1.7.1'
+project.ext.pluginVersion = '1.7.2'
 project.ext.fullVersion = project.git.distVersion() ? "${project.pluginVersion}-${project.git.distVersion()}" : project.pluginVersion
 
 project.ext.pluginDesc = [

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-all.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists