azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use JDK_8 when stopping Gradle daemons with version below 5.0

Browse Source 
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
This commit is contained in:
Ivan Gavrilovic
2019-08-14 22:09:29 +01:00
committed by Yan Zhulanow
parent d13e26d67e
commit 7bc739359b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+9 -1
View File
@@ -166,9 +166,17 @@ abstract class BaseGradleIT {
assert(version != runnerGradleVersion) { "Not stopping Gradle daemon v$version as it matches the runner version" } assert(version != runnerGradleVersion) { "Not stopping Gradle daemon v$version as it matches the runner version" }
println("Stopping gradle daemon v$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 wrapperDir = gradleWrappers[version] ?: error("Was asked to stop unknown daemon $version")
val cmd = createGradleCommand(wrapperDir, arrayListOf("-stop")) 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" } assert(result.isSuccessful) { "Could not stop daemon: $result" }
DaemonRegistry.unregister(version) DaemonRegistry.unregister(version)
} }