From 7bc739359bdc447de8d07c453cad8ba1b4faaf59 Mon Sep 17 00:00:00 2001 From: Ivan Gavrilovic Date: Wed, 14 Aug 2019 22:09:29 +0100 Subject: [PATCH] Use JDK_8 when stopping Gradle daemons with version below 5.0 Gradle started supporting running on JDK11 only with Gradle 5.0. This commit sets JAVA_HOME to JDK8 whenever stopping daemon with version below 5.0 --- .../kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 0584b6c78aa..ae714ec81fa 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -166,9 +166,17 @@ abstract class BaseGradleIT { assert(version != runnerGradleVersion) { "Not stopping Gradle daemon v$version as it matches the runner version" } println("Stopping gradle daemon v$version") + val envVariables = if (GradleVersion.version(version) < GradleVersion.version("5.0")) { + // Gradle versions below 5.0 do not support running on JDK11, and some of the tests + // set JAVA_HOME to JDK11. This makes sure we are using JDK8 when stopping those daemons. + environmentVariables + mapOf("JAVA_HOME" to System.getenv()["JDK_18"]!!) + } else { + environmentVariables + } + val wrapperDir = gradleWrappers[version] ?: error("Was asked to stop unknown daemon $version") val cmd = createGradleCommand(wrapperDir, arrayListOf("-stop")) - val result = runProcess(cmd, wrapperDir, environmentVariables) + val result = runProcess(cmd, wrapperDir, envVariables) assert(result.isSuccessful) { "Could not stop daemon: $result" } DaemonRegistry.unregister(version) }