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);
}
j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt
+1 -1
View File
@@ -84,7 +84,7 @@ abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() {
applicationEnvironment.application.registerService(JavaClassSupers::class.java, JavaClassSupersImpl::class.java)
for (root in PathUtil.getJdkClassesRoots()) {
for (root in PathUtil.getJdkClassesRootsFromCurrentJre()) {
javaCoreEnvironment.addJarToClassPath(root)
}
val annotations: File? = findAnnotations()
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt
+1 -1
View File
@@ -150,7 +150,7 @@ abstract class AbstractKotlinKapt3IntegrationTest : CodegenTestCase() {
options: Map<String, String>,
stubsOutputDir: File,
incrementalDataOutputDir: File
) : AbstractKapt3Extension(PathUtil.getJdkClassesRoots() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath,
) : AbstractKapt3Extension(PathUtil.getJdkClassesRootsFromCurrentJre() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath,
emptyList(), javaSourceRoots, outputDir, outputDir,
stubsOutputDir, incrementalDataOutputDir, options, emptyMap(), "", true, System.currentTimeMillis(),
KaptLogger(true), correctErrorTypes = true
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
+1 -1
View File
@@ -118,7 +118,7 @@ abstract class AbstractKotlinKaptContextTest : AbstractKotlinKapt3Test() {
val sourceOutputDir = Files.createTempDirectory("kaptRunner").toFile()
try {
kaptRunner.doAnnotationProcessing(emptyList(), listOf(JavaKaptContextTest.simpleProcessor()),
compileClasspath = PathUtil.getJdkClassesRoots() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath,
compileClasspath = PathUtil.getJdkClassesRootsFromCurrentJre() + PathUtil.getKotlinPathsForIdeaPlugin().stdlibPath,
annotationProcessingClasspath = emptyList(), annotationProcessors = "",
sourcesOutputDir = sourceOutputDir, classesOutputDir = sourceOutputDir,
additionalSources = compilationUnits, withJdk = true)
plugins/uast-kotlin/tests/AbstractKotlinUastTest.kt
+9 -16
View File
@@ -15,15 +15,15 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoot
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.addKotlinSourceRoot
import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM
import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.uast.UastLanguagePlugin
import org.jetbrains.uast.evaluation.UEvaluatorExtension
import org.jetbrains.uast.kotlin.KotlinUastBindingContextProviderService
@@ -106,21 +106,14 @@ abstract class AbstractKotlinUastTest : AbstractUastTest() {
}
private fun createKotlinCompilerConfiguration(sourceFile: File): CompilerConfiguration {
val configuration = CompilerConfiguration()
configuration.addJvmClasspathRoots(PathUtil.getJdkClassesRoots())
return KotlinTestUtils.newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK).apply {
addKotlinSourceRoot(sourceFile.canonicalPath)
val kotlinLibsDir = File("dist/kotlinc/lib")
configuration.addJvmClasspathRoot(File(kotlinLibsDir, "kotlin-runtime.jar"))
configuration.addJvmClasspathRoot(File(kotlinLibsDir, "kotlin-reflect.jar"))
val messageCollector = PrintingMessageCollector(System.err, MessageRenderer.PLAIN_RELATIVE_PATHS, true)
put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
configuration.addKotlinSourceRoot(sourceFile.canonicalPath)
val messageCollector = PrintingMessageCollector(System.err, MessageRenderer.PLAIN_RELATIVE_PATHS, true)
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
configuration.put<String>(CommonConfigurationKeys.MODULE_NAME, "test-module")
return configuration
put(CommonConfigurationKeys.MODULE_NAME, "test-module")
}
}
private class KotlinCoreEnvironmentWrapper(val environment: KotlinCoreEnvironment,