From ad4a3c0b7c3f4d6d6930b5ff40028646e6146ac3 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 6 Sep 2018 16:01:05 +0300 Subject: [PATCH] MPP: Do not import compilations with 'metadata' target #KT-26634 Fixed --- .../idea/configuration/KotlinMPPGradleProjectResolver.kt | 1 + idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt | 4 ++++ 2 files changed, 5 insertions(+) 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 4b1fecba0b2..8dd4d2db45e 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 @@ -172,6 +172,7 @@ open class KotlinMPPGradleProjectResolver : AbstractProjectResolverExtension() { val sourceSetToCompilationData = LinkedHashMap>() for (target in mppModel.targets) { if (target.platform == KotlinPlatform.ANDROID) continue + if (target.name == KotlinTarget.METADATA_TARGET_NAME) continue val targetData = KotlinTargetData(target.name).also { it.archiveFile = target.jar?.archiveFile } diff --git a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt index a01516a422e..98c08f1325e 100644 --- a/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt +++ b/idea/kotlin-gradle-tooling/src/KotlinMPPGradleModel.kt @@ -78,6 +78,10 @@ interface KotlinTarget : Serializable { val platform: KotlinPlatform val compilations: Collection val jar: KotlinTargetJar? + + companion object { + const val METADATA_TARGET_NAME = "metadata" + } } interface ExtraFeatures : Serializable {