From 4bc1804f235142a472b8dfcb2e7c5a71066952e0 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Mon, 17 Jan 2022 12:22:00 +0100 Subject: [PATCH] [MPP, KPM]: Use new configureSingleVariantPublication API --- .../kotlin/gradle/plugin/mpp/pm20/LegacyMappedVariant.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/LegacyMappedVariant.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/LegacyMappedVariant.kt index dbd5ce17616..b664c70053e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/LegacyMappedVariant.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/LegacyMappedVariant.kt @@ -190,7 +190,7 @@ internal fun mapTargetCompilationsToKpmVariants(target: AbstractKotlinTarget, pu is JointAndroidKotlinTargetComponent -> kotlinComponent.usages else -> error("unexpected type of kotlinComponent in legacy variant mapping: ${kotlinComponent.javaClass}") } - val configurationNames = usages.map { it.dependencyConfigurationName } + val configurationNames = usages.map { target.project.configurations.getByName(it.dependencyConfigurationName) } // Include Sources moduleHolder.whenPublicationAssigned { publication -> @@ -202,7 +202,7 @@ internal fun mapTargetCompilationsToKpmVariants(target: AbstractKotlinTarget, pu // FIXME: apply overrides for attributes and artifacts from the DefaultKotlinUsageContext! // FIXME: include additional variants into project structure metadata? - VariantPublishingConfigurator.get(target.project).configurePublishing( + VariantPublishingConfigurator.get(target.project).configureSingleVariantPublishing( variant, moduleHolder, configurationNames