Do not use java.home system property to locate JDK dependencies

It may point either to JDK/bin or to JRE/bin. Instead use JDK_16 and JDK_18 paths.
2018-03-10 16:38:52 +03:00
parent 6955cabbba
commit 2891a6c954
3 changed files with 10 additions and 7 deletions
@@ -41,7 +41,7 @@ dependencies {
    compile(project(":kotlin-stdlib"))

    proguardDeps(project(":kotlin-stdlib"))
-    proguardDeps(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar")))
+    proguardDeps(files(firstFromJavaHomeThatExists("jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = File(property("JDK_16") as String))))

    shadows(project(":kotlin-reflect-api"))
    shadows(project(":core:descriptors"))