From 5f21a9bb99eeb5a83681108b20b2e7f4bd2fbb32 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Thu, 14 Nov 2024 13:48:42 -0700 Subject: [PATCH] Bump Gradle from 8.10.2 to 8.11 (#443) Co-authored-by: bot-githubaction --- .../gradle-plugin/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../groovy-dsl/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../kotlin-dsl/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .github/workflows/integ-test-provision-gradle-versions.yml | 2 +- .../workflows/integ-test-restore-configuration-cache.yml | 7 ------- docs/deprecation-upgrade-guide.md | 2 +- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 2 +- 9 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties index fb602ee..82dd18b 100644 --- a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties index fb602ee..82dd18b 100644 --- a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties index fb602ee..82dd18b 100644 --- a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties index fb602ee..82dd18b 100644 --- a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.properties index fb602ee..82dd18b 100644 --- a/.github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/non-executable-wrapper/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflows/integ-test-provision-gradle-versions.yml b/.github/workflows/integ-test-provision-gradle-versions.yml index 3ca7d35..6c30d5c 100644 --- a/.github/workflows/integ-test-provision-gradle-versions.yml +++ b/.github/workflows/integ-test-provision-gradle-versions.yml @@ -78,7 +78,7 @@ jobs: strategy: fail-fast: false matrix: - gradle: ["8.10", 8.9, 8.1, 7.6.4, 6.9.4, 5.6.4, 4.10.3, 3.5.1] + gradle: ["8.11", 8.9, 8.1, 7.6.4, 6.9.4, 5.6.4, 4.10.3, 3.5.1] os: ${{fromJSON(inputs.runner-os)}} include: - java-version: 11 diff --git a/.github/workflows/integ-test-restore-configuration-cache.yml b/.github/workflows/integ-test-restore-configuration-cache.yml index 1881fcc..456398c 100644 --- a/.github/workflows/integ-test-restore-configuration-cache.yml +++ b/.github/workflows/integ-test-restore-configuration-cache.yml @@ -45,7 +45,6 @@ jobs: cache-read-only: false # For testing, allow writing cache entries on non-default branches cache-write-only: true # Ensure we start with a clean cache entry cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Groovy build with configuration-cache enabled working-directory: .github/workflow-samples/groovy-dsl run: gradle test --configuration-cache @@ -73,7 +72,6 @@ jobs: cache-read-only: false cache-cleanup: on-success cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Groovy build with configuration-cache enabled id: execute working-directory: .github/workflow-samples/groovy-dsl @@ -109,7 +107,6 @@ jobs: with: cache-read-only: true cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Groovy build with configuration-cache enabled id: execute working-directory: .github/workflow-samples/groovy-dsl @@ -147,7 +144,6 @@ jobs: with: cache-read-only: true cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Check execute Gradle build with configuration cache enabled (but not restored) working-directory: .github/workflow-samples/groovy-dsl run: gradle test --configuration-cache @@ -173,7 +169,6 @@ jobs: cache-read-only: false # For testing, allow writing cache entries on non-default branches cache-write-only: true # Ensure we start with a clean cache entry cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Execute 'help' with configuration-cache enabled working-directory: .github/workflow-samples/kotlin-dsl run: gradle help --configuration-cache @@ -200,7 +195,6 @@ jobs: with: cache-read-only: false # For testing, allow writing cache entries on non-default branches cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Execute 'test' with configuration-cache enabled working-directory: .github/workflow-samples/kotlin-dsl run: gradle test --configuration-cache @@ -228,7 +222,6 @@ jobs: with: cache-read-only: true cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - gradle-version: 8.6 - name: Execute 'test' again with configuration-cache enabled id: execute working-directory: .github/workflow-samples/kotlin-dsl diff --git a/docs/deprecation-upgrade-guide.md b/docs/deprecation-upgrade-guide.md index a940c0b..7cf9321 100644 --- a/docs/deprecation-upgrade-guide.md +++ b/docs/deprecation-upgrade-guide.md @@ -101,7 +101,7 @@ The exact syntax depends on whether or not your project is configured with the [ - name: Setup Gradle for a non-wrapper project uses: gradle/actions/setup-gradle@v4 with: - gradle-version: "8.10" + gradle-version: "8.11" - name: Assemble the project run: gradle assemble diff --git a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy index 0ffe7b5..d05bf3a 100644 --- a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy +++ b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy @@ -28,7 +28,7 @@ class BaseInitScriptTest extends Specification { static final TestGradleVersion GRADLE_7_1 = new TestGradleVersion(GradleVersion.version('7.1.1'), 8, 16) static final TestGradleVersion GRADLE_7_X = new TestGradleVersion(GradleVersion.version('7.6.2'), 8, 19) static final TestGradleVersion GRADLE_8_0 = new TestGradleVersion(GradleVersion.version('8.0.2'), 8, 19) - static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.10'), 8, 23) + static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.11'), 8, 23) static final List ALL_VERSIONS = [ GRADLE_3_X, // First version where TestKit supports environment variables