From ea14aa9cafa40054e229291ff8f40fbad08367c1 Mon Sep 17 00:00:00 2001 From: Daz DeBoer Date: Sat, 11 May 2024 07:45:47 -0600 Subject: [PATCH] Dependency updates (#222) - Bump to com.gradle.develocity plugin v3.17.3 - Bump JVM dependencies in sample projects --- .github/workflow-samples/groovy-dsl/settings.gradle | 2 +- .github/workflow-samples/kotlin-dsl/build.gradle.kts | 2 +- .github/workflow-samples/kotlin-dsl/settings.gradle.kts | 2 +- .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/build.gradle | 2 +- sources/test/init-scripts/settings.gradle | 2 +- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 2 +- .../gradle/gradlebuildaction/TestBuildResultRecorder.groovy | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index fe22b863..f15539db 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.2" + id "com.gradle.develocity" version "3.17.3" id "com.gradle.common-custom-user-data-gradle-plugin" version "2.0.1" } diff --git a/.github/workflow-samples/kotlin-dsl/build.gradle.kts b/.github/workflow-samples/kotlin-dsl/build.gradle.kts index cbaedd91..9de4a671 100644 --- a/.github/workflow-samples/kotlin-dsl/build.gradle.kts +++ b/.github/workflow-samples/kotlin-dsl/build.gradle.kts @@ -8,7 +8,7 @@ repositories { dependencies { api("org.apache.commons:commons-math3:3.6.1") - implementation("com.google.guava:guava:33.1.0-jre") + implementation("com.google.guava:guava:33.2.0-jre") testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") } diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index 3398c0cd..448e723a 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.2" + id("com.gradle.develocity") version "3.17.3" 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 d0a749d5..3d8f6c21 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.2" + id "com.gradle.develocity" version "3.17.3" } develocity { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index dd78a754..97cef51b 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.2" + id "com.gradle.develocity" version "3.17.3" } develocity { diff --git a/.github/workflow-samples/non-executable-wrapper/settings.gradle b/.github/workflow-samples/non-executable-wrapper/settings.gradle index dd78a754..97cef51b 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.2" + id "com.gradle.develocity" version "3.17.3" } develocity { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index b9782ed1..f0da1ea3 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.2] + plugin-version: [3.16.2, 3.17.3] runs-on: ${{ matrix.os }} steps: - name: Checkout sources diff --git a/docs/setup-gradle.md b/docs/setup-gradle.md index 566303a7..5a131766 100644 --- a/docs/setup-gradle.md +++ b/docs/setup-gradle.md @@ -721,10 +721,10 @@ Here's a minimal example: env: DEVELOCITY_INJECTION_ENABLED: true DEVELOCITY_URL: https://develocity.your-server.com - DEVELOCITY_PLUGIN_VERSION: 3.17.2 + DEVELOCITY_PLUGIN_VERSION: 3.17.3 ``` -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 configuration will automatically apply `v3.17.3` 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 f7213db8..352efd82 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.2') + maybeExportVariable('DEVELOCITY_PLUGIN_VERSION', '3.17.3') 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/build.gradle b/sources/test/init-scripts/build.gradle index eaccdc17..84d94c17 100644 --- a/sources/test/init-scripts/build.gradle +++ b/sources/test/init-scripts/build.gradle @@ -20,7 +20,7 @@ dependencies { testImplementation ('io.ratpack:ratpack-groovy-test:1.9.0') { exclude group: 'org.codehaus.groovy', module: 'groovy-all' } - testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.0' + testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.1' } test { diff --git a/sources/test/init-scripts/settings.gradle b/sources/test/init-scripts/settings.gradle index 02fa69c3..b8b6097e 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.2" + id "com.gradle.develocity" version "3.17.3" 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 1ad5b915..61c669a6 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.2' + static final String DEVELOCITY_PLUGIN_VERSION = '3.17.3' 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 e5dc313a..c11f1ccd 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.2' apply(false) + id 'com.gradle.develocity' version '3.17.3' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.develocity'