From 57b85e155c62811f41445343660d6859bebb9c20 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Mon, 20 Dec 2021 22:14:24 +0400 Subject: [PATCH] KPM/Gradle: don't include host-specific klibs into the common metadata --- .../plugin/mpp/pm20/fragmentsMetadataCompilation.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt index 88f8759955c..85a6c2709fa 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/fragmentsMetadataCompilation.kt @@ -10,7 +10,6 @@ import org.gradle.api.Project import org.gradle.api.attributes.Usage import org.gradle.api.tasks.TaskProvider import org.gradle.jvm.tasks.Jar -import org.jetbrains.kotlin.gradle.dsl.pm20Extension import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.KotlinCommonSourceSetProcessor import org.jetbrains.kotlin.gradle.plugin.mpp.* @@ -153,8 +152,12 @@ private fun configureMetadataJarTask( module.fragments.all { fragment -> allMetadataJar.configure { jar -> val metadataOutput = project.files(Callable { - val compilationData = registry.byFragment(fragment) - project.filesWithUnpackedArchives(compilationData.output.allOutputs, setOf(KLIB_FILE_EXTENSION)) + val compilationData = registry.getForFragmentOrNull(fragment) + compilationData?.run { + if (!fragment.isNativeHostSpecific()) + project.filesWithUnpackedArchives(compilationData.output.allOutputs, setOf(KLIB_FILE_EXTENSION)) + else emptyList() + } ?: emptyList() }) jar.from(metadataOutput) { spec -> spec.into(fragment.fragmentName)