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

Fix creation of common source roots if android plugin is involved

Browse Source 
#KT-34237 Fixed
This commit is contained in:
Andrey Uskov
2019-10-09 18:14:36 +03:00
parent a60cbef5d2
commit aa6ff4b9da
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
+2 -2
View File
@@ -349,7 +349,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
val ignoreCommonSourceSets by lazy { externalProject.notImportedCommonSourceSets() } val ignoreCommonSourceSets by lazy { externalProject.notImportedCommonSourceSets() }
for (sourceSet in mppModel.sourceSets.values) { for (sourceSet in mppModel.sourceSets.values) {
if (sourceSet.actualPlatforms.supports(KotlinPlatform.ANDROID)) continue if (sourceSet.actualPlatforms.platforms.singleOrNull() == KotlinPlatform.ANDROID) continue
if (sourceSet.actualPlatforms.supports(KotlinPlatform.COMMON) && ignoreCommonSourceSets) continue if (sourceSet.actualPlatforms.supports(KotlinPlatform.COMMON) && ignoreCommonSourceSets) continue
val moduleId = getKotlinModuleId(gradleModule, sourceSet, resolverCtx) val moduleId = getKotlinModuleId(gradleModule, sourceSet, resolverCtx)
val existingSourceSetDataNode = sourceSetMap[moduleId]?.first val existingSourceSetDataNode = sourceSetMap[moduleId]?.first
@@ -447,7 +447,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
.toMap() .toMap()
if (resolverCtx.getExtraProject(gradleModule, ExternalProject::class.java) == null) return if (resolverCtx.getExtraProject(gradleModule, ExternalProject::class.java) == null) return
processSourceSets(gradleModule, mppModel, ideModule, resolverCtx) { dataNode, sourceSet -> processSourceSets(gradleModule, mppModel, ideModule, resolverCtx) { dataNode, sourceSet ->
if (dataNode == null || sourceSet.actualPlatforms.supports(KotlinPlatform.ANDROID)) return@processSourceSets if (dataNode == null || sourceSet.actualPlatforms.platforms.singleOrNull() == KotlinPlatform.ANDROID) return@processSourceSets
createContentRootData( createContentRootData(
sourceSet.sourceDirs, sourceSet.sourceDirs,
sourceSet.sourceType, sourceSet.sourceType,