Skip to content

Commit 611253d

Browse files
renovate[bot]Goooler
renovate[bot]
authored and
Goooler
committed
Update dependency gradle to v8.12.1 (#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 * Update dependency gradle to v8.12.1 * Fix `auto relocate plugin dependencies` --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Goooler <[email protected]> (cherry picked from commit 4ffb34f) (cherry picked from commit 7c76ebc)
1 parent 12328c9 commit 611253d

9 files changed

+65
-66
lines changed

‎gradle/wrapper/gradle-wrapper.properties

+1-1
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-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew

+1-2
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/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy

+3-3
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/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigureShadowRelocationSpec.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class ConfigureShadowRelocationSpec extends PluginSpecification {
99
given:
1010
buildFile << """
1111
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
12-
enableRelocation true
12+
enableRelocation = true
1313
}
1414
1515
dependencies {

‎src/test/groovy/com/github/jengelman/gradle/plugins/shadow/PublishingSpec.groovy

+12-12
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ class PublishingSpec extends PluginSpecification {
3535
implementation 'shadow:a:1.0'
3636
shadow 'shadow:b:1.0'
3737
}
38-
38+
3939
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
4040
archiveClassifier = ''
4141
archiveBaseName = 'maven-all'
4242
}
43-
43+
4444
publishing {
4545
publications {
4646
shadow(MavenPublication) {
@@ -50,7 +50,7 @@ class PublishingSpec extends PluginSpecification {
5050
}
5151
repositories {
5252
maven {
53-
url "${publishingRepo.uri}"
53+
url = "${publishingRepo.uri}"
5454
}
5555
}
5656
}
@@ -102,7 +102,7 @@ class PublishingSpec extends PluginSpecification {
102102
implementation 'shadow:a:1.0'
103103
shadow 'shadow:b:1.0'
104104
}
105-
105+
106106
publishing {
107107
publications {
108108
shadow(MavenPublication) { publication ->
@@ -112,11 +112,11 @@ class PublishingSpec extends PluginSpecification {
112112
}
113113
repositories {
114114
maven {
115-
url "${publishingRepo.uri}"
115+
url = "${publishingRepo.uri}"
116116
}
117117
}
118118
}
119-
119+
120120
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
121121
archiveClassifier = 'my-classifier'
122122
archiveExtension = 'my-ext'
@@ -149,12 +149,12 @@ class PublishingSpec extends PluginSpecification {
149149
150150
version = "1.0"
151151
group = 'shadow'
152-
153-
repositories { maven { url "${repo.uri}" } }
152+
153+
repositories { maven { url = "${repo.uri}" } }
154154
publishing {
155155
repositories {
156156
maven {
157-
url "${publishingRepo.uri}"
157+
url = "${publishingRepo.uri}"
158158
}
159159
}
160160
}
@@ -184,7 +184,7 @@ class PublishingSpec extends PluginSpecification {
184184
plugins {
185185
id 'com.gradleup.shadow'
186186
}
187-
187+
188188
dependencies {
189189
implementation project(':a')
190190
shadow project(':b')
@@ -194,7 +194,7 @@ class PublishingSpec extends PluginSpecification {
194194
archiveClassifier = ''
195195
archiveBaseName = 'maven-all'
196196
}
197-
197+
198198
publishing {
199199
publications {
200200
shadow(MavenPublication) {
@@ -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/test/groovy/com/github/jengelman/gradle/plugins/shadow/RelocationSpec.groovy

+16-16
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class RelocationSpec extends PluginSpecification {
1616
dependencies {
1717
implementation 'junit:junit:3.8.2'
1818
}
19-
19+
2020
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
2121
relocate 'junit.textui', 'a'
2222
relocate 'junit.framework', 'b'
@@ -81,7 +81,7 @@ class RelocationSpec extends PluginSpecification {
8181
dependencies {
8282
implementation 'junit:junit:3.8.2'
8383
}
84-
84+
8585
// tag::relocateFilter[]
8686
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
8787
relocate('junit.textui', 'a') {
@@ -138,7 +138,7 @@ class RelocationSpec extends PluginSpecification {
138138
dependencies {
139139
implementation 'junit:junit:3.8.2'
140140
}
141-
141+
142142
// tag::relocate[]
143143
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
144144
relocate 'junit.framework', 'shadow.junit'
@@ -148,7 +148,7 @@ class RelocationSpec extends PluginSpecification {
148148

149149
file('src/main/java/shadow/ShadowTest.java') << '''
150150
package shadow;
151-
151+
152152
import junit.framework.Test;
153153
import junit.framework.TestResult;
154154
public class ShadowTest implements Test {
@@ -185,29 +185,29 @@ class RelocationSpec extends PluginSpecification {
185185
given: 'Core project with dependency and resource'
186186
file('core/build.gradle') << """
187187
apply plugin: 'java-library'
188-
189-
repositories { maven { url "${repo.uri}" } }
188+
189+
repositories { maven { url = "${repo.uri}" } }
190190
dependencies { api 'junit:junit:3.8.2' }
191191
""".stripIndent()
192192

193193
file('core/src/main/resources/TEST') << 'TEST RESOURCE'
194194
file('core/src/main/resources/test.properties') << 'name=test'
195195
file('core/src/main/java/core/Core.java') << '''
196196
package core;
197-
197+
198198
import junit.framework.Test;
199-
199+
200200
public class Core {}
201201
'''.stripIndent()
202202

203203
and: 'App project with shadow, relocation, and project dependency'
204204
file('app/build.gradle') << """
205205
apply plugin: 'java'
206206
apply plugin: 'com.gradleup.shadow'
207-
208-
repositories { maven { url "${repo.uri}" } }
207+
208+
repositories { maven { url = "${repo.uri}" } }
209209
dependencies { implementation project(':core') }
210-
210+
211211
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
212212
relocate 'core', 'app.core'
213213
relocate 'junit.framework', 'app.junit.framework'
@@ -217,10 +217,10 @@ class RelocationSpec extends PluginSpecification {
217217
file('app/src/main/resources/APP-TEST') << 'APP TEST RESOURCE'
218218
file('app/src/main/java/app/App.java') << '''
219219
package app;
220-
220+
221221
import core.Core;
222222
import junit.framework.Test;
223-
223+
224224
public class App {}
225225
'''.stripIndent()
226226

@@ -255,7 +255,7 @@ class RelocationSpec extends PluginSpecification {
255255
.publish()
256256
file('src/main/java/foo/Foo.java') << '''
257257
package foo;
258-
258+
259259
class Foo {}
260260
'''.stripIndent()
261261
file('src/main/resources/foo/foo.properties') << 'name=foo'
@@ -264,7 +264,7 @@ class RelocationSpec extends PluginSpecification {
264264
dependencies {
265265
implementation 'shadow:dep:1.0'
266266
}
267-
267+
268268
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
269269
relocate 'foo', 'bar'
270270
}
@@ -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

0 commit comments

Comments
 (0)