Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gradle wrapper to 8.12-rc-2 #159

Merged
merged 3 commits into from
Dec 17, 2024
Merged

Update Gradle wrapper to 8.12-rc-2 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f64662
Update Gradle wrapper to 8.12-rc-2
rpalcolea Dec 17, 2024
83a07e0
Remove broken reference to non existent ReusableAction class
rpalcolea Dec 17, 2024
e37eb87
Fix groovy syntax in tests
rpalcolea Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=4c403eac4e3957107a6e954ae2b59ba6cf9823f683276f1f9e20ef79b8d350a2
5 changes: 2 additions & 3 deletions gradlew
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/integTest/groovy/nebula/plugin/resolutionrules/AbstractAlignAndMigrateSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion ...tegTest/groovy/nebula/plugin/resolutionrules/AbstractRulesWithSpringBootPluginSpec.groovy
View file
Open in desktop
Original file line number Diff 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
6 changes: 3 additions & 3 deletions ...nebula/plugin/resolutionrules/AlignAndLockWithDowngradedTransitiveDependenciesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -376,7 +376,7 @@ class AlignAndLockWithDowngradedTransitiveDependenciesSpec extends AbstractInteg

buildFile << """
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
mavenCentral()
}
dependencies {
Expand Down
6 changes: 3 additions & 3 deletions src/integTest/groovy/nebula/plugin/resolutionrules/AlignAndSubstituteRulesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()}")
Expand Down Expand Up @@ -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()
}
Expand Down Expand Up @@ -1995,7 +1995,7 @@ class AlignAndSubstituteRulesSpec extends AbstractIntegrationTestKitSpec {
repositories {
mavenCentral()
maven {
url 'repo'
url = 'repo'
}
}

Expand Down
28 changes: 14 additions & 14 deletions src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesBasicSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -330,8 +330,8 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {
}
repositories {
maven {
name 'repo'
url 'build/repo'
name = 'repo'
url = 'build/repo'
}
}
}
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -523,7 +523,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {

buildFile << """\
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
configurations.all {
resolutionStrategy {
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -863,7 +863,7 @@ class AlignRulesBasicSpec extends AbstractAlignRulesSpec {

buildFile << """\
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesDirectDependenciesSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -119,7 +119,7 @@ class AlignRulesDirectDependenciesSpec extends AbstractAlignRulesSpec {

buildFile << """\
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
dependencies {
implementation 'test.nebula:a:1.+'
Expand Down Expand Up @@ -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)'
Expand Down
12 changes: 6 additions & 6 deletions src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesForceSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion ...t/groovy/nebula/plugin/resolutionrules/AlignRulesForceStrictlyWithSubstitutionSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ class AlignRulesForceStrictlyWithSubstitutionSpec extends AbstractAlignRulesSpec

buildFile << """
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
""".stripIndent()
}
Expand Down
6 changes: 3 additions & 3 deletions src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesMultiprojectSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {
repositories {
maven {
name 'repo'
url 'build/repo'
url = 'build/repo'
}
}
}
Expand Down Expand Up @@ -197,7 +197,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {
buildFile << """\
subprojects {
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
}

Expand Down Expand Up @@ -267,7 +267,7 @@ class AlignRulesMultiprojectSpec extends IntegrationSpec {

subprojects {
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {

repositories {
mavenCentral()
maven { url '${mavenForRules.absolutePath}' }
maven { url = '${mavenForRules.absolutePath}' }
}

dependencies {
Expand Down Expand Up @@ -610,7 +610,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {

repositories {
${mavenrepo.mavenRepositoryBlock}
maven { url '${mavenForRules.absolutePath}' }
maven { url = '${mavenForRules.absolutePath}' }
}

dependencies {
Expand Down Expand Up @@ -650,7 +650,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {

repositories {
${mavenrepo.mavenRepositoryBlock}
maven { url '${mavenForRules.absolutePath}' }
maven { url = '${mavenForRules.absolutePath}' }
}

dependencies {
Expand Down Expand Up @@ -982,7 +982,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {

subprojects {
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
}
""".stripIndent()
Expand Down Expand Up @@ -1075,7 +1075,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {
subprojects {
apply plugin: 'java'
repositories {
maven { url '${mavenrepo.absolutePath}' }
maven { url = '${mavenrepo.absolutePath}' }
}
}
""".stripIndent()
Expand Down Expand Up @@ -1108,7 +1108,7 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec {

repositories {
${mavenrepo.mavenRepositoryBlock}
maven { url '${mavenForRules.absolutePath}' }
maven { url = '${mavenForRules.absolutePath}' }
}

dependencies {
Expand Down
Loading
Loading