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

KotlinMPPGradleProjectResolver: Ensure that artifactsMap is populated when Android plugin applied

Browse Source 
#KT-42381 fixed
This commit is contained in:
sebastian.sellmair
2020-10-15 11:24:25 +02:00
committed by Sebastian Sellmair
parent b42795a9ea
commit a60febbdfb
1 changed files with 1 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
+1 -2
View File
@@ -155,8 +155,6 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
sourceSet.dependencies.modifyDependenciesOnMppModules(ideProject, resolverCtx) sourceSet.dependencies.modifyDependenciesOnMppModules(ideProject, resolverCtx)
} }
super.populateModuleDependencies(gradleModule, ideModule, ideProject)//TODO add dependencies on mpp module super.populateModuleDependencies(gradleModule, ideModule, ideProject)//TODO add dependencies on mpp module
} else {
mppModel.dependencyMap.values.modifyDependenciesOnMppModules(ideProject, resolverCtx)
} }
populateModuleDependencies(gradleModule, ideProject, ideModule, resolverCtx) populateModuleDependencies(gradleModule, ideProject, ideModule, resolverCtx)
} }
@@ -583,6 +581,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp
resolverCtx: ProjectResolverContext resolverCtx: ProjectResolverContext
) { ) {
val mppModel = resolverCtx.getMppModel(gradleModule) ?: return val mppModel = resolverCtx.getMppModel(gradleModule) ?: return
mppModel.dependencyMap.values.modifyDependenciesOnMppModules(ideProject, resolverCtx)
val sourceSetMap = ideProject.getUserData(GradleProjectResolver.RESOLVED_SOURCE_SETS) ?: return val sourceSetMap = ideProject.getUserData(GradleProjectResolver.RESOLVED_SOURCE_SETS) ?: return
val artifactsMap = ideProject.getUserData(CONFIGURATION_ARTIFACTS) ?: return val artifactsMap = ideProject.getUserData(CONFIGURATION_ARTIFACTS) ?: return
val substitutor = KotlinNativeLibrariesDependencySubstitutor(mppModel, gradleModule, resolverCtx) val substitutor = KotlinNativeLibrariesDependencySubstitutor(mppModel, gradleModule, resolverCtx)