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/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class GenerationState @JvmOverloads constructor(
val generateDeclaredClassFilter: GenerateClassFilter = GenerationState.GenerateClassFilter.GENERATE_ALL,
// For incremental compilation
val targetId: TargetId? = null,
moduleName: String? = configuration.get(JVMConfigurationKeys.MODULE_NAME),
moduleName: String? = configuration.get(CommonConfigurationKeys.MODULE_NAME),
// 'outDirectory' is a hack to correctly determine if a compiled class is from the same module as the callee during
// partial compilation. Module chunks are treated as a single module.
// TODO: get rid of it with the proper module infrastructure