From 399b0f9b23a493bf47df2f74abe1f6faf6723918 Mon Sep 17 00:00:00 2001 From: Gabriel Ittner Date: Sat, 28 May 2022 11:49:26 +0200 Subject: [PATCH] fix legacy Android setup in mpp projects (#350) --- .../com/vanniktech/maven/publish/legacy/Platform.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugin/src/main/kotlin/com/vanniktech/maven/publish/legacy/Platform.kt b/plugin/src/main/kotlin/com/vanniktech/maven/publish/legacy/Platform.kt index 689d99c6..66d8154b 100644 --- a/plugin/src/main/kotlin/com/vanniktech/maven/publish/legacy/Platform.kt +++ b/plugin/src/main/kotlin/com/vanniktech/maven/publish/legacy/Platform.kt @@ -54,7 +54,7 @@ internal fun Project.configureNotAndroidPlatform() { internal fun Project.configureAndroidPlatform() { if (hasWorkingNewAndroidPublishingApi()) { - // afterEvaluate is too late but we can't run this synchronously because we shouldn't call the APIs for + // afterEvaluate is too late, but we can't run this synchronously because we shouldn't call the APIs for // multiplatform projects that use Android androidComponents.finalizeDsl { if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) { @@ -68,9 +68,11 @@ internal fun Project.configureAndroidPlatform() { } } else { afterEvaluate { - // release was the old default value before it was changed to null for AGP 7.1+ - val variant = legacyExtension.androidVariantToPublish ?: "release" - baseExtension.configure(AndroidLibrary(defaultJavaDocOption() ?: javadoc(), variant = variant)) + if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) { + // release was the old default value before it was changed to null for AGP 7.1+ + val variant = legacyExtension.androidVariantToPublish ?: "release" + baseExtension.configure(AndroidLibrary(defaultJavaDocOption() ?: javadoc(), variant = variant)) + } } } }