From 089bfb1063e62a9d0c81cf008351377a7b59748c Mon Sep 17 00:00:00 2001 From: bot-githubaction Date: Tue, 20 Aug 2024 02:19:51 +0000 Subject: [PATCH] Bump references to Develocity Gradle plugin from 3.17.6 to 3.18 --- .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 | 4 ++-- 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, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index 16f40b9..d62e8ce 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.17.6" + id "com.gradle.develocity" version "3.18" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.1" } diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index 2556022..58b866c 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.17.6" + id("com.gradle.develocity") version "3.18" id("com.gradle.common-custom-user-data-gradle-plugin") version "2.0.1" } diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index b9564b1..be8d07b 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.6" + id "com.gradle.develocity" version "3.18" } develocity { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index 8b6b5b5..64c74b8 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.6" + id "com.gradle.develocity" version "3.18" } develocity { diff --git a/.github/workflow-samples/non-executable-wrapper/settings.gradle b/.github/workflow-samples/non-executable-wrapper/settings.gradle index 8b6b5b5..64c74b8 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.6" + id "com.gradle.develocity" version "3.18" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index 0da3cb6..0d6277c 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -33,11 +33,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.17.6] + plugin-version: [3.16.2, 3.18] include: - plugin-version: 3.16.2 accessKeyEnv: GRADLE_ENTERPRISE_ACCESS_KEY - - plugin-version: 3.17.6 + - plugin-version: 3.18 accessKeyEnv: DEVELOCITY_ACCESS_KEY runs-on: ${{ matrix.os }} @@ -84,7 +84,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.6] + plugin-version: [3.16.2, 3.18] runs-on: ${{ matrix.os }} steps: - name: Checkout sources @@ -133,7 +133,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.6 ] + plugin-version: [ 3.16.2, 3.18 ] runs-on: ubuntu-latest steps: - name: Checkout sources @@ -169,7 +169,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.6 ] + plugin-version: [ 3.16.2, 3.18 ] runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/docs/setup-gradle.md b/docs/setup-gradle.md index 0a491a4..81f57d2 100644 --- a/docs/setup-gradle.md +++ b/docs/setup-gradle.md @@ -749,7 +749,7 @@ Here's a minimal example: run: ./gradlew build ``` -This configuration will automatically apply `v3.17.6` 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.18` 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: @@ -821,7 +821,7 @@ Here's an example using the env vars: env: DEVELOCITY_INJECTION_ENABLED: true DEVELOCITY_URL: https://develocity.your-server.com - DEVELOCITY_PLUGIN_VERSION: 3.17.6 + DEVELOCITY_PLUGIN_VERSION: 3.18 ``` ## Publishing to scans.gradle.com diff --git a/sources/src/develocity/build-scan.ts b/sources/src/develocity/build-scan.ts index f0e6dce..fe4ecf2 100644 --- a/sources/src/develocity/build-scan.ts +++ b/sources/src/develocity/build-scan.ts @@ -7,7 +7,7 @@ export async function setup(config: BuildScanConfig): Promise { maybeExportVariable('DEVELOCITY_AUTO_INJECTION_CUSTOM_VALUE', 'gradle-actions') if (config.getBuildScanPublishEnabled()) { maybeExportVariable('DEVELOCITY_INJECTION_ENABLED', 'true') - maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.17.6') + maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.18') 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 628448a..00ef1fa 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.17.6" + id "com.gradle.develocity" version "3.18" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.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 088c342..a154031 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.17.6' + static final String DEVELOCITY_PLUGIN_VERSION = '3.18' static final String CCUD_PLUGIN_VERSION = '2.0.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 43cfe4e..a1ea471 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 @@ -196,7 +196,7 @@ class TestBuildResultRecorder extends BaseInitScriptTest { when: settingsFile.text = """ plugins { - id 'com.gradle.develocity' version '3.17.6' apply(false) + id 'com.gradle.develocity' version '3.18' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.develocity'