From 54bb3ef3fe90de4930eca8cb8aa8521ce4f23c89 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Tue, 4 May 2021 12:04:44 +0700 Subject: [PATCH] [CHERRY PICKED FROM IJ] [kotlin] replace `parent.resolve` with `resolveSibling` IJ-CR-8752 GitOrigin-RevId: 8348dd8bdd644a0b985c2c9915bf3140701ac5ff Original commit: https://github.com/JetBrains/intellij-community/commit/3035c229615621b8a9c4e96b32cca53373c98b2a --- .../org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt index 669f1a5a4c3..0d1ecb608a3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt @@ -46,7 +46,7 @@ object CompilerRunnerUtil { // We might be inside jre. if (javaHome.name == "jre") { - toolsJar = javaHome.parent.resolve("lib/tools.jar") + toolsJar = javaHome.resolveSibling("lib/tools.jar") if (toolsJar.exists()) { return toolsJar.toFile() }