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

multiplatformUtil; Module.implementedModules: Extend Android M2 fallback to also include M3 relevant modules

Browse Source 
Port of `kotlin-ide` commit: 9053046ad5731b7aca73e2f74b93e8bd8251f507
This commit is contained in:
sebastian.sellmair
2020-09-30 12:25:25 +02:00
committed by Sebastian Sellmair
parent f9b8bc0edb
commit 4b152a635e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
+4 -7
View File
@@ -117,16 +117,13 @@ val Module.implementedModules: List<Module>
null -> emptyList() null -> emptyList()
KotlinMultiplatformVersion.M3 -> { KotlinMultiplatformVersion.M3 -> {
if (isAndroidModule()) { facetSettings.dependsOnModuleNames
.mapNotNull { project.modulesByLinkedKey[it] }
// HACK: we do not import proper dependsOn for android source-sets in M3, so fallback to M2-impl // HACK: we do not import proper dependsOn for android source-sets in M3, so fallback to M2-impl
// to at least not make things worse. // to at least not make things worse.
// See KT-33809 for details // See KT-33809 for details
implementedModulesM2() .plus(if (isAndroidModule()) implementedModulesM2() else emptyList())
} else { .distinct()
facetSettings.dependsOnModuleNames.mapNotNull {
project.modulesByLinkedKey[it]
}
}
} }
KotlinMultiplatformVersion.M2 -> { KotlinMultiplatformVersion.M2 -> {