From a0869037f9d766ffb802a55c09f8b033e9a01a85 Mon Sep 17 00:00:00 2001 From: Andrei Rybak Date: Sun, 6 Aug 2023 14:18:29 +0200 Subject: [PATCH] fixup! Fix console-related test failures on JDK 22 Fix for builds that don't have explicit javaToolchainVersion Note that in GitHub workflows, only cross-version.yml uses -PjavaToolchainVersion explicitly. An alternative would be to do something like what plugin junitbuild.java-toolchain-conventions.gradle.kts does, quote: val defaultLanguageVersion = JavaLanguageVersion.of(17) val javaLanguageVersion = buildParameters.javaToolchainVersion.map { JavaLanguageVersion.of(it) }.getOrElse(defaultLanguageVersion) Or to refactor the build parameter javaToolchainVersion to have a default value: integer("javaToolchainVersion") { description = "Defines the Java toolchain version to use for compiling code" defaultValue = 17 } --- .../src/main/kotlin/junitbuild.testing-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts index 9179c5e90c74..32233e88f855 100644 --- a/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts +++ b/gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts @@ -51,7 +51,7 @@ tasks.withType().configureEach { "-XX:FlightRecorderOptions=stackdepth=1024" ) } - if (buildParameters.javaToolchainVersion.get() >= 22) { + if (buildParameters.javaToolchainVersion.isPresent && buildParameters.javaToolchainVersion.get() >= 22) { jvmArgs("-Djdk.console=java.base") }