From 29fe11b957c17def782821dc3db915fa5e6c90a8 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Tue, 1 Feb 2022 00:42:45 +0400 Subject: [PATCH] KPM: change detection of single-platform fragments to support WASM The previous predicate checked only for JVM/Android and JS, now the check is independent of the particular platform --- .../gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt index 57b8652b3a6..de693caf1f3 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinMetadataCompilationData.kt @@ -120,8 +120,8 @@ internal open class KotlinCommonFragmentMetadataCompilationDataImpl( override val isActive: Boolean get() = !fragment.isNativeShared() && fragment.containingModule.variantsContainingFragment(fragment).run { - !all { it.platformType in setOf(KotlinPlatformType.androidJvm, KotlinPlatformType.jvm)} && - !all { it.platformType == KotlinPlatformType.js } + !all { it.platformType in setOf(KotlinPlatformType.androidJvm, KotlinPlatformType.jvm) } && + mapTo(hashSetOf()) { it.platformType }.size > 1 } override val kotlinOptions: KotlinMultiplatformCommonOptions = KotlinMultiplatformCommonOptionsImpl()