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 <[email protected]>
nebula-plugins · Dec 13, 2024 · 5b8c0d7 · 5b8c0d7
1 parent dfc52bc
commit 5b8c0d7
Show file tree

Hide file tree

Showing 18 changed files with 62 additions and 63 deletions.
diff --git 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
@@ -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
@@ -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/resolutionrules/AbstractAlignAndMigrateSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignAndMigrateSpec.groovy
@@ -19,7 +19,7 @@ class AbstractAlignAndMigrateSpec extends AbstractAlignRulesSpec {
         createTestDependencies()
         buildFile << """
         repositories {
-            maven { url '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' }
+            maven { url = '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' }
         }
         dependencies {
             implementation 'test.nebula:a:1.0.0'

diff --git a/...tegTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy b/...tegTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy
@@ -80,7 +80,7 @@ buildscript {
     }
     repositories {
         maven {
-            url "https://plugins.gradle.org/m2/"
+            url = "https://plugins.gradle.org/m2/"
         }
     }
 }

diff --git a/...nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy b/...nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy
@@ -19,11 +19,11 @@ class AlignAndLockWithDowngradedTransitiveDependenciesSpec extends AbstractInteg
             buildscript {
                 repositories {
                     maven {
-                        url "https://plugins.gradle.org/m2/"
+                        url = "https://plugins.gradle.org/m2/"
                     }
                 }
                 dependencies {
-                    classpath "com.netflix.nebula:gradle-dependency-lock-plugin:13.+"
+                    classpath "com.netflix.nebula:gradle-dependency-lock-plugin:15.+"
                 }
             }
             plugins {
@@ -376,7 +376,7 @@ class AlignAndLockWithDowngradedTransitiveDependenciesSpec extends AbstractInteg
 
         buildFile << """
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
                 mavenCentral()
             }
             dependencies {

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy
@@ -1861,7 +1861,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec {
             id 'com.netflix.nebula.resolution-rules'$pluginToAdd
         }
         repositories {
-            maven { url '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' }
+            maven { url = '${projectDir.toPath().relativize(mavenrepo.toPath()).toFile()}' }
         }
         dependencies {
             resolutionRules files("${projectDir.toPath().relativize(rulesJsonFile.toPath()).toFile()}")
@@ -1942,7 +1942,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec {
                 implementation 'test.nebula:b'
             }
             repositories {
-                 maven { url '${bomRepo.root.absoluteFile.toURI()}' }
+                 maven { url = '${bomRepo.root.absoluteFile.toURI()}' }
             }
             """.stripIndent()
     }
@@ -1995,7 +1995,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec {
 repositories {
     mavenCentral()
     maven {
-        url 'repo'
+        url = 'repo'
     }
 }
 

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy
@@ -61,7 +61,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.other:c:1.0.0'
@@ -109,7 +109,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -161,7 +161,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -212,7 +212,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -280,7 +280,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -330,8 +330,8 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
                 }
                 repositories {
                     maven {
-                        name 'repo'
-                        url 'build/repo'
+                        name = 'repo'
+                        url = 'build/repo'
                     }
                 }
             }
@@ -442,7 +442,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -523,7 +523,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             configurations.all {
                 resolutionStrategy {
@@ -582,7 +582,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula.one:a:1.0.0'
@@ -628,7 +628,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -676,7 +676,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -723,7 +723,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -863,7 +863,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             
             dependencies {

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy
@@ -33,7 +33,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -119,7 +119,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.+'
@@ -158,7 +158,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:[1.0.0, 2.0.0)'

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy
@@ -39,7 +39,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:1.0.0'
@@ -99,7 +99,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:2.0.0'
@@ -156,7 +156,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:2.0.0'
@@ -215,7 +215,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:2.0.0'
@@ -270,7 +270,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:2.0.0'
@@ -327,7 +327,7 @@ class AlignRulesForceSpec extends AbstractAlignRulesSpec {
 
         buildFile << """\
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             dependencies {
                 implementation 'test.nebula:a:2.0.0'

diff --git a/...t/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy b/...t/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy
@@ -378,7 +378,7 @@ class AlignRulesForceStrictlyWithSubstitutionSpec extends AbstractAlignRulesSpec
 
         buildFile << """
             repositories {
-                maven { url '${mavenrepo.absolutePath}' }
+                maven { url = '${mavenrepo.absolutePath}' }
             }
             """.stripIndent()
     }

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy
@@ -100,7 +100,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {
                     repositories {
                         maven {
                             name 'repo'
-                            url 'build/repo'
+                            url = 'build/repo'
                         }
                     }
                 }
@@ -197,7 +197,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {
         buildFile << """\
             subprojects {
                 repositories {
-                    maven { url '${mavenrepo.absolutePath}' }
+                    maven { url = '${mavenrepo.absolutePath}' }
                 }
             }
 
@@ -267,7 +267,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {
 
             subprojects {
                 repositories {
-                    maven { url '${mavenrepo.absolutePath}' }
+                    maven { url = '${mavenrepo.absolutePath}' }
                 }
             }
 

diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy
@@ -324,7 +324,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
             repositories {
                 mavenCentral()
-                maven { url '${mavenForRules.absolutePath}' }
+                maven { url = '${mavenForRules.absolutePath}' }
             }
 
             dependencies {
@@ -610,7 +610,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
             repositories {
                 ${mavenrepo.mavenRepositoryBlock}
-                maven { url '${mavenForRules.absolutePath}' }
+                maven { url = '${mavenForRules.absolutePath}' }
             }
 
             dependencies {
@@ -650,7 +650,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
             repositories {
                 ${mavenrepo.mavenRepositoryBlock}
-                maven { url '${mavenForRules.absolutePath}' }
+                maven { url = '${mavenForRules.absolutePath}' }
             }
 
             dependencies {
@@ -982,7 +982,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
             subprojects {
                 repositories {
-                    maven { url '${mavenrepo.absolutePath}' }
+                    maven { url = '${mavenrepo.absolutePath}' }
                 }
             }
         """.stripIndent()
@@ -1075,7 +1075,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
             subprojects {
                 apply plugin: 'java'
                 repositories {
-                    maven { url '${mavenrepo.absolutePath}' }
+                    maven { url = '${mavenrepo.absolutePath}' }
                 }
             }
         """.stripIndent()
@@ -1108,7 +1108,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
 
             repositories {
                 ${mavenrepo.mavenRepositoryBlock}
-                maven { url '${mavenForRules.absolutePath}' }
+                maven { url = '${mavenForRules.absolutePath}' }
             }
 
             dependencies {
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ buildscript { @@
         }
         repositories {
             maven {
-                url "https://plugins.gradle.org/m2/"
+                url = "https://plugins.gradle.org/m2/"
             }
         }
     }
@@ Expand Down @@