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

[Gradle] Fix PomDependenciesRewriter to check Android-specific configurations

Browse Source 
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
This commit is contained in:
Anton Lakotka
2023-07-06 10:55:17 +02:00
committed by Space Team
parent a5250839fa
commit a171d0d88e
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/mppDependencyRewritingUtils.kt
+12 -2
View File
@@ -219,7 +219,17 @@ private fun KotlinTargetComponent.findUsageContext(configurationName: String): U
return usageContexts.find { usageContext -> return usageContexts.find { usageContext ->
if (usageContext !is KotlinUsageContext) return@find false if (usageContext !is KotlinUsageContext) return@find false
val compilation = usageContext.compilation val compilation = usageContext.compilation
configurationName == compilation.target.apiElementsConfigurationName || val outgoingConfigurations = mutableListOf(
configurationName == compilation.target.runtimeElementsConfigurationName 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
} }
} }