Use same Java version as main build to run Gradle in integration tests

Author: marcphilipp

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -170,6 +170,10 @@ tasks.test {
 		}
 	}
 	jvmArgumentProviders += JavaHomeDir(project, 8, develocity.testDistribution.enabled)
+
+	val gradleJavaVersion = JavaVersion.current().majorVersion.toInt()
+	jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled)
+	systemProperty("gradle.java.version", gradleJavaVersion)
 }
 
 class MavenRepo(project: Project, @get:Internal val repoDir: Provider<File>) : CommandLineArgumentProvider {

platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java

@@ -114,6 +114,10 @@ public static List<JarFile> loadJarFiles() {
 		return loadModuleDirectoryNames().stream().map(Helper::createJarFile).collect(Collectors.toList());
 	}
 
+	public static Optional<Path> getGradleJavaHome() {
+		return getJavaHome(System.getProperty("gradle.java.version"));
+	}
+
 	public static Optional<Path> getJavaHome(String version) {
 		// First, try various system sources...
 		var sources = Stream.of( //

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java

@@ -24,7 +24,9 @@
 import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.DisabledOnOpenJ9;
 import org.junit.jupiter.api.parallel.ResourceLock;
+import org.opentest4j.TestAbortedException;
 
+import platform.tooling.support.Helper;
 import platform.tooling.support.MavenRepo;
 import platform.tooling.support.Request;
 
@@ -42,6 +44,7 @@ void runsTestsInNativeImage() {
 		var request = Request.builder() //
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.setProject(Projects.GRAALVM_STARTER) //
+				.setJavaHome(Helper.getGradleJavaHome().orElseThrow(TestAbortedException::new)) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace", "--no-build-cache",
 					"--warning-mode=fail") //

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleKotlinExtensionsTests.java

@@ -42,6 +42,7 @@ void gradle_wrapper() {
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.setJavaHome(Helper.getGradleJavaHome().orElseThrow(TestAbortedException::new)) //
 				.build() //
 				.run();
 

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleMissingEngineTests.java

@@ -47,6 +47,7 @@ private void test(Tool gradle) {
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.setJavaHome(Helper.getGradleJavaHome().orElseThrow(TestAbortedException::new)) //
 				.setTimeout(TOOL_TIMEOUT) //
 				.build();
 

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java

@@ -44,6 +44,7 @@ void gradle_wrapper() {
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.setJavaHome(Helper.getGradleJavaHome().orElseThrow(TestAbortedException::new)) //
 				.build();
 
 		var result = request.run();

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/ReflectionCompatibilityTests.java

@@ -43,6 +43,7 @@ void gradle_wrapper() {
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.setTimeout(TOOL_TIMEOUT) //
 				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.setJavaHome(Helper.getGradleJavaHome().orElseThrow(TestAbortedException::new)) //
 				.build();
 
 		var result = request.run();

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/VintageGradleIntegrationTests.java

@@ -58,6 +58,7 @@ private Result run(String version) {
 		var result = Request.builder() //
 				.setTool(new GradleWrapper(Paths.get(".."))) //
 				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //
+				.setJavaHome(Helper.getGradleJavaHome().orElseThrow(TestAbortedException::new)) //
 				.setProject(Projects.VINTAGE) //
 				.setWorkspace("vintage-gradle-" + version) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //