From 9d5641e008331ed43bce802c5023360afbfb7fe8 Mon Sep 17 00:00:00 2001 From: daz Date: Sun, 7 Apr 2024 18:30:45 -0600 Subject: [PATCH] Bump to CCUD plugin v2.0 everywhere --- .github/workflow-samples/groovy-dsl/settings.gradle | 2 +- .github/workflow-samples/kotlin-dsl/settings.gradle.kts | 2 +- .github/workflows/integ-test-inject-develocity.yml | 2 +- sources/src/build-scan.ts | 2 +- sources/test/init-scripts/settings.gradle | 2 +- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 2 +- .../com/gradle/gradlebuildaction/TestDevelocityInjection.groovy | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index 7635359..c9d9881 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" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.13" + id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0" } develocity { diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index cde6f38..ebaf57a 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" - id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13" + id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index 791a04b..d036755 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -25,7 +25,7 @@ jobs: DEVELOCITY_INJECTION_ENABLED: true DEVELOCITY_URL: https://ge.solutions-team.gradle.com DEVELOCITY_PLUGIN_VERSION: ${{ matrix.plugin-version }} - DEVELOCITY_CCUD_PLUGIN_VERSION: 1.13 + DEVELOCITY_CCUD_PLUGIN_VERSION: '2.0' GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # required to test against GE plugin 3.16.2 DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} strategy: diff --git a/sources/src/build-scan.ts b/sources/src/build-scan.ts index 2115e78..670729b 100644 --- a/sources/src/build-scan.ts +++ b/sources/src/build-scan.ts @@ -7,7 +7,7 @@ export function setup(): void { if (getBuildScanPublishEnabled() && verifyTermsOfUseAgreement()) { maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.17') - maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '1.13') + maybeExportVariable('DEVELOCITY_CCUD_PLUGIN_VERSION', '2.0') maybeExportVariable('DEVELOCITY_TERMS_OF_USE_URL', getBuildScanTermsOfUseUrl()) maybeExportVariable('DEVELOCITY_TERMS_OF_USE_AGREE', getBuildScanTermsOfUseAgree()) } diff --git a/sources/test/init-scripts/settings.gradle b/sources/test/init-scripts/settings.gradle index d1ea8fc..4265267 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" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.13" + id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0" } 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 664d4de..460f5d2 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 @@ -17,7 +17,7 @@ import java.util.zip.GZIPOutputStream class BaseInitScriptTest extends Specification { static final String DEVELOCITY_PLUGIN_VERSION = '3.17' - static final String CCUD_PLUGIN_VERSION = '1.13' + static final String CCUD_PLUGIN_VERSION = '2.0' 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/TestDevelocityInjection.groovy b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy index 3c87ab3..6c98896 100644 --- a/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy +++ b/sources/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestDevelocityInjection.groovy @@ -315,7 +315,7 @@ class TestDevelocityInjection extends BaseInitScriptTest { when: def config = testConfig().withCCUDPlugin().withServer(URI.create('https://develocity-server.invalid')) - def result = run(testGradleVersion, config, ["help", "-Dgradle.enterprise.url=${mockScansServer.address}".toString()]) + def result = run(testGradleVersion, config, ["help", "-Ddevelocity.url=${mockScansServer.address}".toString()]) then: outputContainsDevelocityPluginApplicationViaInitScript(result, testGradleVersion.gradleVersion)