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

multiplatformUtil: implementedModules shouldn't ignore android test module

Browse Source 
Relates to #KT-30799
This commit is contained in:
Dmitry Gridin
2019-07-22 17:56:25 +03:00
parent 8294e5afc2
commit 0993fb82fe
1 changed files with 3 additions and 1 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
+3 -1
View File
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.config.KotlinFacetSettings
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.idea.caches.project.SourceType.PRODUCTION import org.jetbrains.kotlin.idea.caches.project.SourceType.PRODUCTION
import org.jetbrains.kotlin.idea.caches.project.SourceType.TEST import org.jetbrains.kotlin.idea.caches.project.SourceType.TEST
import org.jetbrains.kotlin.idea.core.isAndroidModule
import org.jetbrains.kotlin.idea.facet.KotlinFacet import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.idea.facet.KotlinFacetType import org.jetbrains.kotlin.idea.facet.KotlinFacetType
import org.jetbrains.kotlin.idea.facet.KotlinFacetType.Companion.ID import org.jetbrains.kotlin.idea.facet.KotlinFacetType.Companion.ID
@@ -68,7 +69,8 @@ val Module.implementedModules: List<Module>
CachedValueProvider.Result( CachedValueProvider.Result(
if (isNewMPPModule) { if (isNewMPPModule) {
rootManager.dependencies.filter { rootManager.dependencies.filter {
it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && it.isTestModule == isTestModule // TODO: remove additional android check
it.isNewMPPModule && it.platform.isCommon() && it.externalProjectId == externalProjectId && (isAndroidModule() || it.isTestModule == isTestModule)
} }
} else { } else {
val modelsProvider = IdeModelsProviderImpl(project) val modelsProvider = IdeModelsProviderImpl(project)