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

Change kotlin-runtime dependency to kotlin-stdlib in Kotlin runner and ant task

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-08-14 19:42:39 +03:00
parent e59141e32c
commit 237d870618
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt
+1 -1
View File
@@ -38,7 +38,7 @@ internal object KotlinAntTaskUtil {
} }
val compilerJar: File by jar("kotlin-compiler.jar") val compilerJar: File by jar("kotlin-compiler.jar")
val runtimeJar: File by jar("kotlin-runtime.jar") val runtimeJar: File by jar("kotlin-stdlib.jar")
val reflectJar: File by jar("kotlin-reflect.jar") val reflectJar: File by jar("kotlin-reflect.jar")
private fun jar(name: String) = lazy { private fun jar(name: String) = lazy {
compiler/cli/cli-runner/build.gradle.kts
+1 -1
View File
@@ -19,7 +19,7 @@ sourceSets {
runtimeJar { runtimeJar {
manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.runner.Main") manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.runner.Main")
manifest.attributes.put("Class-Path", "kotlin-runtime.jar") manifest.attributes.put("Class-Path", "kotlin-stdlib.jar")
} }
dist() dist()
compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
+1 -1
View File
@@ -96,7 +96,7 @@ object Main {
classpath.addPath(".") classpath.addPath(".")
} }
classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-runtime.jar") classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-stdlib.jar")
if (!noReflect) { if (!noReflect) {
classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-reflect.jar") classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-reflect.jar")