From cca33c4d11ade01d2da289db1d737badc12fc4b8 Mon Sep 17 00:00:00 2001 From: Roberto Perez Alcolea Date: Fri, 13 Dec 2024 21:14:54 +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 +- .../plugins/deb/DebPluginLauncherSpec.groovy | 2 +- .../rpm/RpmPluginIntegrationTest.groovy | 19 +++++++++---------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c82..2d9d6a63 100755 --- 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 f5feea6d..f4776923 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 index 9b42019c..1579c448 100755 --- 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/test/groovy/com/netflix/gradle/plugins/deb/DebPluginLauncherSpec.groovy b/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginLauncherSpec.groovy index 2961809f..0df70896 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginLauncherSpec.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/deb/DebPluginLauncherSpec.groovy @@ -31,7 +31,7 @@ class DebPluginLauncherSpec extends BaseIntegrationTestKitSpec { id 'com.netflix.nebula.ospackage' } buildDeb { - summary 'No copy spec values, but still not up to date' + summary = 'No copy spec values, but still not up to date' } '''.stripIndent() diff --git a/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy b/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy index 5fcccf63..3cb0137f 100644 --- a/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy +++ b/src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginIntegrationTest.groovy @@ -93,7 +93,7 @@ plugins { } task buildRpm(type: Rpm) { - version '1' + version = '1' from('lib') { into 'lib' } @@ -225,7 +225,7 @@ def parentExten = project.extensions.create('rpmParent', com.netflix.gradle.plug version = '1.0' task buildRpm(type: Rpm) { - packageName 'example' + packageName = 'example' from(${GradleUtils.quotedIfPresent(srcDir.path)}) { into('/usr/local/src') } @@ -276,9 +276,8 @@ dependencies { repositories { maven { - url { - "file://${reposRootDir}/mavenrepo" - } + url = "file://${reposRootDir}/mavenrepo" + } } @@ -314,7 +313,7 @@ plugins { task buildRpm(type: Rpm) { packageName = 'example' - version '3' + version = '3' from 'package' } """ @@ -345,7 +344,7 @@ plugins { task buildRpm(type: Rpm) { packageName = 'example' - version '4' + version = '4' from('package') { into '/lib' } @@ -421,7 +420,7 @@ plugins { version = '1.0.0' ospackage { - addParentDirs false + addParentDirs = false } buildRpm { @@ -455,7 +454,7 @@ plugins { version = '1.0.0' ospackage { - addParentDirs false + addParentDirs = false } buildRpm { @@ -499,7 +498,7 @@ plugins { version = '1.0.0' ospackage { - addParentDirs false + addParentDirs = false setgid = ${setgidValue} }