diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index f9b379e3..819f5fa3 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.1.1" + id "com.gradle.develocity" version "4.2" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.4.0" } diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index 1dbc7c6d..2f853bee 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.1.1" + id("com.gradle.develocity") version "4.2" 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 6fccd491..d693df91 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.1.1" + id "com.gradle.develocity" version "4.2" } develocity { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index 25b14c1b..93cce566 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.1.1" + id "com.gradle.develocity" version "4.2" } develocity { diff --git a/.github/workflow-samples/non-executable-wrapper/settings.gradle b/.github/workflow-samples/non-executable-wrapper/settings.gradle index 25b14c1b..93cce566 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.1.1" + id "com.gradle.develocity" version "4.2" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index acefff0f..339a1ec6 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.1.1'] + plugin-version: ['3.16.2', '4.2'] 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.1.1' + - plugin-version: '4.2' 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.1.1'] + plugin-version: ['3.16.2', '4.2'] 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.1.1' ] + plugin-version: [ '3.16.2', '4.2' ] 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.1.1' ] + plugin-version: [ '3.16.2', '4.2' ] include: - java-version: 17 - gradle: '8.14.3' diff --git a/docs/setup-gradle.md b/docs/setup-gradle.md index 35fc4356..1efaeeea 100644 --- a/docs/setup-gradle.md +++ b/docs/setup-gradle.md @@ -847,7 +847,7 @@ Here's a minimal example: run: ./gradlew build ``` -This configuration will automatically apply `v4.1.1` 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.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 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 75ad5982..f62cd107 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', '4.1.1') + maybeExportVariable('DEVELOCITY_INJECTION_DEVELOCITY_PLUGIN_VERSION', '4.2') 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 1da48676..fc93c739 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.1.1" + id "com.gradle.develocity" version "4.2" 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 35167b8f..7d81c017 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.1.1' + static final String DEVELOCITY_PLUGIN_VERSION = '4.2' 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 79ddd394..c68664ac 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.1.1' apply(false) + id 'com.gradle.develocity' version '4.2' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.develocity'