Skip to content

Commit

Permalink
Merge pull request #131 from nebula-plugins/update-gradle-wrapper
Browse files Browse the repository at this point in the history 
Upgrade Gradle Wrapper to 8.12-rc-1
  • Loading branch information
@rpalcolea
rpalcolea authored Dec 13, 2024
2 parents 194397e + 7fdfb14 commit 69d3ac2
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 32 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ publishing {
}
repositories {
maven {
url "$buildDir/repo" // point this to your destination repository
url = "$buildDir/repo" // point this to your destination repository
}
}
}
Expand Down
9 changes: 3 additions & 6 deletions gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# This file is expected to be part of source control.
cglib:cglib-nodep:3.2.2=integTestRuntimeClasspath,testRuntimeClasspath
com.google.guava:guava:20.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-gradle-interop:2.1.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:10.5.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-gradle-interop:2.3.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.netflix.nebula:nebula-test:10.6.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
javax.inject:javax.inject:1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
junit:junit:4.13.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.8.1=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -19,10 +19,7 @@ org.codehaus.plexus:plexus-utils:3.3.0=compileClasspath,integTestCompileClasspat
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.hamcrest:hamcrest-core:1.3=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.hamcrest:hamcrest:2.2=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:1.8.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains.kotlin:kotlin-stdlib:2.1.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.jetbrains:annotations:13.0=compileClasspath,integTestCompileClasspath,integTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-commons:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
org.junit.platform:junit-platform-engine:1.9.0=integTestCompileClasspath,integTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand Down
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
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-1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=4d9d7ad4cf8842f279649213d2f87d8f7e9a03ae75ac4389517aa574b1404b2a
5 changes: 2 additions & 3 deletions gradlew
View file
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
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
6 changes: 3 additions & 3 deletions .../dependency/recommender/DependencyRecommendationsPluginCompositeCoreBomSupportSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ class DependencyRecommendationsPluginCompositeCoreBomSupportSpec extends Integra
}
allprojects {
group 'example'
group = 'example'
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
}
Expand All @@ -102,7 +102,7 @@ class DependencyRecommendationsPluginCompositeCoreBomSupportSpec extends Integra
}
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down
2 changes: 1 addition & 1 deletion ...netflix/nebula/dependency/recommender/DependencyRecommendationsPluginCompositeSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class DependencyRecommendationsPluginCompositeSpec extends IntegrationSpec {

buildFile << """\
allprojects {
group 'example'
group = 'example'
apply plugin: 'com.netflix.nebula.dependency-recommender'
dependencyRecommendations {
Expand Down
2 changes: 1 addition & 1 deletion ...ebula/dependency/recommender/DependencyRecommendationsPluginConfigurationCacheSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class DependencyRecommendationsPluginConfigurationCacheSpec extends IntegrationT
}
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down
6 changes: 3 additions & 3 deletions ...ix/nebula/dependency/recommender/DependencyRecommendationsPluginCoreBomSupportSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationTestK
apply plugin: 'war'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -118,7 +118,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationTestK
apply plugin: 'war'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -146,7 +146,7 @@ class DependencyRecommendationsPluginCoreBomSupportSpec extends IntegrationTestK
apply plugin: 'war'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down
2 changes: 1 addition & 1 deletion ...pendency/recommender/DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class DependencyRecommendationsPluginMultiprojectCoreBomSupportSpec extends Inte
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...flix/nebula/dependency/recommender/DependencyRecommendationsPluginMultiprojectSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class DependencyRecommendationsPluginMultiprojectSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -167,7 +167,7 @@ class DependencyRecommendationsPluginMultiprojectSpec extends IntegrationSpec {
}
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
}
Expand Down Expand Up @@ -217,7 +217,7 @@ class DependencyRecommendationsPluginMultiprojectSpec extends IntegrationSpec {
apply plugin: 'com.netflix.nebula.dependency-recommender'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
}
Expand Down
16 changes: 8 additions & 8 deletions ...t/groovy/netflix/nebula/dependency/recommender/DependencyRecommendationsPluginSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -116,7 +116,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -162,7 +162,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -200,7 +200,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -238,7 +238,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -282,7 +282,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
apply plugin: 'java'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${generator.mavenRepositoryBlock}
}
Expand Down Expand Up @@ -339,7 +339,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
}
}
repositories {
maven { url "$buildDir/repo" }
maven { url = "$buildDir/repo" }
}
}
'''
Expand Down Expand Up @@ -503,7 +503,7 @@ class DependencyRecommendationsPluginSpec extends IntegrationSpec {
version = '1.0.0'
repositories {
maven { url '${repo.root.absoluteFile.toURI()}' }
maven { url = '${repo.root.absoluteFile.toURI()}' }
${dependencies.mavenRepositoryBlock}
}
Expand Down

0 comments on commit 69d3ac2

Please sign in to comment.