From d661f982d226ca6ed9cf5d0baafa11203209ef3c Mon Sep 17 00:00:00 2001 From: daz Date: Wed, 17 Apr 2024 19:03:52 -0600 Subject: [PATCH] Bump Develocity and CCUD plugin versions --- .github/workflow-samples/groovy-dsl/settings.gradle | 4 ++-- .github/workflow-samples/kotlin-dsl/settings.gradle.kts | 4 ++-- .github/workflow-samples/no-wrapper-gradle-5/build.gradle | 2 +- .github/workflow-samples/no-wrapper/settings.gradle | 2 +- .../workflow-samples/non-executable-wrapper/settings.gradle | 2 +- .github/workflows/integ-test-inject-develocity.yml | 2 +- docs/setup-gradle.md | 4 ++-- sources/src/build-scan.ts | 2 +- sources/test/init-scripts/settings.gradle | 4 ++-- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 4 ++-- .../gradle/gradlebuildaction/TestBuildResultRecorder.groovy | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index 0232114..fe22b86 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.develocity" version "3.17.1" - id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0" + id "com.gradle.develocity" version "3.17.2" + id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.1" } develocity { diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index dc0aa20..3398c0c 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.develocity") version "3.17.1" - id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0" + id("com.gradle.develocity") version "3.17.2" + id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1" } develocity { diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index 4152186..d0a749d 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.17.1" + id "com.gradle.develocity" version "3.17.2" } develocity { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index bf4cdb4..dd78a75 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.17.1" + id "com.gradle.develocity" version "3.17.2" } develocity { diff --git a/.github/workflow-samples/non-executable-wrapper/settings.gradle b/.github/workflow-samples/non-executable-wrapper/settings.gradle index c4255b7..dd78a75 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.17" + id "com.gradle.develocity" version "3.17.2" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index e6d7955..31e0472 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -33,7 +33,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.17] + plugin-version: [3.16.2, 3.17.2] runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/docs/setup-gradle.md b/docs/setup-gradle.md index 66f6e31..0c29442 100644 --- a/docs/setup-gradle.md +++ b/docs/setup-gradle.md @@ -720,10 +720,10 @@ Here's a minimal example: env: DEVELOCITY_INJECTION_ENABLED: true DEVELOCITY_URL: https://develocity.your-server.com - DEVELOCITY_PLUGIN_VERSION: 3.17 + DEVELOCITY_PLUGIN_VERSION: 3.17.2 ``` -This configuration will automatically apply `v3.17` 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 `v3.17.2` 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 configure an additional environment variable diff --git a/sources/src/build-scan.ts b/sources/src/build-scan.ts index 69bc02b..f7213db 100644 --- a/sources/src/build-scan.ts +++ b/sources/src/build-scan.ts @@ -6,7 +6,7 @@ export function setup(config: BuildScanConfig): void { maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions') if (config.getBuildScanPublishEnabled()) { maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') - maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.17') + maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.17.2') maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0') maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', config.getBuildScanTermsOfUseUrl()) maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', config.getBuildScanTermsOfUseAgree()) diff --git a/sources/test/init-scripts/settings.gradle b/sources/test/init-scripts/settings.gradle index 586195c..02fa69c 100644 --- a/sources/test/init-scripts/settings.gradle +++ b/sources/test/init-scripts/settings.gradle @@ -1,6 +1,6 @@ plugins { - id "com.gradle.develocity" version "3.17.1" - id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0" + id "com.gradle.develocity" version "3.17.2" + id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.1" } develocity { 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 4a76510..1ad5b91 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,8 +16,8 @@ import java.nio.file.Files import java.util.zip.GZIPOutputStream class BaseInitScriptTest extends Specification { - static final String DEVELOCITY_PLUGIN_VERSION = '3.17' - static final String CCUD_PLUGIN_VERSION = '2.0' + static final String DEVELOCITY_PLUGIN_VERSION = '3.17.2' + static final String CCUD_PLUGIN_VERSION = '2.0.1' static final TestGradleVersion GRADLE_3_X = new TestGradleVersion(GradleVersion.version('3.5.1'), 7, 9) 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 e4d5020..e5dc313 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 @@ -190,7 +190,7 @@ class TestBuildResultRecorder extends BaseInitScriptTest { when: settingsFile.text = """ plugins { - id 'com.gradle.develocity' version '3.17' apply(false) + id 'com.gradle.develocity' version '3.17.2' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.develocity'