Fix setupRedirection

Author: igordmn

buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXImplPlugin.kt

@@ -29,12 +29,14 @@ import org.gradle.api.Project
 import org.gradle.api.component.SoftwareComponentFactory
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.create
+import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
 import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
 import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSoftwareComponentWithCoordinatesAndPublication
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinTarget
 import org.jetbrains.kotlin.konan.target.KonanTarget
 
 open class JetBrainsExtensions(
@@ -197,6 +199,7 @@ class JetBrainsAndroidXImplPlugin @Inject constructor(
     }
 }
 
+@OptIn(ExternalKotlinTargetApi::class)
 private fun enableArtifactRedirectionPublishing(project: Project) {
     val redirection = project.artifactRedirection() ?: return
 
@@ -221,7 +224,11 @@ private fun enableArtifactRedirectionPublishing(project: Project) {
     @OptIn(InternalKotlinGradlePluginApi::class)
     ext.targets.all { target ->
         if (target.name.lowercase() in redirection.targetNames) {
-            project.publishAndroidxReference(target as AbstractKotlinTarget, newRootComponent)
+            if (target is AbstractKotlinTarget) {
+                project.setupRedirection(target, newRootComponent)
+            } else if (target is DecoratedExternalKotlinTarget) {
+                project.setupRedirection(target, newRootComponent)
+            }
         }
     }
 }

buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsAndroidXRedirectingPublicationHelpers.kt

@@ -41,7 +41,10 @@ import org.gradle.api.internal.component.SoftwareComponentInternal
 import org.gradle.api.internal.component.UsageContext
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.api.publish.maven.tasks.AbstractPublishToMaven
+import org.jetbrains.kotlin.gradle.ExternalKotlinTargetApi
 import org.jetbrains.kotlin.gradle.InternalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.plugin.KotlinTargetComponent
+import org.jetbrains.kotlin.gradle.plugin.mpp.external.DecoratedExternalKotlinTarget
 
 /**
  * Usage that should be added to rootSoftwareComponent to represent target-specific variants
@@ -61,8 +64,17 @@ internal class CustomUsage(
     override fun getGlobalExcludes(): Set<ExcludeRule> = emptySet()
 }
 
+@OptIn(InternalKotlinGradlePluginApi::class, ExternalKotlinTargetApi::class)
+internal fun Project.setupRedirection(target: DecoratedExternalKotlinTarget, newRootComponent: CustomRootComponent) {
+    setupRedirection(target.kotlinComponents, newRootComponent)
+}
+@OptIn(InternalKotlinGradlePluginApi::class)
+internal fun Project.setupRedirection(target: AbstractKotlinTarget, newRootComponent: CustomRootComponent) {
+    setupRedirection(target.kotlinComponents, newRootComponent)
+}
+
 @OptIn(InternalKotlinGradlePluginApi::class)
-internal fun Project.publishAndroidxReference(target: AbstractKotlinTarget, newRootComponent: CustomRootComponent) {
+internal fun Project.setupRedirection(kotlinComponents: Set<KotlinTargetComponent>, newRootComponent: CustomRootComponent) {
     afterEvaluate {
         extensions.getByType(PublishingExtension::class.java).apply {
             val kotlinMultiplatform = publications
@@ -83,7 +95,7 @@ internal fun Project.publishAndroidxReference(target: AbstractKotlinTarget, newR
             if (it.publication.name == "kotlinMultiplatform") it.enabled = false
         }
 
-        target.kotlinComponents.forEach { component ->
+        kotlinComponents.forEach { component ->
             val componentName = component.name
 
             if (component is KotlinVariant)