From 7b0e57d62d0c8f527259620dabf58ff01f83e194 Mon Sep 17 00:00:00 2001 From: daz Date: Thu, 21 Mar 2024 21:35:05 -0600 Subject: [PATCH] Update dependency versions --- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle-plugin/gradlew.bat | 20 +++++++++---------- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../workflow-samples/groovy-dsl/gradlew.bat | 20 +++++++++---------- .../groovy-dsl/settings.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../java-toolchain/gradlew.bat | 20 +++++++++---------- .../kotlin-dsl/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../workflow-samples/kotlin-dsl/gradlew.bat | 20 +++++++++---------- .../kotlin-dsl/settings.gradle.kts | 2 +- .../integ-test-inject-develocity.yml | 2 +- 12 files changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties index db8c3ba..4baf5a1 100644 --- a/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/gradle-plugin/gradlew.bat b/.github/workflow-samples/gradle-plugin/gradlew.bat index 6689b85..7101f8e 100644 --- a/.github/workflow-samples/gradle-plugin/gradlew.bat +++ b/.github/workflow-samples/gradle-plugin/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties index db8c3ba..4baf5a1 100644 --- a/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/groovy-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/groovy-dsl/gradlew.bat b/.github/workflow-samples/groovy-dsl/gradlew.bat index 6689b85..7101f8e 100644 --- a/.github/workflow-samples/groovy-dsl/gradlew.bat +++ b/.github/workflow-samples/groovy-dsl/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/.github/workflow-samples/groovy-dsl/settings.gradle b/.github/workflow-samples/groovy-dsl/settings.gradle index daeef25..062bb57 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.16.2" - id "com.gradle.common-custom-user-data-gradle-plugin" version "1.12.1" + id "com.gradle.common-custom-user-data-gradle-plugin" version "1.13" } gradleEnterprise { diff --git a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties index db8c3ba..4baf5a1 100644 --- a/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/java-toolchain/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/java-toolchain/gradlew.bat b/.github/workflow-samples/java-toolchain/gradlew.bat index 6689b85..7101f8e 100644 --- a/.github/workflow-samples/java-toolchain/gradlew.bat +++ b/.github/workflow-samples/java-toolchain/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/.github/workflow-samples/kotlin-dsl/build.gradle.kts b/.github/workflow-samples/kotlin-dsl/build.gradle.kts index e33daea..eae7d6c 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.0.0-jre") + implementation("com.google.guava:guava:33.1.0-jre") testImplementation("org.junit.jupiter:junit-jupiter:5.10.1") } diff --git a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties index db8c3ba..4baf5a1 100644 --- a/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties +++ b/.github/workflow-samples/kotlin-dsl/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/.github/workflow-samples/kotlin-dsl/gradlew.bat b/.github/workflow-samples/kotlin-dsl/gradlew.bat index 6689b85..7101f8e 100644 --- a/.github/workflow-samples/kotlin-dsl/gradlew.bat +++ b/.github/workflow-samples/kotlin-dsl/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/.github/workflow-samples/kotlin-dsl/settings.gradle.kts b/.github/workflow-samples/kotlin-dsl/settings.gradle.kts index 4314ca3..21bab0a 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.16.2" - id("com.gradle.common-custom-user-data-gradle-plugin") version "1.12.1" + id("com.gradle.common-custom-user-data-gradle-plugin") version "1.13" } gradleEnterprise { diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml index f1adbad..8bc5a43 100644 --- a/.github/workflows/integ-test-inject-develocity.yml +++ b/.github/workflows/integ-test-inject-develocity.yml @@ -22,7 +22,7 @@ jobs: DEVELOCITY_INJECTION_ENABLED: true DEVELOCITY_URL: https://ge.solutions-team.gradle.com DEVELOCITY_PLUGIN_VERSION: 3.16.2 - DEVELOCITY_CCUD_PLUGIN_VERSION: 1.12.1 + DEVELOCITY_CCUD_PLUGIN_VERSION: 1.13 GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # This env var has not (yet) been renamed/aliased in GE plugin 3.16.2 strategy: matrix: