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

Port of `kotlin-ide` commit: 9053046ad5731b7aca73e2f74b93e8bd8251f507
2020-09-30 12:25:25 +02:00
parent f9b8bc0edb
commit 4b152a635e
1 changed files with 4 additions and 7 deletions
@@ -117,16 +117,13 @@ val Module.implementedModules: List<Module>
            null -> emptyList()

            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
                    // to at least not make things worse.
                    // See KT-33809 for details
-                    implementedModulesM2()
-                } else {
-                    facetSettings.dependsOnModuleNames.mapNotNull {
-                        project.modulesByLinkedKey[it]
-                    }
-                }
+                    .plus(if (isAndroidModule()) implementedModulesM2() else emptyList())
+                    .distinct()
            }

            KotlinMultiplatformVersion.M2 -> {