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

MPP: Do not populate content roots in the absence of ExternalProject

Browse Source 
#KT-26900 Fixed
This commit is contained in:
Alexey Sedunov
2018-09-18 16:39:25 +03:00
parent 4f01a438c4
commit 22c77ffbb2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
+1
View File
@@ -301,6 +301,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
resolverCtx: ProjectResolverContext resolverCtx: ProjectResolverContext
) { ) {
val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) ?: return val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) ?: 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.platform == KotlinPlatform.ANDROID) return@processSourceSets if (dataNode == null || sourceSet.platform == KotlinPlatform.ANDROID) return@processSourceSets
createContentRootData(sourceSet.sourceDirs, sourceSet.sourceType, dataNode) createContentRootData(sourceSet.sourceDirs, sourceSet.sourceType, dataNode)