From 237d8706189e922b130d15247d07b2b185baec93 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 14 Aug 2018 19:42:39 +0300 Subject: [PATCH] Change kotlin-runtime dependency to kotlin-stdlib in Kotlin runner and ant task --- ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt | 2 +- compiler/cli/cli-runner/build.gradle.kts | 2 +- compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt index e1f8957d3b9..2241916c762 100644 --- a/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt +++ b/ant/src/org/jetbrains/kotlin/ant/KotlinAntTaskUtil.kt @@ -38,7 +38,7 @@ internal object KotlinAntTaskUtil { } 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") private fun jar(name: String) = lazy { diff --git a/compiler/cli/cli-runner/build.gradle.kts b/compiler/cli/cli-runner/build.gradle.kts index 12c73eca97f..c5a73f8cf3e 100644 --- a/compiler/cli/cli-runner/build.gradle.kts +++ b/compiler/cli/cli-runner/build.gradle.kts @@ -19,7 +19,7 @@ sourceSets { runtimeJar { 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() diff --git a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt index ca70d04791f..61302222522 100644 --- a/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt +++ b/compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt @@ -96,7 +96,7 @@ object Main { classpath.addPath(".") } - classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-runtime.jar") + classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-stdlib.jar") if (!noReflect) { classpath.addPath(KOTLIN_HOME.toString() + "/lib/kotlin-reflect.jar")