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

Use new path for stdlib sources jar

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-04-03 17:45:16 +02:00
parent 38abc0ca8e
commit 78844dd4aa
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java
+1 -1
View File
@@ -46,7 +46,7 @@ public interface KotlinPaths {
File getKotlinTestPath();
@NotNull
File getRuntimeSourcesPath();
File getStdlibSourcesPath();
@NotNull
File getJsStdLibJarPath();
compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java
+2 -2
View File
@@ -72,8 +72,8 @@ public class KotlinPathsFromHomeDir implements KotlinPaths {
@NotNull
@Override
public File getRuntimeSourcesPath() {
return getLibraryFile(PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR);
public File getStdlibSourcesPath() {
return getLibraryFile(PathUtil.KOTLIN_JAVA_STDLIB_SRC_JAR);
}
@Override
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class PathUtil {
public static final String KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar";
public static final String KOTLIN_TEST_JAR = "kotlin-test.jar";
public static final String KOTLIN_TEST_JS_JAR = "kotlin-test-js.jar";
public static final String KOTLIN_JAVA_RUNTIME_SRC_JAR = "kotlin-runtime-sources.jar";
public static final String KOTLIN_JAVA_STDLIB_SRC_JAR = "kotlin-stdlib-sources.jar";
public static final String KOTLIN_COMPILER_JAR = "kotlin-compiler.jar";
public static final Pattern KOTLIN_RUNTIME_JAR_PATTERN = Pattern.compile("kotlin-(stdlib|runtime)(-\\d[\\d.]+(-.+)?)?\\.jar");
idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt
+1 -1
View File
@@ -176,7 +176,7 @@ enum class LibraryJarDescriptor(val jarName: String,
REFLECT_JAR(PathUtil.KOTLIN_JAVA_REFLECT_JAR, OrderRootType.CLASSES, false, KotlinPaths::getReflectPath),
SCRIPT_RUNTIME_JAR(PathUtil.KOTLIN_JAVA_SCRIPT_RUNTIME_JAR, OrderRootType.CLASSES, true, KotlinPaths::getScriptRuntimePath),
TEST_JAR(PathUtil.KOTLIN_TEST_JAR, OrderRootType.CLASSES, false, KotlinPaths::getKotlinTestPath),
RUNTIME_SRC_JAR(PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR, OrderRootType.SOURCES, false, KotlinPaths::getRuntimeSourcesPath),
RUNTIME_SRC_JAR(PathUtil.KOTLIN_JAVA_STDLIB_SRC_JAR, OrderRootType.SOURCES, false, KotlinPaths::getStdlibSourcesPath),
JS_STDLIB_JAR(PathUtil.JS_LIB_JAR_NAME, OrderRootType.CLASSES, true, KotlinPaths::getJsStdLibJarPath),
JS_STDLIB_SRC_JAR(PathUtil.JS_LIB_SRC_JAR_NAME, OrderRootType.SOURCES, false, KotlinPaths::getJsStdLibSrcJarPath);
idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
+1 -1
View File
@@ -51,7 +51,7 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
requestFullJarUpdate(ideaPluginPaths.stdlibPath)
requestFullJarUpdate(ideaPluginPaths.reflectPath)
requestFullJarUpdate(ideaPluginPaths.scriptRuntimePath)
requestFullJarUpdate(ideaPluginPaths.runtimeSourcesPath)
requestFullJarUpdate(ideaPluginPaths.stdlibSourcesPath)
requestFullJarUpdate(ideaPluginPaths.jsStdLibJarPath)
requestFullJarUpdate(ideaPluginPaths.jsStdLibSrcJarPath)