From 198484d871cc4b5c3e644fe4445f9aa0199129b8 Mon Sep 17 00:00:00 2001 From: daz Date: Wed, 28 Jun 2023 11:48:23 -0600 Subject: [PATCH] Bump java dependencies in samples/tests --- .github/workflow-samples/groovy-dsl/settings.gradle | 4 ++-- .github/workflow-samples/kotlin-dsl/build.gradle.kts | 2 +- .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 +- test/init-scripts/build.gradle | 2 +- test/init-scripts/settings.gradle | 4 ++-- .../com/gradle/gradlebuildaction/BaseInitScriptTest.groovy | 4 ++-- .../gradle/gradlebuildaction/TestBuildResultRecorder.groovy | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index 0498c60..ba1489b 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.enterprise" version "3.13.3" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10" + id "com.gradle.enterprise" version "3.13.4" + id "com.gradle.common-custom-user-data-gradle-plugin" version "1.11" } gradleEnterprise { diff --git a/.github/workflow-samples/kotlin-dsl/build.gradle.kts b/.github/workflow-samples/kotlin-dsl/build.gradle.kts index 7ed9bb8..f7ff9d1 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:31.1-jre") + implementation("com.google.guava:guava:32.0.1-jre") testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") } diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index a8cc8d2..36062b8 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.enterprise") version "3.13.3" - id("com.gradle.common-custom-user-data-gradle-plugin") version "1.10" + id("com.gradle.enterprise") version "3.13.4" + id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11" } gradleEnterprise { diff --git a/.github/workflow-samples/no-wrapper-gradle-5/build.gradle b/.github/workflow-samples/no-wrapper-gradle-5/build.gradle index d528479..c3d2495 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.build-scan" version "3.13.3" + id "com.gradle.build-scan" version "3.13.4" } gradleEnterprise { diff --git a/.github/workflow-samples/no-wrapper/settings.gradle b/.github/workflow-samples/no-wrapper/settings.gradle index 977687a..ae91679 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.enterprise" version "3.13.3" + id "com.gradle.enterprise" version "3.13.4" } gradleEnterprise { diff --git a/test/init-scripts/build.gradle b/test/init-scripts/build.gradle index b70bd98..0cbbfd4 100644 --- a/test/init-scripts/build.gradle +++ b/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.15.1' + testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2' } test { diff --git a/test/init-scripts/settings.gradle b/test/init-scripts/settings.gradle index 86ef9a4..d1c37aa 100644 --- a/test/init-scripts/settings.gradle +++ b/test/init-scripts/settings.gradle @@ -1,6 +1,6 @@ plugins { - id "com.gradle.enterprise" version "3.13.3" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.10" + id "com.gradle.enterprise" version "3.13.4" + id "com.gradle.common-custom-user-data-gradle-plugin" version "1.11" } gradleEnterprise { diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy index 6a5fbaa..cb90808 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/BaseInitScriptTest.groovy @@ -137,7 +137,7 @@ class BaseInitScriptTest extends Specification { } else { """ plugins { - id 'com.gradle.enterprise' version '3.13.3' + id 'com.gradle.enterprise' version '3.13.4' } gradleEnterprise { server = '$mockScansServer.address' @@ -163,7 +163,7 @@ class BaseInitScriptTest extends Specification { } else if (gradleVersion < GradleVersion.version('6.0')) { """ plugins { - id 'com.gradle.build-scan' version '3.13.3' + id 'com.gradle.build-scan' version '3.13.4' } gradleEnterprise { server = '$mockScansServer.address' diff --git a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy index 467fbf8..51cce21 100644 --- a/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy +++ b/test/init-scripts/src/test/groovy/com/gradle/gradlebuildaction/TestBuildResultRecorder.groovy @@ -154,7 +154,7 @@ class TestBuildResultRecorder extends BaseInitScriptTest { when: settingsFile.text = """ plugins { - id 'com.gradle.enterprise' version '3.13.3' apply(false) + id 'com.gradle.enterprise' version '3.13.4' apply(false) } gradle.settingsEvaluated { apply plugin: 'com.gradle.enterprise'