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

Rename PathUtil.getJdkClassesRoots to avoid confusion

Browse Source 
Two of these methods return roots given a path to the JRE, and the third
one returns roots given a path to the _JDK_.
This commit is contained in:
Alexander Udalov
2017-04-26 19:26:51 +03:00
parent 15efbcae02
commit 7f5d87ea17
9 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+1 -1
View File
@@ -354,7 +354,7 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.addJvmClasspathRoots(classesRoots)
}
else {
configuration.addJvmClasspathRoots(PathUtil.getJdkClassesRoots())
configuration.addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre())
}
}
else {
compiler/daemon/src/org/jetbrains/kotlin/daemon/KotlinRemoteReplService.kt
+1 -1
View File
@@ -50,7 +50,7 @@ open class KotlinJvmReplService(
) : ReplCompileAction, ReplCheckAction, CreateReplStageStateAction {
protected val configuration = CompilerConfiguration().apply {
addJvmClasspathRoots(PathUtil.getJdkClassesRoots())
addJvmClasspathRoots(PathUtil.getJdkClassesRootsFromCurrentJre())
addJvmClasspathRoots(PathUtil.getKotlinPathsForCompiler().let { listOf(it.stdlibPath, it.reflectPath, it.scriptRuntimePath) })
addJvmClasspathRoots(templateClasspath)
put(CommonConfigurationKeys.MODULE_NAME, "kotlin-script")
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -2
View File
@@ -459,10 +459,10 @@ public class KotlinTestUtils {
JvmContentRootsKt.addJvmClasspathRoot(configuration, findAndroidApiJar());
}
else if (jdkKind == TestJdkKind.FULL_JDK_6) {
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRoots(getJre6Home()));
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromJre(getJre6Home()));
}
else {
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRoots());
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromCurrentJre());
}
if (configurationKind.getWithRuntime()) {
compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class ResolveDescriptorsFromExternalLibraries {
@NotNull
private static File findRtJar() {
List<File> roots = PathUtil.getJdkClassesRoots();
List<File> roots = PathUtil.getJdkClassesRootsFromCurrentJre();
for (File root : roots) {
if (root.getName().equals("rt.jar") || root.getName().equals("classes.jar")) {
return root;
compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.java
+3 -3
View File
@@ -159,12 +159,12 @@ public class PathUtil {
}
@NotNull
public static List<File> getJdkClassesRoots() {
return getJdkClassesRoots(System.getProperty("java.home"));
public static List<File> getJdkClassesRootsFromCurrentJre() {
return getJdkClassesRootsFromJre(System.getProperty("java.home"));
}
@NotNull
public static List<File> getJdkClassesRoots(@NotNull String javaHome) {
public static List<File> getJdkClassesRootsFromJre(@NotNull String javaHome) {
return JavaSdkUtil.getJdkClassesRoots(new File(javaHome), true);
}