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

MPP: Allow 'implements' relation only within the same Gradle project

Browse Source 
Also allow COMMON modules on the "implementer" side

Original commit: 619e2bc0db
This commit is contained in:
Alexey Sedunov
2018-09-14 17:24:40 +03:00
parent 51ec98794b
commit 79e3b31ffc
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+2
View File
@@ -216,6 +216,8 @@ class KotlinFacetSettings {
var kind: KotlinModuleKind = KotlinModuleKind.DEFAULT var kind: KotlinModuleKind = KotlinModuleKind.DEFAULT
var sourceSetNames: List<String> = emptyList() var sourceSetNames: List<String> = emptyList()
var isTestModule: Boolean = false var isTestModule: Boolean = false
var externalProjectId: String = ""
} }
interface KotlinFacetSettingsProvider { interface KotlinFacetSettingsProvider {
jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+4
View File
@@ -132,6 +132,7 @@ private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings {
} else null } else null
} ?: KotlinModuleKind.DEFAULT } ?: KotlinModuleKind.DEFAULT
isTestModule = element.getAttributeValue("isTestModule")?.toBoolean() ?: false isTestModule = element.getAttributeValue("isTestModule")?.toBoolean() ?: false
externalProjectId = element.getAttributeValue("externalProjectId") ?: ""
element.getChild("compilerSettings")?.let { element.getChild("compilerSettings")?.let {
compilerSettings = CompilerSettings() compilerSettings = CompilerSettings()
XmlSerializer.deserializeInto(compilerSettings!!, it) XmlSerializer.deserializeInto(compilerSettings!!, it)
@@ -292,6 +293,9 @@ private fun KotlinFacetSettings.writeLatestConfig(element: Element) {
element.addContent(Element("newMppModelJpsModuleKind").apply { addContent(kind.name) }) element.addContent(Element("newMppModelJpsModuleKind").apply { addContent(kind.name) })
element.setAttribute("isTestModule", isTestModule.toString()) element.setAttribute("isTestModule", isTestModule.toString())
} }
if (externalProjectId.isNotEmpty()) {
element.setAttribute("externalProjectId", externalProjectId)
}
productionOutputPath?.let { productionOutputPath?.let {
if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) { if (it != (compilerArguments as? K2JSCompilerArguments)?.outputFile) {
element.addContent(Element("productionOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) }) element.addContent(Element("productionOutputPath").apply { addContent(PathUtil.toSystemIndependentName(it)) })