Merge pull request #33063 from snazy/gradle-java-20

Gradle modules build: Allow Java 20
quarkusio · May 4, 2023 · 113b0bd · 113b0bd
2 parents 7950ca5 + 5e1b9da
commit 113b0bd
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/devtools/gradle/build-logic/build.gradle.kts b/devtools/gradle/build-logic/build.gradle.kts
@@ -6,5 +6,13 @@ dependencies {
     implementation(plugin("com.gradle.plugin-publish", "1.2.0"))
 }
 
+java { toolchain {
+    // this is fine, even for Java 1.x
+    val javaMajor = JavaVersion.current().majorVersion.toInt()
+    // Need to limit the Java version for Kotlin to 17, because 20 doesn't work.
+    // Also prefer the current version to prevent JDK downloads.
+    languageVersion.set(JavaLanguageVersion.of(javaMajor.coerceAtMost(17)))
+} }
+
 fun DependencyHandler.plugin(id: String, version: String) =
     create("$id:$id.gradle.plugin:$version")