From 951bc8ab165d20f7706c8efa92ae33f173b8fd7f Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Sat, 25 Mar 2023 12:11:20 -0600 Subject: [PATCH] Update versions for Gradle and GE plugins * Update Gradle Enterprise plugin to 3.12.6 * Update CCUD plugin to 1.10 * Update Gradle to 8.0.2 * Use latest patch versions of Gradle 6.x and 7.x --- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .github/workflow-samples/groovy-dsl/settings.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../workflow-samples/kotlin-dsl/settings.gradle.kts | 4 ++-- .../workflow-samples/no-wrapper-gradle-5/build.gradle | 2 +- .github/workflow-samples/no-wrapper/settings.gradle | 2 +- .github/workflows/ci-quick-check.yml | 2 +- test/init-scripts/settings.gradle | 4 ++-- .../gradle/gradlebuildaction/BaseInitScriptTest.groovy | 10 +++++----- test/jest/cache-cleanup.test.ts | 2 +- 12 files changed, 23 insertions(+), 23 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 f396aaa..19acfb4 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=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 f396aaa..19acfb4 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=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index 2810951..ce2d92d 100644 --- a/.github/workflow-samples/groovy-dsl/settings.gradle +++ b/.github/workflow-samples/groovy-dsl/settings.gradle @@ -1,6 +1,6 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.8.2" + id "com.gradle.enterprise" version "3.12.6" + id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10" } gradleEnterprise { 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 f396aaa..19acfb4 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=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists 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 f396aaa..19acfb4 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=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionSha256Sum=ff7bf6a86f09b9b2c40bb8f48b25fc19cf2b2664fd1d220cd7ab833ec758d0d7 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index d643cdc..55dc7ab 100644 --- a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts +++ b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("com.gradle.enterprise") version "3.12.3" - id("com.gradle.common-custom-user-data-gradle-plugin") version "1.8.2" + id("com.gradle.enterprise") version "3.12.6" + id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10" } gradleEnterprise { diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index ecd5d1a..b404213 100644 --- a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle +++ b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.build-scan" version "3.12.3" + id "com.gradle.build-scan" version "3.12.6" } gradleEnterprise { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index 9ea5a10..dad5f1e 100644 --- a/.github/workflow-samples/no-wrapper/settings.gradle +++ b/.github/workflow-samples/no-wrapper/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.enterprise" version "3.12.6" } gradleEnterprise { diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml index ac1e174..9981deb 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: 7.6 + gradle-version: 7.6.1 - name: Run tests run: | npm install diff --git a/test/init-scripts/settings.gradle b/test/init-scripts/settings.gradle index 07411a9..0cdaecf 100644 --- a/test/init-scripts/settings.gradle +++ b/test/init-scripts/settings.gradle @@ -1,6 +1,6 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.8.2" + id "com.gradle.enterprise" version "3.12.6" + id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10" } gradleEnterprise { 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 08779e1..61b7c2c 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 @@ -21,9 +21,9 @@ class BaseInitScriptTest extends Specification { static final TestGradleVersion GRADLE_4_X = new TestGradleVersion(GradleVersion.version('4.10.3'), 7, 10) static final TestGradleVersion GRADLE_5_X = new TestGradleVersion(GradleVersion.version('5.6.4'), 8, 12) static final TestGradleVersion GRADLE_6_NO_BUILD_SERVICE = new TestGradleVersion(GradleVersion.version('6.5.1'), 8, 14) - static final TestGradleVersion GRADLE_6_X = new TestGradleVersion(GradleVersion.version('6.9.3'), 8, 15) - static final TestGradleVersion GRADLE_7_X = new TestGradleVersion(GradleVersion.version('7.6'), 8, 19) - static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.0.1'), 8, 19) + 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.1'), 8, 19) + static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.0.2'), 8, 19) static final List ALL_VERSIONS = [ GRADLE_3_X, // First version where TestKit supports environment variables @@ -134,7 +134,7 @@ class BaseInitScriptTest extends Specification { } else { """ plugins { - id 'com.gradle.enterprise' version '3.12.3' + id 'com.gradle.enterprise' version '3.12.6' } gradleEnterprise { server = '$mockScansServer.address' @@ -160,7 +160,7 @@ class BaseInitScriptTest extends Specification { } else if (gradleVersion < GradleVersion.version('6.0')) { """ plugins { - id 'com.gradle.build-scan' version '3.12.3' + id 'com.gradle.build-scan' version '3.12.6' } gradleEnterprise { server = '$mockScansServer.address' diff --git a/test/jest/cache-cleanup.test.ts b/test/jest/cache-cleanup.test.ts index 315c02e..f491608 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 gradle733 = path.resolve(gradleUserHome, "caches/7.3.3") const wrapper733 = path.resolve(gradleUserHome, "wrapper/dists/gradle-7.3.3-bin") - const gradleCurrent = path.resolve(gradleUserHome, "caches/7.6") + const gradleCurrent = path.resolve(gradleUserHome, "caches/7.6.1") expect(fs.existsSync(gradle733)).toBe(true) expect(fs.existsSync(wrapper733)).toBe(true)