From 4301451b5355317c50db57f67ebcb52d7bd1013b Mon Sep 17 00:00:00 2001 From: daz Date: Tue, 11 Jul 2023 07:26:05 -0600 Subject: [PATCH] Bump to Gradle 8.2.1 --- .../gradle-plugin/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../groovy-dsl/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../java-toolchain/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../kotlin-dsl/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .github/workflows/ci-quick-check.yml | 2 +- .tool-versions | 2 +- test/init-scripts/gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 2 +- test/jest/cache-cleanup.test.ts | 2 +- 9 files changed, 14 insertions(+), 14 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 a7c2bd1..c244788 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=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-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 a7c2bd1..c244788 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=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-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 a7c2bd1..c244788 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=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-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 a7c2bd1..c244788 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=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml index 73d93b4..0a6b879 100644 --- a/.github/workflows/ci-quick-check.yml +++ b/.github/workflows/ci-quick-check.yml @@ -22,7 +22,7 @@ jobs: - name: Configure Gradle as default for unit test uses: ./ with: - gradle-version: 8.2 + gradle-version: 8.2.1 - name: Run tests run: | npm install diff --git a/.tool-versions b/.tool-versions index 0fe758b..ed24a61 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ # Configuration file for asdf version manager nodejs 16.18.1 -gradle 8.2 +gradle 8.2.1 diff --git a/test/init-scripts/gradle/wrapper/gradle-wrapper.properties b/test/init-scripts/gradle/wrapper/gradle-wrapper.properties index a7c2bd1..c244788 100644 --- a/test/init-scripts/gradle/wrapper/gradle-wrapper.properties +++ b/test/init-scripts/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy index 8cf8214..7dd337e 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy @@ -24,7 +24,7 @@ class BaseInitScriptTest extends Specification { static final TestGradleVersion GRADLE_6_X = new TestGradleVersion(GradleVersion.version('6.9.4'), 8, 15) 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.2'), 8, 19) + static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.2.1'), 8, 19) static final List ALL_VERSIONS = [ GRADLE_3_X, // First version where TestKit supports environment variables diff --git a/test/jest/cache-cleanup.test.ts b/test/jest/cache-cleanup.test.ts index 566bc45..c4a0533 100644 --- a/test/jest/cache-cleanup.test.ts +++ b/test/jest/cache-cleanup.test.ts @@ -49,7 +49,7 @@ test('will cleanup unused gradle versions', async () => { const gradle802 = path.resolve(gradleUserHome, "caches/8.0.2") const wrapper802 = path.resolve(gradleUserHome, "wrapper/dists/gradle-8.0.2-bin") - const gradleCurrent = path.resolve(gradleUserHome, "caches/8.2") + const gradleCurrent = path.resolve(gradleUserHome, "caches/8.2.1") expect(fs.existsSync(gradle802)).toBe(true) expect(fs.existsSync(wrapper802)).toBe(true)