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 eb1a55be..e1b837a1 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=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/gradle-plugin/gradlew b/.github/workflow-samples/gradle-plugin/gradlew index f5feea6d..f3b75f3b 100755 --- a/.github/workflow-samples/gradle-plugin/gradlew +++ b/.github/workflow-samples/gradle-plugin/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum 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 eb1a55be..e1b837a1 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=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/groovy-dsl/gradlew b/.github/workflow-samples/groovy-dsl/gradlew index f5feea6d..f3b75f3b 100755 --- a/.github/workflow-samples/groovy-dsl/gradlew +++ b/.github/workflow-samples/groovy-dsl/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum 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 eb1a55be..e1b837a1 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=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/java-toolchain/gradlew b/.github/workflow-samples/java-toolchain/gradlew index f5feea6d..f3b75f3b 100755 --- a/.github/workflow-samples/java-toolchain/gradlew +++ b/.github/workflow-samples/java-toolchain/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum 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 eb1a55be..e1b837a1 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=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/kotlin-dsl/gradlew b/.github/workflow-samples/kotlin-dsl/gradlew index f5feea6d..f3b75f3b 100755 --- a/.github/workflow-samples/kotlin-dsl/gradlew +++ b/.github/workflow-samples/kotlin-dsl/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/.github/workflows/ci-check-and-unit-test.yml b/.github/workflows/ci-check-and-unit-test.yml index c4b72c05..2a573ff3 100644 --- a/.github/workflows/ci-check-and-unit-test.yml +++ b/.github/workflows/ci-check-and-unit-test.yml @@ -29,7 +29,7 @@ jobs: env: ALLOWED_GRADLE_WRAPPER_CHECKSUMS: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # Invalid wrapper jar used for testing with: - gradle-version: "8.11.1" + gradle-version: "8.12" - name: Check formatting and compile run: | diff --git a/.github/workflows/integ-test-provision-gradle-versions.yml b/.github/workflows/integ-test-provision-gradle-versions.yml index 90d37267..4417efe8 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.11.1", 8.9, 8.1, 7.6.4, 6.9.4, 5.6.4, 4.10.3, 3.5.1] + gradle: ["8.12", 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/sources/.tool-versions b/sources/.tool-versions index 1726f37a..b03ead33 100644 --- a/sources/.tool-versions +++ b/sources/.tool-versions @@ -1,3 +1,3 @@ # Configuration file for asdf version manager nodejs 20.10.0 -gradle 8.11.1 +gradle 8.12 diff --git a/sources/src/caching/cache-cleaner.ts b/sources/src/caching/cache-cleaner.ts index 2151eb95..d8e0b237 100644 --- a/sources/src/caching/cache-cleaner.ts +++ b/sources/src/caching/cache-cleaner.ts @@ -55,9 +55,8 @@ export class CacheCleaner { ) fs.writeFileSync(path.resolve(cleanupProjectDir, 'build.gradle'), 'task("noop") {}') - // Gradle >= 8.11 required for cache cleanup // TODO: This is ineffective: we should be using the newest version of Gradle that ran a build, or a newer version if it's available on PATH. - const executable = await provisioner.provisionGradleAtLeast('8.11.1') + const executable = await provisioner.provisionGradleAtLeast('8.12') await core.group('Executing Gradle to clean up caches', async () => { core.info(`Cleaning up caches last used before ${cleanTimestamp}`) diff --git a/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties b/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties index eb1a55be..e1b837a1 100644 --- a/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties +++ b/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/sources/test/init-scripts/gradlew b/sources/test/init-scripts/gradlew index f5feea6d..f3b75f3b 100755 --- a/sources/test/init-scripts/gradlew +++ b/sources/test/init-scripts/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum 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 eac74e66..32e7b69f 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.11.1'), 8, 23) + static final TestGradleVersion GRADLE_8_X = new TestGradleVersion(GradleVersion.version('8.12'), 8, 23) static final List ALL_VERSIONS = [ GRADLE_3_X, // First version where TestKit supports environment variables diff --git a/sources/test/jest/cache-cleanup.test.ts b/sources/test/jest/cache-cleanup.test.ts index cca159e7..7a8f3358 100644 --- a/sources/test/jest/cache-cleanup.test.ts +++ b/sources/test/jest/cache-cleanup.test.ts @@ -53,7 +53,7 @@ test('will cleanup unused gradle versions', async () => { const transforms3 = path.resolve(gradleUserHome, "caches/transforms-3") const metadata100 = path.resolve(gradleUserHome, "caches/modules-2/metadata-2.100") const wrapper802 = path.resolve(gradleUserHome, "wrapper/dists/gradle-8.0.2-bin") - const gradleCurrent = path.resolve(gradleUserHome, "caches/8.11.1") + const gradleCurrent = path.resolve(gradleUserHome, "caches/8.12") const metadataCurrent = path.resolve(gradleUserHome, "caches/modules-2/metadata-2.107") expect(fs.existsSync(gradle802)).toBe(true)