Skip to content

Commit 9c0f714

Browse files
committed
Upgrade to Gradle 9.2
This commit upgrades the build to use Gradle 9.2 and reinstates the use of the Groovy safe-navigation operator (?.) in framework-api.gradle. See gradle/gradle#35049 See d038269 Closes spring-projectsgh-35713
1 parent 0319fe9 commit 9c0f714

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

framework-api/framework-api.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,9 @@ tasks.register('schemaZip', Zip) {
9898
moduleProjects.each { module ->
9999
def Properties schemas = new Properties();
100100

101-
def schemaFile = module.sourceSets.main.resources.find {
101+
module.sourceSets.main.resources.find {
102102
(it.path.endsWith("META-INF/spring.schemas") || it.path.endsWith("META-INF\\spring.schemas"))
103-
}
104-
if (schemaFile != null) {
105-
schemaFile.withInputStream { schemas.load(it) }
106-
}
103+
}?.withInputStream { schemas.load(it) }
107104

108105
for (def key : schemas.keySet()) {
109106
def shortName = key.replaceAll(/http.*schema.(.*).spring-.*/, '$1')

gradle/wrapper/gradle-wrapper.jar

176 Bytes
Binary file not shown.

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

0 commit comments

Comments
 (0)