Commit 182205ce authored by Nicolay Mitropolsky's avatar Nicolay Mitropolsky
Browse files

build: replacing all `kotlin-runtime.jar` with `kotlin-stdlib.jar`

because `kotlin-runtime.jar` is deprecated and will be removed in Kotlin 1.3
parent 013e905d
Branches unavailable Tags unavailable
No related merge requests found
Showing with 5 additions and 5 deletions
+5 -5
......@@ -92,11 +92,11 @@ binding.setVariable("loadProject", {
setupKotlin()
def bundledKotlinPath = "$home/build/dependencies/build/kotlin/Kotlin/kotlinc"
if (!new File(bundledKotlinPath, "lib/kotlin-runtime.jar").exists()) {
if (!new File(bundledKotlinPath, "lib/kotlin-stdlib.jar").exists()) {
bundledKotlinPath = "$home/community/build/dependencies/build/kotlin/Kotlin/kotlinc"
}
if (!new File(bundledKotlinPath, "lib/kotlin-runtime.jar").exists()) {
projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-runtime.jar: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
if (!new File(bundledKotlinPath, "lib/kotlin-stdlib.jar").exists()) {
projectBuilder.error("Could not find Kotlin runtime at $bundledKotlinPath/lib/kotlin-stdlib.jar: run `./gradlew setupKotlinPlugin` in dependencies module to download Kotlin JARs")
return
}
setPathVariable("KOTLIN_BUNDLED", bundledKotlinPath)
......@@ -150,7 +150,7 @@ private boolean ensureKotlinCompilerAddedToClassPath() {
["jps/kotlin-jps-plugin.jar", "kotlin-plugin.jar", "kotlin-reflect.jar"].each {
BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$it", ant)
}
["kotlin-runtime.jar"].each {
["kotlin-stdlib.jar"].each {
BuildUtils.addToJpsClassPath("$kotlincLibPath/$it", ant)
}
}
......
......@@ -159,7 +159,7 @@ class CompilationContextImpl implements CompilationContext {
["jps/kotlin-jps-plugin.jar", "kotlin-plugin.jar", "kotlin-reflect.jar"].each {
BuildUtils.addToJpsClassPath("$kotlinPluginLibPath/$it", ant)
}
["kotlin-runtime.jar"].each {
["kotlin-stdlib.jar"].each {
BuildUtils.addToJpsClassPath("$kotlincLibPath/$it", ant)
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment