- always use Java toolchains
- default is Java 11 (but source/targetCompatibility is still 1.8)
- use system property `toolchain` (e.g. `-Dtoolchain=25`) to compile with other Java versions

preparation for Gradle 9.x, which requires Java 17+ to run
This commit is contained in:
Karl Tauber
2025-10-28 12:42:04 +01:00
parent 3ccaacfb00
commit 056da35758
13 changed files with 19 additions and 21 deletions

View File

@@ -18,7 +18,7 @@ plugins {
java
}
if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
if( java.toolchain.languageVersion.get().asInt() >= 9 ) {
sourceSets {
create( "java9" ) {
java {

View File

@@ -29,7 +29,7 @@ plugins {
java
}
if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
if( java.toolchain.languageVersion.get().asInt() >= 9 ) {
sourceSets {
create( "module-info" ) {
java {

View File

@@ -18,9 +18,6 @@ plugins {
java
}
val toolchainJavaVersion = System.getProperty( "toolchain" )
if( !toolchainJavaVersion.isNullOrEmpty() ) {
java.toolchain {
languageVersion = JavaLanguageVersion.of( toolchainJavaVersion )
}
java.toolchain {
languageVersion = JavaLanguageVersion.of( System.getProperty( "toolchain", "11" ) )
}