From e025050dd9ece2c645e0bae74a34993fd0a60611 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 20 Jan 2017 20:44:47 +0300 Subject: [PATCH] Replace kotlin-runtime with kotlin-stdlib in kotlin-script-util and its tests --- libraries/tools/kotlin-script-util/pom.xml | 7 ------- .../org/jetbrains/kotlin/script/util/ScriptUtilIT.kt | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-script-util/pom.xml b/libraries/tools/kotlin-script-util/pom.xml index 8247f885bee..c052f8bfb54 100644 --- a/libraries/tools/kotlin-script-util/pom.xml +++ b/libraries/tools/kotlin-script-util/pom.xml @@ -34,11 +34,6 @@ kotlin-stdlib ${project.version} - - org.jetbrains.kotlin - kotlin-runtime - ${project.version} - org.jetbrains.kotlin kotlin-script-runtime @@ -119,8 +114,6 @@ ${env.JDK_17}/bin/java - ${org.jetbrains.kotlin:kotlin-runtime:jar} - ${org.jetbrains.kotlin:kotlin-stdlib:jar} diff --git a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt index e48c660133f..6f326254b81 100644 --- a/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt +++ b/libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.script.util.templates.BindingsScriptTemplateWithLoca import org.jetbrains.kotlin.script.util.templates.StandardArgsScriptTemplateWithLocalResolving import org.jetbrains.kotlin.script.util.templates.StandardArgsScriptTemplateWithMavenResolving import org.jetbrains.kotlin.utils.PathUtil -import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_JAVA_RUNTIME_JAR +//import org.jetbrains.kotlin.utils.PathUtil.KOTLIN_JAVA_RUNTIME_JAR import org.jetbrains.kotlin.utils.PathUtil.getResourcePathForClass import org.junit.Assert import org.junit.Test @@ -45,6 +45,7 @@ import java.util.jar.Manifest import kotlin.reflect.KClass import kotlin.test.* +const val KOTLIN_JAVA_RUNTIME_JAR = "kotlin-stdlib.jar" class ScriptUtilIT {