From 5971332a8f9f37459fbe710cc8b2ec8f125cdf54 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Sat, 1 Aug 2026 20:29:23 -0600 Subject: [PATCH] Bump Gradle Wrapper to 9.6.1, wrapper checksums, and Develocity plugin to 4.5.0 (#1034) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidates seven open bot PRs into three commits. ## 1. Bump Gradle Wrapper from 9.5.1 to 9.6.1 Combines **#1008, #1009, #1010, #1011, #1012** into a single commit. Each of those PRs bumped the wrapper in one directory; this covers all five (15 files): - `sources/test/init-scripts` - `.github/workflow-samples/gradle-plugin` - `.github/workflow-samples/groovy-dsl` - `.github/workflow-samples/java-toolchain` - `.github/workflow-samples/kotlin-dsl` Each location gets the same `distributionUrl` → `gradle-9.6.1-bin.zip` and `distributionSha256Sum` update, plus the regenerated `gradlew` / `gradlew.bat` scripts. ## 2. Update known wrapper checksums **#990**, unchanged, as its own commit. Adds 36 checksum entries to `sources/src/wrapper-validation/wrapper-checksums.json`, **including the 9.6.1 checksums** — which is what lets the wrapper bump above pass `CI-validate-wrappers`. These two are worth landing together. ## 3. Bump Develocity Gradle plugin from 4.4.2 to 4.5.0 **#1015**, unchanged, as its own commit. Updates the plugin reference across workflow samples, init-script tests, docs, and the injected default in `sources/src/develocity/build-scan.ts`: ```diff -maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.4.2') +maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.5.0') ``` Since this touches `sources/src`, the bundled `dist/` will change when the update-dist bot runs. ## Verification All three cherry-picks applied without conflicts. On the combined branch: - `./build` — clean - `npm run check` (prettier + eslint) — clean - `npm test` — 373 tests, 15 suites, all passing Original bot authorship is preserved on all three commits. ## Superseded PRs Once this merges, these can be closed: #1008, #1009, #1010, #1011, #1012, #990, #1015. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5 (1M context) Co-authored-by: bot-githubaction --- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- .../workflow-samples/gradle-plugin/gradlew | 4 +-- .../gradle-plugin/gradlew.bat | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- .github/workflow-samples/groovy-dsl/gradlew | 4 +-- .../workflow-samples/groovy-dsl/gradlew.bat | 4 +-- .../groovy-dsl/settings.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- .../workflow-samples/java-toolchain/gradlew | 4 +-- .../java-toolchain/gradlew.bat | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 4 +-- .github/workflow-samples/kotlin-dsl/gradlew | 4 +-- .../workflow-samples/kotlin-dsl/gradlew.bat | 4 +-- .../kotlin-dsl/settings.gradle.kts | 2 +- .../no-wrapper-gradle-5/build.gradle | 2 +- .../no-wrapper/settings.gradle | 2 +- .../non-executable-wrapper/settings.gradle | 2 +- .../integ-test-inject-develocity.yml | 10 +++--- docs/setup-gradle.md | 2 +- sources/src/develocity/build-scan.ts | 2 +- .../wrapper-validation/wrapper-checksums.json | 36 +++++++++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 4 +-- sources/test/init-scripts/gradlew | 4 +-- sources/test/init-scripts/gradlew.bat | 4 +-- sources/test/init-scripts/settings.gradle | 2 +- .../BaseInitScriptTest.groovy | 2 +- .../TestBuildResultRecorder.groovy | 2 +- 27 files changed, 81 insertions(+), 45 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 bd82f36b..dbe66e1d 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=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/.github/workflow-samples/gradle-plugin/gradlew b/.github/workflow-samples/gradle-plugin/gradlew index b9bb139f..249efbb0 100755 --- a/.github/workflow-samples/gradle-plugin/gradlew +++ b/.github/workflow-samples/gradle-plugin/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/.github/workflow-samples/gradle-plugin/gradlew.bat b/.github/workflow-samples/gradle-plugin/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/.github/workflow-samples/gradle-plugin/gradlew.bat +++ b/.github/workflow-samples/gradle-plugin/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel 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 bd82f36b..dbe66e1d 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=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/.github/workflow-samples/groovy-dsl/gradlew b/.github/workflow-samples/groovy-dsl/gradlew index b9bb139f..249efbb0 100755 --- a/.github/workflow-samples/groovy-dsl/gradlew +++ b/.github/workflow-samples/groovy-dsl/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/.github/workflow-samples/groovy-dsl/gradlew.bat b/.github/workflow-samples/groovy-dsl/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/.github/workflow-samples/groovy-dsl/gradlew.bat +++ b/.github/workflow-samples/groovy-dsl/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index 8abfe399..b64e1d53 100644 --- a/.github/workflow-samples/groovy-dsl/settings.gradle +++ b/.github/workflow-samples/groovy-dsl/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.develocity" version "4.4.2" + id "com.gradle.develocity" version "4.5.0" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0" } 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 bd82f36b..dbe66e1d 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=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/.github/workflow-samples/java-toolchain/gradlew b/.github/workflow-samples/java-toolchain/gradlew index b9bb139f..249efbb0 100755 --- a/.github/workflow-samples/java-toolchain/gradlew +++ b/.github/workflow-samples/java-toolchain/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/.github/workflow-samples/java-toolchain/gradlew.bat b/.github/workflow-samples/java-toolchain/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/.github/workflow-samples/java-toolchain/gradlew.bat +++ b/.github/workflow-samples/java-toolchain/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel 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 bd82f36b..dbe66e1d 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=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/.github/workflow-samples/kotlin-dsl/gradlew b/.github/workflow-samples/kotlin-dsl/gradlew index b9bb139f..249efbb0 100755 --- a/.github/workflow-samples/kotlin-dsl/gradlew +++ b/.github/workflow-samples/kotlin-dsl/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/.github/workflow-samples/kotlin-dsl/gradlew.bat b/.github/workflow-samples/kotlin-dsl/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/.github/workflow-samples/kotlin-dsl/gradlew.bat +++ b/.github/workflow-samples/kotlin-dsl/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index d0a4c857..52588723 100644 --- a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts +++ b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.gradle.develocity") version "4.4.2" + id("com.gradle.develocity") version "4.5.0" id("com.gradle.common-custom-user-data-gradle-plugin") version "2.4.0" } diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index 854f492e..ddd90019 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.develocity" version "4.4.2" + id "com.gradle.develocity" version "4.5.0" } develocity { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index 8db22c7b..69b20ce1 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.develocity" version "4.4.2" + id "com.gradle.develocity" version "4.5.0" } develocity { diff --git a/.github/workflow-samples/non-executable-wrapper/settings.gradle b/.github/workflow-samples/non-executable-wrapper/settings.gradle index 8db22c7b..69b20ce1 100644 --- a/.github/workflow-samples/non-executable-wrapper/settings.gradle +++ b/.github/workflow-samples/non-executable-wrapper/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.develocity" version "4.4.2" + id "com.gradle.develocity" version "4.5.0" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index 8886c68f..c63978c9 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -30,7 +30,7 @@ jobs: matrix: gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: ['3.16.2', '4.4.2'] + plugin-version: ['3.16.2', '4.5.0'] include: - java-version: 17 - gradle: '8.14.3' @@ -43,7 +43,7 @@ jobs: java-version: 11 - plugin-version: '3.16.2' accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY - - plugin-version: '4.4.2' + - plugin-version: '4.5.0' accessKeyEnv: DEVELOCITY_ACCESS_KEY runs-on: ${{ matrix.os }} env: @@ -92,7 +92,7 @@ jobs: matrix: gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: ['3.16.2', '4.4.2'] + plugin-version: ['3.16.2', '4.5.0'] include: - java-version: 17 - gradle: '8.14.3' @@ -148,7 +148,7 @@ jobs: matrix: gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: [ '3.16.2', '4.4.2' ] + plugin-version: [ '3.16.2', '4.5.0' ] include: - java-version: 17 - gradle: '8.14.3' @@ -191,7 +191,7 @@ jobs: matrix: gradle: ['current', '8.14.3', '7.6.2', '6.9.4', '5.6.4'] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: [ '3.16.2', '4.4.2' ] + plugin-version: [ '3.16.2', '4.5.0' ] include: - java-version: 17 - gradle: '8.14.3' diff --git a/docs/setup-gradle.md b/docs/setup-gradle.md index 79d8e969..d3dd22ef 100644 --- a/docs/setup-gradle.md +++ b/docs/setup-gradle.md @@ -921,7 +921,7 @@ Here's a minimal example: run: ./gradlew build ``` -This configuration will automatically apply `v4.4.2` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com. +This configuration will automatically apply `v4.5.0` of the [Develocity Gradle plugin](https://docs.gradle.com/develocity/gradle-plugin/), and publish build scans to https://develocity.your-server.com. This example assumes that the `develocity.your-server.com` server allows anonymous publishing of build scans. In the likely scenario that your Develocity server requires authentication, you will also need to pass a valid [Develocity access key](https://docs.gradle.com/develocity/gradle-plugin/#via_environment_variable) taken from a secret: diff --git a/sources/src/develocity/build-scan.ts b/sources/src/develocity/build-scan.ts index 15a11a5d..501575e7 100644 --- a/sources/src/develocity/build-scan.ts +++ b/sources/src/develocity/build-scan.ts @@ -33,7 +33,7 @@ export function setup(config: DevelocityConfig): void { // except if they are defined in the configuration if (config.getBuildScanPublishEnabled()) { maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') - maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.4.2') + maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.5.0') maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1') maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getTermsOfUseUrl()) maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getTermsOfUseAgree()) diff --git a/sources/src/wrapper-validation/wrapper-checksums.json b/sources/src/wrapper-validation/wrapper-checksums.json index 74c74a9f..2c45865f 100644 --- a/sources/src/wrapper-validation/wrapper-checksums.json +++ b/sources/src/wrapper-validation/wrapper-checksums.json @@ -1,4 +1,40 @@ [ + { + "version": "9.7.0-rc-2", + "checksum": "7a9ce74cff467ca1bf60a4fcd9f05185acceda4d0f382434d393e17864262c5d" + }, + { + "version": "9.7.0-rc-1", + "checksum": "7a9ce74cff467ca1bf60a4fcd9f05185acceda4d0f382434d393e17864262c5d" + }, + { + "version": "9.7.0-milestone-3", + "checksum": "7a9ce74cff467ca1bf60a4fcd9f05185acceda4d0f382434d393e17864262c5d" + }, + { + "version": "9.7.0-milestone-2", + "checksum": "7a9ce74cff467ca1bf60a4fcd9f05185acceda4d0f382434d393e17864262c5d" + }, + { + "version": "9.6.1", + "checksum": "497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7" + }, + { + "version": "9.6.0", + "checksum": "497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7" + }, + { + "version": "9.7.0-milestone-1", + "checksum": "8a23bf708fd4e02674e77fb34b0fa7c02f0d53c2ad377385ab507422313d26d1" + }, + { + "version": "9.6.0-rc-3", + "checksum": "497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7" + }, + { + "version": "9.6.0-rc-2", + "checksum": "497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7" + }, { "version": "9.6.0-rc-1", "checksum": "497c8c2a7e5031f6aa847f88104aa80a93532ec32ee17bdb8d1d2f67a194a9c7" diff --git a/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties b/sources/test/init-scripts/gradle/wrapper/gradle-wrapper.properties index bd82f36b..dbe66e1d 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=bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionSha256Sum=9c0f7faeeb306cb14e4279a3e084ca6b596894089a0638e68a07c945a32c9e14 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/sources/test/init-scripts/gradlew b/sources/test/init-scripts/gradlew index b9bb139f..249efbb0 100755 --- a/sources/test/init-scripts/gradlew +++ b/sources/test/init-scripts/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/sources/test/init-scripts/gradlew.bat b/sources/test/init-scripts/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/sources/test/init-scripts/gradlew.bat +++ b/sources/test/init-scripts/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@rem Execute Gradle +@rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel diff --git a/sources/test/init-scripts/settings.gradle b/sources/test/init-scripts/settings.gradle index 55166106..9c5fc3f8 100644 --- a/sources/test/init-scripts/settings.gradle +++ b/sources/test/init-scripts/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.develocity" version "4.4.2" + id "com.gradle.develocity" version "4.5.0" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0" } 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 2f9399bf..f6399672 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 @@ -16,7 +16,7 @@ import java.nio.file.Files import java.util.zip.GZIPOutputStream class BaseInitScriptTest extends Specification { - static final String DEVELOCITY_PLUGIN_VERSION = '4.4.2' + static final String DEVELOCITY_PLUGIN_VERSION = '4.5.0' static final String CCUD_PLUGIN_VERSION = '2.1' static final TestGradleVersion GRADLE_4_X = new TestGradleVersion(GradleVersion.version('4.10.3'), 7, 10) diff --git a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy index 0cc56f0e..2cca2095 100644 --- a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy +++ b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy @@ -248,7 +248,7 @@ task expectFailure { when: settingsFile.text = """ plugins { - id 'com.gradle.develocity' version '4.4.2' apply(false) + id 'com.gradle.develocity' version '4.5.0' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.develocity'