From 992f7bf3c1e3e29942e3b6a67ec012449116c5b3 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Mon, 6 Dec 2021 18:22:29 +0400 Subject: [PATCH] Disable o.j.k.multiplatform publications with KPM model mapping --- .../kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt index 4a5047975ff..9ff64e01083 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinMultiplatformPlugin.kt @@ -101,10 +101,12 @@ class KotlinMultiplatformPlugin : Plugin { KotlinMetadataTargetPreset(project), METADATA_TARGET_NAME ) - configurePublishingWithMavenPublish(project) project.registerKotlinArtifactsExtension() - targetsContainer.withType(AbstractKotlinTarget::class.java).all { applyUserDefinedAttributes(it) } + if (!project.hasKpmModel) { + configurePublishingWithMavenPublish(project) + targetsContainer.withType(AbstractKotlinTarget::class.java).all { applyUserDefinedAttributes(it) } + } // propagate compiler plugin options to the source set language settings setupAdditionalCompilerArguments(project)