azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MPP, KPM]: Use new configureSingleVariantPublication API

Browse Source
This commit is contained in:
Anton Lakotka
2022-01-17 12:22:00 +01:00
committed by Space
parent 349bcca9e5
commit 4bc1804f23
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/LegacyMappedVariant.kt
+2 -2
View File
@@ -190,7 +190,7 @@ internal fun mapTargetCompilationsToKpmVariants(target: AbstractKotlinTarget, pu
is JointAndroidKotlinTargetComponent -> kotlinComponent.usages is JointAndroidKotlinTargetComponent -> kotlinComponent.usages
else -> error("unexpected type of kotlinComponent in legacy variant mapping: ${kotlinComponent.javaClass}") 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 // Include Sources
moduleHolder.whenPublicationAssigned { publication -> moduleHolder.whenPublicationAssigned { publication ->
@@ -202,7 +202,7 @@ internal fun mapTargetCompilationsToKpmVariants(target: AbstractKotlinTarget, pu
// FIXME: apply overrides for attributes and artifacts from the DefaultKotlinUsageContext! // FIXME: apply overrides for attributes and artifacts from the DefaultKotlinUsageContext!
// FIXME: include additional variants into project structure metadata? // FIXME: include additional variants into project structure metadata?
VariantPublishingConfigurator.get(target.project).configurePublishing( VariantPublishingConfigurator.get(target.project).configureSingleVariantPublishing(
variant, variant,
moduleHolder, moduleHolder,
configurationNames configurationNames