From 5cadfa704c43f685a5c7dcae25a3a9550d28db66 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Fri, 13 Dec 2024 21:16:26 +0000 Subject: [PATCH] Upgrade Gradle Wrapper to 8.12-rc-1 Use this link to re-run the recipe: https://app.moderne.io/recipes/org.openrewrite.gradle.UpdateGradleWrapper?organizationId=ZmEzOTAwZTUtNjc2Yi00YmFlLTkwYTgtMGE2N2YzNzljYWQw#defaults=W3sidmFsdWUiOiI4LjEyLXJjLTEiLCJuYW1lIjoidmVyc2lvbiJ9LHsidmFsdWUiOiJiaW4iLCJuYW1lIjoiZGlzdHJpYnV0aW9uIn1d Co-authored-by: Moderne --- gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 5 ++--- gradlew.bat | 2 +- .../release/ReleasePluginIvyStatusIntegrationSpec.groovy | 4 ++-- .../ReleasePluginMultiprojectIntegrationSpec.groovy | 2 +- .../release/SnapshotResolutionIntegrationSpec.groovy | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 gradlew.bat diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..2d9d6a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionSha256Sum=4d9d7ad4cf8842f279649213d2f87d8f7e9a03ae75ac4389517aa574b1404b2a diff --git a/gradlew b/gradlew index f5feea6..f477692 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -203,7 +202,7 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +DEFAULT_JVM_OPTS= # Collect all arguments for the java command: # * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 index 9b42019..1579c44 --- a/gradlew.bat +++ b/gradlew.bat @@ -36,7 +36,7 @@ set APP_HOME=%DIRNAME% for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" +set DEFAULT_JVM_OPTS= @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/src/integTest/groovy/nebula/plugin/release/ReleasePluginIvyStatusIntegrationSpec.groovy b/src/integTest/groovy/nebula/plugin/release/ReleasePluginIvyStatusIntegrationSpec.groovy index 8dc8797..350c93c 100644 --- a/src/integTest/groovy/nebula/plugin/release/ReleasePluginIvyStatusIntegrationSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/release/ReleasePluginIvyStatusIntegrationSpec.groovy @@ -36,8 +36,8 @@ class ReleasePluginIvyStatusIntegrationSpec extends GitVersioningIntegrationTest publishing { repositories { ivy { - name 'ivytest' - url '$REPO_LOCATION' + name = 'ivytest' + url = '$REPO_LOCATION' } } publications { diff --git a/src/integTest/groovy/nebula/plugin/release/ReleasePluginMultiprojectIntegrationSpec.groovy b/src/integTest/groovy/nebula/plugin/release/ReleasePluginMultiprojectIntegrationSpec.groovy index 94caba5..ba8d683 100644 --- a/src/integTest/groovy/nebula/plugin/release/ReleasePluginMultiprojectIntegrationSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/release/ReleasePluginMultiprojectIntegrationSpec.groovy @@ -139,7 +139,7 @@ class ReleasePluginMultiprojectIntegrationSpec extends GitVersioningIntegrationT repositories { ivy { name 'localIvy' - url 'build/localivy' + url = 'build/localivy' } } } diff --git a/src/integTest/groovy/nebula/plugin/release/SnapshotResolutionIntegrationSpec.groovy b/src/integTest/groovy/nebula/plugin/release/SnapshotResolutionIntegrationSpec.groovy index 67a7d7d..e1fe793 100644 --- a/src/integTest/groovy/nebula/plugin/release/SnapshotResolutionIntegrationSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/release/SnapshotResolutionIntegrationSpec.groovy @@ -26,7 +26,7 @@ class SnapshotResolutionIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ apply plugin: 'java' repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } @@ -52,7 +52,7 @@ class SnapshotResolutionIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ apply plugin: 'java' repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } @@ -79,7 +79,7 @@ class SnapshotResolutionIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ apply plugin: 'java' repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } } @@ -106,7 +106,7 @@ class SnapshotResolutionIntegrationSpec extends IntegrationTestKitSpec { buildFile << """\ apply plugin: 'java' repositories { - maven { url '${mavenrepo.absolutePath}' } + maven { url = '${mavenrepo.absolutePath}' } }