From a171d0d88eaa83170caadb7c3a3b4a6714e574fa Mon Sep 17 00:00:00 2001
From: Anton Lakotka <anton.lakotka@jetbrains.com>
Date: Thu, 6 Jul 2023 10:55:17 +0200
Subject: [PATCH] [Gradle] Fix PomDependenciesRewriter to check
 Android-specific configurations

Initially it was implemented via "relatedConfigurations", but these
relatedConfigurations didn't contain outgoing configurations for default
base compilations, but for KotlinJvmAndroid did. There is no reason to
check incoming configurations for dependency rewriter. So for
KotlinJvmAndroidCompilation it is enough to check their variant-specific
outgoing configurations.

^KT-58225 Verification Pending
---
 .../plugin/mpp/mppDependencyRewritingUtils.kt      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
index 97e155c076d..79a9d2b6673 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
@@ -219,7 +219,17 @@ private fun KotlinTargetComponent.findUsageContext(configurationName: String): U
     return usageContexts.find { usageContext ->
         if (usageContext !is KotlinUsageContext) return@find false
         val compilation = usageContext.compilation
-        configurationName == compilation.target.apiElementsConfigurationName ||
-                configurationName == compilation.target.runtimeElementsConfigurationName
+        val outgoingConfigurations = mutableListOf(
+            compilation.target.apiElementsConfigurationName,
+            compilation.target.runtimeElementsConfigurationName
+        )
+        if (compilation is KotlinJvmAndroidCompilation) {
+            val androidVariant = compilation.androidVariant
+            outgoingConfigurations += listOf(
+                "${androidVariant.name}ApiElements",
+                "${androidVariant.name}RuntimeElements",
+            )
+        }
+        configurationName in outgoingConfigurations
     }
 }
\ No newline at end of file