Skip to content

Commit

Permalink
fixup! Fix console-related test failures on JDK 22
Browse files Browse the repository at this point in the history
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
	}
  • Loading branch information
rybak committed Aug 6, 2023
1 parent e8e9cf5 commit a086903
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ tasks.withType<Test>().configureEach {
"-XX:FlightRecorderOptions=stackdepth=1024"
)
}
if (buildParameters.javaToolchainVersion.get() >= 22) {
if (buildParameters.javaToolchainVersion.isPresent && buildParameters.javaToolchainVersion.get() >= 22) {
jvmArgs("-Djdk.console=java.base")
}

Expand Down

0 comments on commit a086903

Please sign in to comment.