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

Move some configuration keys to JVM or to CommonConfigurationKeys

Browse Source 
Move CONTENT_ROOTS and SCRIPT_DEFINITIONS_KEY to JVMConfigurationKeys because
they are only used on JVM, rename the latter to SCRIPT_DEFINITIONS.

Move MODULE_NAME to CommonConfigurationKeys to be combined with MODULE_ID in
JSConfigurationKeys in the future
This commit is contained in:
Alexander Udalov
2016-05-25 20:55:15 +03:00
parent 6674412079
commit 05f8836f46
14 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -2
View File
@@ -420,7 +420,7 @@ public class KotlinTestUtils {
@NotNull
public static CompilerConfiguration newConfiguration() {
CompilerConfiguration configuration = new CompilerConfiguration();
configuration.put(JVMConfigurationKeys.MODULE_NAME, TEST_MODULE_NAME);
configuration.put(CommonConfigurationKeys.MODULE_NAME, TEST_MODULE_NAME);
return configuration;
}
@@ -472,7 +472,7 @@ public class KotlinTestUtils {
}
public static void resolveAllKotlinFiles(KotlinCoreEnvironment environment) throws IOException {
List<ContentRoot> paths = environment.getConfiguration().get(CommonConfigurationKeys.CONTENT_ROOTS);
List<ContentRoot> paths = environment.getConfiguration().get(JVMConfigurationKeys.CONTENT_ROOTS);
if (paths == null) return;
List<KtFile> ktFiles = new ArrayList<KtFile>();
for (ContentRoot root : paths) {