Skip to content

Commit d038269

Browse files
committed
Upgrade to Gradle 9.1
This commit upgrades the build to use Gradle 9.1. To achieve that, the following changes were necessary. - Stop using Groovy safe-navigation operator (?.) in framework-api.gradle due to a NullPointerException. - Switch from the io.github.goooler.shadow plugin to the com.gradleup.shadow plugin, since the former is no longer maintained and the latter is a fork that replaces it. Closes gh-35508
1 parent d82a578 commit d038269

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
55
id 'org.jetbrains.dokka'
66
id 'com.github.bjornvester.xjc' version '1.8.2' apply false
7-
id 'io.github.goooler.shadow' version '8.1.8' apply false
7+
id 'com.gradleup.shadow' version "9.1.0" apply false
88
id 'me.champeau.jmh' version '0.7.2' apply false
99
id 'io.spring.nullability' version '0.0.4' apply false
1010
}

framework-api/framework-api.gradle

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

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

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

gradle/wrapper/gradle-wrapper.jar

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

gradlew

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)