diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt index 764f98259dd..056c5a6c758 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinMPPGradleProjectResolver.kt @@ -155,8 +155,6 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp sourceSet.dependencies.modifyDependenciesOnMppModules(ideProject, resolverCtx) } super.populateModuleDependencies(gradleModule, ideModule, ideProject)//TODO add dependencies on mpp module - } else { - mppModel.dependencyMap.values.modifyDependenciesOnMppModules(ideProject, resolverCtx) } populateModuleDependencies(gradleModule, ideProject, ideModule, resolverCtx) } @@ -583,6 +581,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtensionComp resolverCtx: ProjectResolverContext ) { val mppModel = resolverCtx.getMppModel(gradleModule) ?: return + mppModel.dependencyMap.values.modifyDependenciesOnMppModules(ideProject, resolverCtx) val sourceSetMap = ideProject.getUserData(GradleProjectResolver.RESOLVED_SOURCE_SETS) ?: return val artifactsMap = ideProject.getUserData(CONFIGURATION_ARTIFACTS) ?: return val substitutor = KotlinNativeLibrariesDependencySubstitutor(mppModel, gradleModule, resolverCtx)