From 267703e6b77e4db62504996bc29d2be39b8e1562 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 26 Jan 2017 07:22:26 +0300 Subject: [PATCH] Change references to kotlin-stdlib-js.jar in plugin. Change test projects for js project configurator. #KT-15940 --- compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java | 4 ++-- idea/testData/configuration/jsLibrary/projectFile.ipr | 4 ++-- .../twoModulesWithJSNonDefaultPath/projectFile.ipr | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java index cf04dc523f7..dc06fd6c64b 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java +++ b/compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java @@ -28,10 +28,10 @@ public class PathUtil { public static final String JPS_KOTLIN_HOME_PROPERTY = "jps.kotlin.home"; - public static final String JS_LIB_JAR_NAME = "kotlin-jslib.jar"; + public static final String JS_LIB_JAR_NAME = "kotlin-stdlib-js.jar"; public static final String ALLOPEN_PLUGIN_JAR_NAME = "allopen-compiler-plugin.jar"; public static final String NOARG_PLUGIN_JAR_NAME = "noarg-compiler-plugin.jar"; - public static final String JS_LIB_SRC_JAR_NAME = "kotlin-jslib-sources.jar"; + public static final String JS_LIB_SRC_JAR_NAME = "kotlin-stdlib-js-sources.jar"; public static final String KOTLIN_JAVA_RUNTIME_JAR = "kotlin-runtime.jar"; public static final String KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"; public static final String KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"; diff --git a/idea/testData/configuration/jsLibrary/projectFile.ipr b/idea/testData/configuration/jsLibrary/projectFile.ipr index 85479678f10..ecb84b2a8e5 100644 --- a/idea/testData/configuration/jsLibrary/projectFile.ipr +++ b/idea/testData/configuration/jsLibrary/projectFile.ipr @@ -9,11 +9,11 @@ - + - + diff --git a/idea/testData/configuration/twoModulesWithJSNonDefaultPath/projectFile.ipr b/idea/testData/configuration/twoModulesWithJSNonDefaultPath/projectFile.ipr index eea4e721978..b88b2c75921 100644 --- a/idea/testData/configuration/twoModulesWithJSNonDefaultPath/projectFile.ipr +++ b/idea/testData/configuration/twoModulesWithJSNonDefaultPath/projectFile.ipr @@ -10,11 +10,11 @@ - + - +