diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt index 84559d2d11d..c74334baee5 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModelBuilder.kt @@ -32,6 +32,9 @@ import org.jetbrains.plugins.gradle.tooling.util.SourceSetCachedFinder import org.jetbrains.plugins.gradle.tooling.util.resolve.DependencyResolverImpl import java.io.File import java.lang.reflect.Method +import kotlin.collections.ArrayList +import kotlin.collections.HashMap +import kotlin.collections.LinkedHashSet class KotlinMPPGradleModelBuilder : ModelBuilderService { override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder { @@ -615,6 +618,13 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { androidDeps: Map>? ): List { return ArrayList().apply { + buildAndroidSourceSetDependencies(androidDeps, gradleSourceSet).let { + if (it.isNotEmpty()) { + this += it + return@apply + } + } + val transformationBuilder = MetadataDependencyTransformationBuilder(gradleSourceSet) this += buildDependencies( gradleSourceSet, dependencyResolver, "getApiMetadataConfigurationName", "COMPILE", project, transformationBuilder @@ -628,8 +638,6 @@ class KotlinMPPGradleModelBuilder : ModelBuilderService { this += buildDependencies( gradleSourceSet, dependencyResolver, "getRuntimeOnlyMetadataConfigurationName", "RUNTIME", project, transformationBuilder ).onlyNewDependencies(this) - - this += buildAndroidSourceSetDependencies(androidDeps, gradleSourceSet) } }