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

MPP: Add production module dependencies to the test one (new MPP import)

Browse Source 
#KT-25985 In Progress
This commit is contained in:
Alexey Sedunov
2018-08-15 13:00:13 +03:00
parent 443f8b6f02
commit d194893012
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt
+17 -6
View File
@@ -337,13 +337,14 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
} }
} }
} }
val sourceSetGraph = GraphBuilder.directed().build<KotlinSourceSet>() val sourceSetGraph = GraphBuilder.directed().build<KotlinModule>()
processSourceSets(gradleModule, mppModel, ideModule, resolverCtx) { dataNode, sourceSet -> processSourceSets(gradleModule, mppModel, ideModule, resolverCtx) { dataNode, sourceSet ->
dataNode.data.productionModuleId?.let { val productionSourceSet = dataNode.data.productionModuleId
val productionModuleDataNode = ideModule.findChildModuleByInternalName(it) ?.let { ideModule.findChildModuleByInternalName(it) }
if (productionModuleDataNode != null) { ?.kotlinSourceSet
addDependency(dataNode, productionModuleDataNode) ?.kotlinModule
} if (productionSourceSet != null) {
sourceSetGraph.putEdge(sourceSet, productionSourceSet!!)
} }
for (targetSourceSetName in sourceSet.dependsOnSourceSets) { for (targetSourceSetName in sourceSet.dependsOnSourceSets) {
val targetSourceSet = mppModel.sourceSets[targetSourceSetName] ?: continue val targetSourceSet = mppModel.sourceSets[targetSourceSetName] ?: continue
@@ -358,6 +359,16 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() {
preprocessDependencies(sourceSet, ideProject), preprocessDependencies(sourceSet, ideProject),
ideProject ideProject
) )
if (productionSourceSet != null) {
buildDependencies(
resolverCtx,
sourceSetMap,
artifactsMap,
dataNode,
preprocessDependencies(productionSourceSet, ideProject),
ideProject
)
}
} }
} }
for (edge in Graphs.transitiveClosure(sourceSetGraph).edges()) { for (edge in Graphs.transitiveClosure(sourceSetGraph).edges()) {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/dataNodeUtils.kt
+1 -1
View File
@@ -14,4 +14,4 @@ fun DataNode<*>.findChildModuleById(id: String) =
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
fun DataNode<*>.findChildModuleByInternalName(name: String) = fun DataNode<*>.findChildModuleByInternalName(name: String) =
children.firstOrNull { (it.data as? ModuleData)?.internalName == name } children.firstOrNull { (it.data as? ModuleData)?.internalName == name } as? DataNode<out ModuleData>