Skip to content

Commit

Permalink
Support toolchain switching and JDK 21
Browse files Browse the repository at this point in the history
Issue gh-12790
Issue gh-13811
  • Loading branch information
sjohnr committed Sep 19, 2023
1 parent 0e8d04a commit f3a012e
Showing 1 changed file with 24 additions and 11 deletions.
35 changes: 24 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -123,16 +123,35 @@ updateDependenciesSettings {
}
}

subprojects {
plugins.withType(JavaPlugin) {
project.sourceCompatibility=JavaVersion.VERSION_17
def toolchainVersion() {
if (project.hasProperty('testToolchain')) {
return project.property('testToolchain').toString().toInteger()
}
tasks.withType(JavaCompile) {
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)) {
Expand All @@ -158,12 +177,6 @@ allprojects {
}
}
}

tasks.withType(JavaCompile).configureEach {
javaCompiler = javaToolchains.compilerFor {
languageVersion = JavaLanguageVersion.of(17)
}
}
}

if (hasProperty('buildScan')) {
Expand Down

0 comments on commit f3a012e

Please sign in to comment.