Skip to content

Commit 943cf19

Browse files
committed
Upgrade to Java 24; Gradle 8.14.1
* Add `org.gradle.toolchains.foojay-resolver-convention` for Java tool chain automatic downloads * Fix Kotlin compile Gradle tasks for `jvmTarget`
1 parent 52a5e8c commit 943cf19

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ allprojects {
135135
maven { url 'https://repo.spring.io/milestone' }
136136
if (version.endsWith('-SNAPSHOT')) {
137137
maven { url 'https://repo.spring.io/snapshot' }
138-
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
139138
}
140139
// maven { url 'https://repo.spring.io/libs-staging-local' }
141140
}
@@ -163,7 +162,7 @@ configure(javaProjects) { subproject ->
163162

164163
java {
165164
toolchain {
166-
languageVersion = JavaLanguageVersion.of(23)
165+
languageVersion = JavaLanguageVersion.of(24)
167166
}
168167
withJavadocJar()
169168
withSourcesJar()
@@ -177,11 +176,10 @@ configure(javaProjects) { subproject ->
177176
options.encoding = 'UTF-8'
178177
}
179178

180-
compileTestKotlin {
181-
kotlinOptions {
182-
jvmTarget = JavaVersion.VERSION_17
183-
}
179+
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask).configureEach {
184180
compilerOptions {
181+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
182+
javaParameters = true
185183
allWarningsAsErrors = true
186184
}
187185
}

gradle/wrapper/gradle-wrapper.jar

181 Bytes
Binary file not shown.

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=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
118118

119119

120120
# Determine the Java command to use to start the JVM.
@@ -205,15 +205,15 @@ fi
205205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206206

207207
# Collect all arguments for the java command:
208-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209209
# and any embedded shellness will be escaped.
210210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211211
# treated as '${Hostname}' itself on the command line.
212212

213213
set -- \
214214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215215
-classpath "$CLASSPATH" \
216-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217217
"$@"
218218

219219
# Stop when "xargs" is not available.

gradlew.bat

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

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
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" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ pluginManagement {
77

88
plugins {
99
id 'io.spring.develocity.conventions' version '0.0.22'
10+
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
1011
}
1112

1213
rootProject.name = 'spring-amqp-dist'

0 commit comments

Comments
 (0)