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

Minor, rename JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES

Browse Source
This commit is contained in:
Alexander Udalov
2016-11-08 10:25:02 +03:00
parent 5cd9e11f44
commit 7898e2447d
4 changed files with 6 additions and 6 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
@@ -333,7 +333,7 @@ class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage) configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage)
configuration.put(CLIConfigurationKeys.REPORT_PERF, arguments.reportPerf) configuration.put(CLIConfigurationKeys.REPORT_PERF, arguments.reportPerf)
configuration.put(JVMConfigurationKeys.USE_SINGLE_MODULE, arguments.singleModule) configuration.put(JVMConfigurationKeys.USE_SINGLE_MODULE, arguments.singleModule)
configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES, arguments.addCompilerBuiltIns) configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES, arguments.addCompilerBuiltIns)
arguments.declarationsOutputPath?.let { configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) } arguments.declarationsOutputPath?.let { configuration.put(JVMConfigurationKeys.DECLARATIONS_JSON_PATH, it) }
} }
compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
+2 -2
View File
@@ -58,8 +58,8 @@ public class JVMConfigurationKeys {
public static final CompilerConfigurationKey<Boolean> USE_SINGLE_MODULE = public static final CompilerConfigurationKey<Boolean> USE_SINGLE_MODULE =
CompilerConfigurationKey.create("combine modules for source files and binary dependencies into a single module"); CompilerConfigurationKey.create("combine modules for source files and binary dependencies into a single module");
public static final CompilerConfigurationKey<Boolean> ADD_BUILT_INS_TO_DEPENDENCIES = public static final CompilerConfigurationKey<Boolean> ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES =
CompilerConfigurationKey.create("add built-ins to dependencies"); CompilerConfigurationKey.create("add built-ins from the compiler jar to the dependencies of the module being resolved");
public static final CompilerConfigurationKey<JvmTarget> JVM_TARGET = public static final CompilerConfigurationKey<JvmTarget> JVM_TARGET =
CompilerConfigurationKey.create("JVM bytecode target version"); CompilerConfigurationKey.create("JVM bytecode target version");
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.kt
+2 -2
View File
@@ -135,7 +135,7 @@ object TopDownAnalyzerFacadeForJVM {
dependenciesContext.setDependencies(listOfNotNull( dependenciesContext.setDependencies(listOfNotNull(
dependenciesContext.module, dependenciesContext.module,
dependenciesContext.module.builtIns.builtInsModule.check { dependenciesContext.module.builtIns.builtInsModule.check {
configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES) configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES)
} }
)) ))
dependenciesContext.initializeModuleContents(CompositePackageFragmentProvider(listOf( dependenciesContext.initializeModuleContents(CompositePackageFragmentProvider(listOf(
@@ -182,7 +182,7 @@ object TopDownAnalyzerFacadeForJVM {
// TODO: remove dependencyModule from friends // TODO: remove dependencyModule from friends
module.setDependencies(ModuleDependenciesImpl( module.setDependencies(ModuleDependenciesImpl(
listOfNotNull(module, dependencyModule, module.builtIns.builtInsModule.check { listOfNotNull(module, dependencyModule, module.builtIns.builtInsModule.check {
configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES) configuration.getBoolean(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES)
}), }),
if (dependencyModule != null) setOf(dependencyModule) else emptySet() if (dependencyModule != null) setOf(dependencyModule) else emptySet()
)) ))
idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java
+1 -1
View File
@@ -144,7 +144,7 @@ public abstract class AbstractPositionManagerTest extends KotlinLightCodeInsight
CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK);
// TODO: delete this once JvmIDEVirtualFileFinder supports loading .kotlin_builtins files // TODO: delete this once JvmIDEVirtualFileFinder supports loading .kotlin_builtins files
configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_TO_DEPENDENCIES, true); configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES, true);
GenerationState state = GenerationUtils.compileFiles( GenerationState state = GenerationUtils.compileFiles(
files, files,