Skip to content

Commit ca8659f

Browse files
authored
Update gradle to 9.2.0 (#10537)
* Update gradle to 9.2.0 Attempted to resolve TODO on line 1099, however some of the API is still not recognized. Added a 9.2+ to the TODO * Remove Gradle workaround from schema processing The TODO comment indicated this workaround was needed until Gradle 9.1.1 or 9.2. Since Gradle has been updated to 9.2.0 in the workaround is no longer necessary. This change simplifies the schema loading code by using the more concise `?.withInputStream` pattern instead of the verbose null-check and conditional logic that was required by earlier Gradle versions.
1 parent f984386 commit ca8659f

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

build.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,18 +1096,9 @@ tasks.register('schemaZip', Zip) {
10961096
shortName = ''
10971097
}
10981098

1099-
/* TODO until Gradle 9.1.1 or 9.2
11001099
subproject.sourceSets.main.resources.find {
11011100
it.path.endsWith("META-INF${File.separator}spring.schemas")
1102-
}?.withInputStream { schemas.load(it) }*/
1103-
1104-
File schemasFile = subproject.sourceSets.main.resources.find {
1105-
it.path.endsWith("META-INF${File.separator}spring.schemas")
1106-
}
1107-
1108-
if (schemasFile) {
1109-
schemasFile.withInputStream { schemas.load(it) }
1110-
}
1101+
}?.withInputStream { schemas.load(it) }
11111102

11121103
for (def key : schemas.keySet()) {
11131104
File xsdFile = subproject.sourceSets.main.resources.find {

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)