From b247150574fc886e8feffbf5a95a2766f342ba84 Mon Sep 17 00:00:00 2001 From: bot-githubaction Date: Wed, 9 Apr 2025 02:33:49 +0000 Subject: [PATCH] Bump references to Develocity Gradle plugin from 3.19.2 to 4.0 --- .github/workflow-samples/groovy-dsl/settings.gradle | 2 +- .../workflow-samples/kotlin-dsl/settings.gradle.kts | 2 +- .../workflow-samples/no-wrapper-gradle-5/build.gradle | 2 +- .github/workflow-samples/no-wrapper/settings.gradle | 2 +- .../non-executable-wrapper/settings.gradle | 2 +- .github/workflows/integ-test-inject-develocity.yml | 10 +++++----- docs/setup-gradle.md | 2 +- sources/src/develocity/build-scan.ts | 2 +- sources/test/init-scripts/settings.gradle | 2 +- .../gradle/gradlebuildaction/BaseInitScriptTest.groovy | 2 +- .../gradlebuildaction/TestBuildResultRecorder.groovy | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index bdba490..f51cdb9 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 "3.19.2" + id "com.gradle.develocity" version "4.0" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.2.1" } diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index 0c0b1d5..ac7bb4b 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 "3.19.2" + id("com.gradle.develocity") version "4.0" id("com.gradle.common-custom-user-data-gradle-plugin") version "2.2.1" } diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index 3295f30..47a7fe3 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 "3.19.2" + id "com.gradle.develocity" version "4.0" } develocity { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index 4cfbbad..535bc92 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 "3.19.2" + id "com.gradle.develocity" version "4.0" } develocity { diff --git a/.github/workflow-samples/non-executable-wrapper/settings.gradle b/.github/workflow-samples/non-executable-wrapper/settings.gradle index 4cfbbad..535bc92 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 "3.19.2" + id "com.gradle.develocity" version "4.0" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index dc6a476..d2b8843 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -36,11 +36,11 @@ jobs: matrix: gradle: [current, 7.6.2, 6.9.4, 5.6.4] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: [3.16.2, 3.19.2] + plugin-version: [3.16.2, 4.0] include: - plugin-version: 3.16.2 accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY - - plugin-version: 3.19.2 + - plugin-version: 4.0 accessKeyEnv: DEVELOCITY_ACCESS_KEY runs-on: ${{ matrix.os }} @@ -82,7 +82,7 @@ jobs: matrix: gradle: [current, 7.6.2, 6.9.4, 5.6.4] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: [3.16.2, 3.19.2] + plugin-version: [3.16.2, 4.0] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -126,7 +126,7 @@ jobs: matrix: gradle: [ current, 7.6.2, 6.9.4, 5.6.4 ] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: [ 3.16.2, 3.19.2 ] + plugin-version: [ 3.16.2, 4.0 ] runs-on: ubuntu-latest steps: - name: Checkout sources @@ -157,7 +157,7 @@ jobs: matrix: gradle: [ current, 7.6.2, 6.9.4, 5.6.4 ] os: ${{fromJSON(inputs.runner-os)}} - plugin-version: [ 3.16.2, 3.19.2 ] + plugin-version: [ 3.16.2, 4.0 ] runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/docs/setup-gradle.md b/docs/setup-gradle.md index 394423c..ddc0dcc 100644 --- a/docs/setup-gradle.md +++ b/docs/setup-gradle.md @@ -844,7 +844,7 @@ Here's a minimal example: run: ./gradlew build ``` -This configuration will automatically apply `v3.19.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.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 015e2a6..4a01224 100644 --- a/sources/src/develocity/build-scan.ts +++ b/sources/src/develocity/build-scan.ts @@ -34,7 +34,7 @@ export async function setup(config: BuildScanConfig): Promise { // except if they are defined in the configuration if (config.getBuildScanPublishEnabled()) { maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') - maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '3.19.2') + maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.0') maybeExportVariable('DEVELOCITY_INJECTION_CCUD_PLUGIN_VERSION', '2.1') maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl()) maybeExportVariable('DEVELOCITY_INJECTION_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree()) diff --git a/sources/test/init-scripts/settings.gradle b/sources/test/init-scripts/settings.gradle index 02586e4..945bd43 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 "3.19.2" + id "com.gradle.develocity" version "4.0" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.2.1" } 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 d23729e..4a4fd2f 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 = '3.19.2' + static final String DEVELOCITY_PLUGIN_VERSION = '4.0' static final String CCUD_PLUGIN_VERSION = '2.1' static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9) 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 ccfe85d..ec63b05 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 '3.19.2' apply(false) + id 'com.gradle.develocity' version '4.0' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.develocity'