diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 94113f200..e18bc253b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6..f3b75f3b0 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 diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy index f05a6170b..461a82061 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy @@ -93,7 +93,7 @@ class ConfigurationCacheSpec extends PluginSpecification { """.stripIndent() file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -112,7 +112,7 @@ class ConfigurationCacheSpec extends PluginSpecification { } } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -151,7 +151,7 @@ class ConfigurationCacheSpec extends PluginSpecification { apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation "junit:junit:3.8.2" } diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigureShadowRelocationSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigureShadowRelocationSpec.groovy index bcb1a6981..c7212ddbb 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigureShadowRelocationSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigureShadowRelocationSpec.groovy @@ -9,7 +9,7 @@ class ConfigureShadowRelocationSpec extends PluginSpecification { given: buildFile << """ tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - enableRelocation true + enableRelocation = true } dependencies { diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy index d79a07c68..f23895394 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy @@ -35,12 +35,12 @@ class PublishingSpec extends PluginSpecification { implementation 'shadow:a:1.0' shadow 'shadow:b:1.0' } - + tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { archiveClassifier = '' archiveBaseName = 'maven-all' } - + publishing { publications { shadow(MavenPublication) { @@ -50,7 +50,7 @@ class PublishingSpec extends PluginSpecification { } repositories { maven { - url "${publishingRepo.uri}" + url = "${publishingRepo.uri}" } } } @@ -102,7 +102,7 @@ class PublishingSpec extends PluginSpecification { implementation 'shadow:a:1.0' shadow 'shadow:b:1.0' } - + publishing { publications { shadow(MavenPublication) { publication -> @@ -112,11 +112,11 @@ class PublishingSpec extends PluginSpecification { } repositories { maven { - url "${publishingRepo.uri}" + url = "${publishingRepo.uri}" } } } - + tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { archiveClassifier = 'my-classifier' archiveExtension = 'my-ext' @@ -149,12 +149,12 @@ class PublishingSpec extends PluginSpecification { version = "1.0" group = 'shadow' - - repositories { maven { url "${repo.uri}" } } + + repositories { maven { url = "${repo.uri}" } } publishing { repositories { maven { - url "${publishingRepo.uri}" + url = "${publishingRepo.uri}" } } } @@ -184,7 +184,7 @@ class PublishingSpec extends PluginSpecification { plugins { id 'com.gradleup.shadow' } - + dependencies { implementation project(':a') shadow project(':b') @@ -194,7 +194,7 @@ class PublishingSpec extends PluginSpecification { archiveClassifier = '' archiveBaseName = 'maven-all' } - + publishing { publications { shadow(MavenPublication) { @@ -263,7 +263,7 @@ class PublishingSpec extends PluginSpecification { } repositories { maven { - url "${publishingRepo.uri}" + url = "${publishingRepo.uri}" } } } diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/RelocationSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/RelocationSpec.groovy index b9f522345..da4e1fb74 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/RelocationSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/RelocationSpec.groovy @@ -16,7 +16,7 @@ class RelocationSpec extends PluginSpecification { dependencies { implementation 'junit:junit:3.8.2' } - + tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { relocate 'junit.textui', 'a' relocate 'junit.framework', 'b' @@ -81,7 +81,7 @@ class RelocationSpec extends PluginSpecification { dependencies { implementation 'junit:junit:3.8.2' } - + // tag::relocateFilter[] tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { relocate('junit.textui', 'a') { @@ -138,7 +138,7 @@ class RelocationSpec extends PluginSpecification { dependencies { implementation 'junit:junit:3.8.2' } - + // tag::relocate[] tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { relocate 'junit.framework', 'shadow.junit' @@ -148,7 +148,7 @@ class RelocationSpec extends PluginSpecification { file('src/main/java/shadow/ShadowTest.java') << ''' package shadow; - + import junit.framework.Test; import junit.framework.TestResult; public class ShadowTest implements Test { @@ -185,8 +185,8 @@ class RelocationSpec extends PluginSpecification { given: 'Core project with dependency and resource' file('core/build.gradle') << """ apply plugin: 'java-library' - - repositories { maven { url "${repo.uri}" } } + + repositories { maven { url = "${repo.uri}" } } dependencies { api 'junit:junit:3.8.2' } """.stripIndent() @@ -194,9 +194,9 @@ class RelocationSpec extends PluginSpecification { file('core/src/main/resources/test.properties') << 'name=test' file('core/src/main/java/core/Core.java') << ''' package core; - + import junit.framework.Test; - + public class Core {} '''.stripIndent() @@ -204,10 +204,10 @@ class RelocationSpec extends PluginSpecification { file('app/build.gradle') << """ apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - - repositories { maven { url "${repo.uri}" } } + + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':core') } - + tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { relocate 'core', 'app.core' relocate 'junit.framework', 'app.junit.framework' @@ -217,10 +217,10 @@ class RelocationSpec extends PluginSpecification { file('app/src/main/resources/APP-TEST') << 'APP TEST RESOURCE' file('app/src/main/java/app/App.java') << ''' package app; - + import core.Core; import junit.framework.Test; - + public class App {} '''.stripIndent() @@ -255,7 +255,7 @@ class RelocationSpec extends PluginSpecification { .publish() file('src/main/java/foo/Foo.java') << ''' package foo; - + class Foo {} '''.stripIndent() file('src/main/resources/foo/foo.properties') << 'name=foo' @@ -264,7 +264,7 @@ class RelocationSpec extends PluginSpecification { dependencies { implementation 'shadow:dep:1.0' } - + tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { relocate 'foo', 'bar' } @@ -296,7 +296,7 @@ class RelocationSpec extends PluginSpecification { repositories { mavenCentral() maven { - url 'https://repository.mapr.com/nexus/content/groups/mapr-public/releases' + url = 'https://repository.mapr.com/nexus/content/groups/mapr-public/releases' } } diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy index a19284e5a..f4cdbb6fd 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy @@ -175,7 +175,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -191,7 +191,7 @@ class ShadowPluginSpec extends PluginSpecification { apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -227,7 +227,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -249,7 +249,7 @@ class ShadowPluginSpec extends PluginSpecification { minimize() } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -285,7 +285,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -304,7 +304,7 @@ class ShadowPluginSpec extends PluginSpecification { } } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -339,7 +339,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } """.stripIndent() file('server/src/main/java/server/Server.java') << """ @@ -357,7 +357,7 @@ class ShadowPluginSpec extends PluginSpecification { } } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -393,7 +393,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -412,7 +412,7 @@ class ShadowPluginSpec extends PluginSpecification { } } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -446,7 +446,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -465,7 +465,7 @@ class ShadowPluginSpec extends PluginSpecification { } } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -506,7 +506,7 @@ class ShadowPluginSpec extends PluginSpecification { file('lib/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } """.stripIndent() file('api/src/main/java/api/Entity.java') << """ @@ -522,7 +522,7 @@ class ShadowPluginSpec extends PluginSpecification { file('api/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' implementation project(':lib') @@ -543,7 +543,7 @@ class ShadowPluginSpec extends PluginSpecification { minimize() } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { api project(':api') } """.stripIndent() @@ -585,7 +585,7 @@ class ShadowPluginSpec extends PluginSpecification { file('lib/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } """.stripIndent() file('api/src/main/java/api/Entity.java') << """ @@ -601,7 +601,7 @@ class ShadowPluginSpec extends PluginSpecification { file('api/build.gradle') << """ apply plugin: 'java-library' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { api project(':lib') } """.stripIndent() @@ -619,7 +619,7 @@ class ShadowPluginSpec extends PluginSpecification { minimize() } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { api project(':api') } """.stripIndent() @@ -653,7 +653,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { @@ -673,7 +673,7 @@ class ShadowPluginSpec extends PluginSpecification { file('server/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(path: ':client', configuration: 'shadow') } """.stripIndent() @@ -710,7 +710,7 @@ class ShadowPluginSpec extends PluginSpecification { file('client/build.gradle') << """ apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { @@ -731,7 +731,7 @@ class ShadowPluginSpec extends PluginSpecification { apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(path: ':client', configuration: 'shadow') } """.stripIndent() @@ -982,7 +982,7 @@ class ShadowPluginSpec extends PluginSpecification { dependencies { shadow 'junit:junit:3.8.2' } tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { - zip64 true + zip64 = true entryCompression = org.gradle.api.tasks.bundling.ZipEntryCompression.STORED } """.stripIndent() @@ -1004,7 +1004,7 @@ class ShadowPluginSpec extends PluginSpecification { file('lib/build.gradle') << """ apply plugin: 'java' version = '1.0' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } """.stripIndent() file('api/src/main/java/api/UnusedEntity.java') << """ @@ -1015,7 +1015,7 @@ class ShadowPluginSpec extends PluginSpecification { file('api/build.gradle') << """ apply plugin: 'java' version = '1.0' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' implementation project(':lib') @@ -1027,7 +1027,7 @@ class ShadowPluginSpec extends PluginSpecification { apply plugin: 'com.gradleup.shadow' version = '1.0' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { api project(':api') } shadowJar.minimize() @@ -1126,7 +1126,7 @@ class ShadowPluginSpec extends PluginSpecification { buildscript { repositories { maven { - url "https://maven.eveoh.nl/content/repositories/releases" + url = "https://maven.eveoh.nl/content/repositories/releases" } } diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingSpec.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingSpec.groovy index a20ffdf74..013c8c936 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingSpec.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingSpec.groovy @@ -20,7 +20,7 @@ class MinimizationCachingSpec extends AbstractCachingSpec { file('client/build.gradle') << """ apply plugin: 'java' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation 'junit:junit:3.8.2' } """.stripIndent() @@ -33,7 +33,7 @@ class MinimizationCachingSpec extends AbstractCachingSpec { apply plugin: 'java' apply plugin: 'com.gradleup.shadow' - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() @@ -61,7 +61,7 @@ class MinimizationCachingSpec extends AbstractCachingSpec { } } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } dependencies { implementation project(':client') } """.stripIndent() assertShadowJarExecutes() diff --git a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy index d33e95530..04514ec69 100644 --- a/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy +++ b/src/test/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy @@ -49,7 +49,7 @@ abstract class PluginSpecification extends Specification { integTest } - repositories { maven { url "${repo.uri}" } } + repositories { maven { url = "${repo.uri}" } } """.stripIndent() }