Skip to content

Commit 4ffb34f

Browse files
Update dependency gradle to v8.12 (#1113)
* Update dependency gradle to v8.12 * Space-assignment syntax in Groovy DSL has been deprecated. This is scheduled to be removed in Gradle 10.0. Consult the upgrading guide for further information: https://docs.gradle.org/8.12/userguide/upgrading_version_8.html#groovy_space_assignment_syntax --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Goooler <[email protected]>
1 parent 0c4da67 commit 4ffb34f

File tree

8 files changed

+44
-45
lines changed

8 files changed

+44
-45
lines changed

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class ConfigurationCacheSpec extends PluginSpecification {
9393
""".stripIndent()
9494
file('client/build.gradle') << """
9595
apply plugin: 'java'
96-
repositories { maven { url "${repo.uri}" } }
96+
repositories { maven { url = "${repo.uri}" } }
9797
dependencies { implementation 'junit:junit:3.8.2' }
9898
""".stripIndent()
9999

@@ -112,7 +112,7 @@ class ConfigurationCacheSpec extends PluginSpecification {
112112
}
113113
}
114114
115-
repositories { maven { url "${repo.uri}" } }
115+
repositories { maven { url = "${repo.uri}" } }
116116
dependencies { implementation project(':client') }
117117
""".stripIndent()
118118

@@ -151,7 +151,7 @@ class ConfigurationCacheSpec extends PluginSpecification {
151151
apply plugin: 'java'
152152
apply plugin: 'com.gradleup.shadow'
153153
154-
repositories { maven { url "${repo.uri}" } }
154+
repositories { maven { url = "${repo.uri}" } }
155155
dependencies {
156156
implementation "junit:junit:3.8.2"
157157
}

src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class PublishingSpec extends PluginSpecification {
5050
}
5151
repositories {
5252
maven {
53-
url "${publishingRepo.uri}"
53+
url = "${publishingRepo.uri}"
5454
}
5555
}
5656
}
@@ -112,7 +112,7 @@ class PublishingSpec extends PluginSpecification {
112112
}
113113
repositories {
114114
maven {
115-
url "${publishingRepo.uri}"
115+
url = "${publishingRepo.uri}"
116116
}
117117
}
118118
}
@@ -150,11 +150,11 @@ class PublishingSpec extends PluginSpecification {
150150
version = "1.0"
151151
group = 'shadow'
152152
153-
repositories { maven { url "${repo.uri}" } }
153+
repositories { maven { url = "${repo.uri}" } }
154154
publishing {
155155
repositories {
156156
maven {
157-
url "${publishingRepo.uri}"
157+
url = "${publishingRepo.uri}"
158158
}
159159
}
160160
}
@@ -263,7 +263,7 @@ class PublishingSpec extends PluginSpecification {
263263
}
264264
repositories {
265265
maven {
266-
url "${publishingRepo.uri}"
266+
url = "${publishingRepo.uri}"
267267
}
268268
}
269269
}

src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/RelocationSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ class RelocationSpec extends PluginSpecification {
186186
file('core/build.gradle') << """
187187
apply plugin: 'java-library'
188188
189-
repositories { maven { url "${repo.uri}" } }
189+
repositories { maven { url = "${repo.uri}" } }
190190
dependencies { api 'junit:junit:3.8.2' }
191191
""".stripIndent()
192192

@@ -205,7 +205,7 @@ class RelocationSpec extends PluginSpecification {
205205
apply plugin: 'java'
206206
apply plugin: 'com.gradleup.shadow'
207207
208-
repositories { maven { url "${repo.uri}" } }
208+
repositories { maven { url = "${repo.uri}" } }
209209
dependencies { implementation project(':core') }
210210
211211
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
@@ -296,7 +296,7 @@ class RelocationSpec extends PluginSpecification {
296296
repositories {
297297
mavenCentral()
298298
maven {
299-
url 'https://repository.mapr.com/nexus/content/groups/mapr-public/releases'
299+
url = 'https://repository.mapr.com/nexus/content/groups/mapr-public/releases'
300300
}
301301
}
302302

src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowPluginSpec.groovy

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ class ShadowPluginSpec extends PluginSpecification {
172172
173173
file('client/build.gradle') << """
174174
apply plugin: 'java'
175-
repositories { maven { url "${repo.uri}" } }
175+
repositories { maven { url = "${repo.uri}" } }
176176
dependencies { implementation 'junit:junit:3.8.2' }
177177
""".stripIndent()
178178
@@ -188,7 +188,7 @@ class ShadowPluginSpec extends PluginSpecification {
188188
apply plugin: 'java'
189189
apply plugin: 'com.gradleup.shadow'
190190
191-
repositories { maven { url "${repo.uri}" } }
191+
repositories { maven { url = "${repo.uri}" } }
192192
dependencies { implementation project(':client') }
193193
194194
""".stripIndent()
@@ -224,7 +224,7 @@ class ShadowPluginSpec extends PluginSpecification {
224224
225225
file('client/build.gradle') << """
226226
apply plugin: 'java'
227-
repositories { maven { url "${repo.uri}" } }
227+
repositories { maven { url = "${repo.uri}" } }
228228
dependencies { implementation 'junit:junit:3.8.2' }
229229
""".stripIndent()
230230
@@ -246,7 +246,7 @@ class ShadowPluginSpec extends PluginSpecification {
246246
minimize()
247247
}
248248
249-
repositories { maven { url "${repo.uri}" } }
249+
repositories { maven { url = "${repo.uri}" } }
250250
dependencies { implementation project(':client') }
251251
""".stripIndent()
252252
@@ -282,7 +282,7 @@ class ShadowPluginSpec extends PluginSpecification {
282282
283283
file('client/build.gradle') << """
284284
apply plugin: 'java'
285-
repositories { maven { url "${repo.uri}" } }
285+
repositories { maven { url = "${repo.uri}" } }
286286
dependencies { implementation 'junit:junit:3.8.2' }
287287
""".stripIndent()
288288
@@ -301,7 +301,7 @@ class ShadowPluginSpec extends PluginSpecification {
301301
}
302302
}
303303
304-
repositories { maven { url "${repo.uri}" } }
304+
repositories { maven { url = "${repo.uri}" } }
305305
dependencies { implementation project(':client') }
306306
""".stripIndent()
307307
@@ -336,7 +336,7 @@ class ShadowPluginSpec extends PluginSpecification {
336336
337337
file('client/build.gradle') << """
338338
apply plugin: 'java'
339-
repositories { maven { url "${repo.uri}" } }
339+
repositories { maven { url = "${repo.uri}" } }
340340
""".stripIndent()
341341
342342
file('server/src/main/java/server/Server.java') << """
@@ -354,7 +354,7 @@ class ShadowPluginSpec extends PluginSpecification {
354354
}
355355
}
356356
357-
repositories { maven { url "${repo.uri}" } }
357+
repositories { maven { url = "${repo.uri}" } }
358358
dependencies { implementation project(':client') }
359359
""".stripIndent()
360360
@@ -390,7 +390,7 @@ class ShadowPluginSpec extends PluginSpecification {
390390
391391
file('client/build.gradle') << """
392392
apply plugin: 'java'
393-
repositories { maven { url "${repo.uri}" } }
393+
repositories { maven { url = "${repo.uri}" } }
394394
dependencies { implementation 'junit:junit:3.8.2' }
395395
""".stripIndent()
396396
@@ -409,7 +409,7 @@ class ShadowPluginSpec extends PluginSpecification {
409409
}
410410
}
411411
412-
repositories { maven { url "${repo.uri}" } }
412+
repositories { maven { url = "${repo.uri}" } }
413413
dependencies { implementation project(':client') }
414414
""".stripIndent()
415415
@@ -443,7 +443,7 @@ class ShadowPluginSpec extends PluginSpecification {
443443
444444
file('client/build.gradle') << """
445445
apply plugin: 'java'
446-
repositories { maven { url "${repo.uri}" } }
446+
repositories { maven { url = "${repo.uri}" } }
447447
dependencies { implementation 'junit:junit:3.8.2' }
448448
""".stripIndent()
449449
@@ -462,7 +462,7 @@ class ShadowPluginSpec extends PluginSpecification {
462462
}
463463
}
464464
465-
repositories { maven { url "${repo.uri}" } }
465+
repositories { maven { url = "${repo.uri}" } }
466466
dependencies { implementation project(':client') }
467467
""".stripIndent()
468468
@@ -503,7 +503,7 @@ class ShadowPluginSpec extends PluginSpecification {
503503
504504
file('lib/build.gradle') << """
505505
apply plugin: 'java'
506-
repositories { maven { url "${repo.uri}" } }
506+
repositories { maven { url = "${repo.uri}" } }
507507
""".stripIndent()
508508
509509
file('api/src/main/java/api/Entity.java') << """
@@ -519,7 +519,7 @@ class ShadowPluginSpec extends PluginSpecification {
519519
520520
file('api/build.gradle') << """
521521
apply plugin: 'java'
522-
repositories { maven { url "${repo.uri}" } }
522+
repositories { maven { url = "${repo.uri}" } }
523523
dependencies {
524524
implementation 'junit:junit:3.8.2'
525525
implementation project(':lib')
@@ -540,7 +540,7 @@ class ShadowPluginSpec extends PluginSpecification {
540540
minimize()
541541
}
542542
543-
repositories { maven { url "${repo.uri}" } }
543+
repositories { maven { url = "${repo.uri}" } }
544544
dependencies { api project(':api') }
545545
""".stripIndent()
546546
@@ -582,7 +582,7 @@ class ShadowPluginSpec extends PluginSpecification {
582582
583583
file('lib/build.gradle') << """
584584
apply plugin: 'java'
585-
repositories { maven { url "${repo.uri}" } }
585+
repositories { maven { url = "${repo.uri}" } }
586586
""".stripIndent()
587587
588588
file('api/src/main/java/api/Entity.java') << """
@@ -598,7 +598,7 @@ class ShadowPluginSpec extends PluginSpecification {
598598
599599
file('api/build.gradle') << """
600600
apply plugin: 'java-library'
601-
repositories { maven { url "${repo.uri}" } }
601+
repositories { maven { url = "${repo.uri}" } }
602602
dependencies { api project(':lib') }
603603
""".stripIndent()
604604
@@ -616,7 +616,7 @@ class ShadowPluginSpec extends PluginSpecification {
616616
minimize()
617617
}
618618
619-
repositories { maven { url "${repo.uri}" } }
619+
repositories { maven { url = "${repo.uri}" } }
620620
dependencies { api project(':api') }
621621
""".stripIndent()
622622
@@ -650,7 +650,7 @@ class ShadowPluginSpec extends PluginSpecification {
650650
file('client/build.gradle') << """
651651
apply plugin: 'java'
652652
apply plugin: 'com.gradleup.shadow'
653-
repositories { maven { url "${repo.uri}" } }
653+
repositories { maven { url = "${repo.uri}" } }
654654
dependencies { implementation 'junit:junit:3.8.2' }
655655
656656
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
@@ -670,7 +670,7 @@ class ShadowPluginSpec extends PluginSpecification {
670670
file('server/build.gradle') << """
671671
apply plugin: 'java'
672672
673-
repositories { maven { url "${repo.uri}" } }
673+
repositories { maven { url = "${repo.uri}" } }
674674
dependencies { implementation project(path: ':client', configuration: 'shadow') }
675675
""".stripIndent()
676676
@@ -707,7 +707,7 @@ class ShadowPluginSpec extends PluginSpecification {
707707
file('client/build.gradle') << """
708708
apply plugin: 'java'
709709
apply plugin: 'com.gradleup.shadow'
710-
repositories { maven { url "${repo.uri}" } }
710+
repositories { maven { url = "${repo.uri}" } }
711711
dependencies { implementation 'junit:junit:3.8.2' }
712712
713713
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
@@ -728,7 +728,7 @@ class ShadowPluginSpec extends PluginSpecification {
728728
apply plugin: 'java'
729729
apply plugin: 'com.gradleup.shadow'
730730
731-
repositories { maven { url "${repo.uri}" } }
731+
repositories { maven { url = "${repo.uri}" } }
732732
dependencies { implementation project(path: ':client', configuration: 'shadow') }
733733
""".stripIndent()
734734
@@ -979,7 +979,7 @@ class ShadowPluginSpec extends PluginSpecification {
979979
dependencies { shadow 'junit:junit:3.8.2' }
980980
981981
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
982-
zip64 true
982+
zip64 = true
983983
entryCompression = org.gradle.api.tasks.bundling.ZipEntryCompression.STORED
984984
}
985985
""".stripIndent()
@@ -1001,7 +1001,7 @@ class ShadowPluginSpec extends PluginSpecification {
10011001
file('lib/build.gradle') << """
10021002
apply plugin: 'java'
10031003
version = '1.0'
1004-
repositories { maven { url "${repo.uri}" } }
1004+
repositories { maven { url = "${repo.uri}" } }
10051005
""".stripIndent()
10061006
10071007
file('api/src/main/java/api/UnusedEntity.java') << """
@@ -1012,7 +1012,7 @@ class ShadowPluginSpec extends PluginSpecification {
10121012
file('api/build.gradle') << """
10131013
apply plugin: 'java'
10141014
version = '1.0'
1015-
repositories { maven { url "${repo.uri}" } }
1015+
repositories { maven { url = "${repo.uri}" } }
10161016
dependencies {
10171017
implementation 'junit:junit:3.8.2'
10181018
implementation project(':lib')
@@ -1024,7 +1024,7 @@ class ShadowPluginSpec extends PluginSpecification {
10241024
apply plugin: 'com.gradleup.shadow'
10251025
10261026
version = '1.0'
1027-
repositories { maven { url "${repo.uri}" } }
1027+
repositories { maven { url = "${repo.uri}" } }
10281028
dependencies { api project(':api') }
10291029
10301030
shadowJar.minimize()
@@ -1123,7 +1123,7 @@ class ShadowPluginSpec extends PluginSpecification {
11231123
buildscript {
11241124
repositories {
11251125
maven {
1126-
url "https://maven.eveoh.nl/content/repositories/releases"
1126+
url = "https://maven.eveoh.nl/content/repositories/releases"
11271127
}
11281128
}
11291129

src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/caching/MinimizationCachingSpec.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class MinimizationCachingSpec extends AbstractCachingSpec {
2020

2121
file('client/build.gradle') << """
2222
apply plugin: 'java'
23-
repositories { maven { url "${repo.uri}" } }
23+
repositories { maven { url = "${repo.uri}" } }
2424
dependencies { implementation 'junit:junit:3.8.2' }
2525
""".stripIndent()
2626

@@ -33,7 +33,7 @@ class MinimizationCachingSpec extends AbstractCachingSpec {
3333
apply plugin: 'java'
3434
apply plugin: 'com.gradleup.shadow'
3535
36-
repositories { maven { url "${repo.uri}" } }
36+
repositories { maven { url = "${repo.uri}" } }
3737
dependencies { implementation project(':client') }
3838
""".stripIndent()
3939

@@ -61,7 +61,7 @@ class MinimizationCachingSpec extends AbstractCachingSpec {
6161
}
6262
}
6363
64-
repositories { maven { url "${repo.uri}" } }
64+
repositories { maven { url = "${repo.uri}" } }
6565
dependencies { implementation project(':client') }
6666
""".stripIndent()
6767
assertShadowJarExecutes()

src/funcTest/groovy/com/github/jengelman/gradle/plugins/shadow/util/PluginSpecification.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ abstract class PluginSpecification extends Specification {
4747
integTest
4848
}
4949
50-
repositories { maven { url "${repo.uri}" } }
50+
repositories { maven { url = "${repo.uri}" } }
5151
""".stripIndent()
5252
}
5353

0 commit comments

Comments
 (0)