fix legacy Android setup in mpp projects (#350)

vanniktech · May 28, 2022 · 399b0f9 · 399b0f9
1 parent c8dd40c
commit 399b0f9
Showing 1 changed file with 6 additions and 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
@@ -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))
+      }
     }
   }
 }