Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-10-31 06:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support toolchain switching and JDK 21

Browse Source 
Issue gh-12790
Issue gh-13811
This commit is contained in:
Steve Riesenberg 2023-09-11 10:43:29 -05:00
parent 0e8d04ab40
commit f3a012eaa2
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
build.gradle
View File

@ -123,16 +123,35 @@ updateDependenciesSettings {
}
}
subprojects {
plugins.withType(JavaPlugin) {
project.sourceCompatibility=JavaVersion.VERSION_17
}
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.compilerArgs.add("-parameters")
def toolchainVersion() {
if (project.hasProperty('testToolchain')) {
return project.property('testToolchain').toString().toInteger()
}
return 17
}
subprojects {
def toolchainVersion = toolchainVersion()
tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
options.compilerArgs.add("-parameters")
java {
toolchain {
languageVersion = JavaLanguageVersion.of(toolchainVersion)
}
}
}
tasks.withType(Test).configureEach {
java {
toolchain {
languageVersion = JavaLanguageVersion.of(toolchainVersion)
}
}
}
}
allprojects {
if (!['spring-security-bom', 'spring-security-docs'].contains(project.name)) {
@ -158,12 +177,6 @@ allprojects {
}
}
}
tasks.withType(JavaCompile).configureEach {
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(17)
}
}
}
if (hasProperty('buildScan')) {