From 5d9915e133c5ec7a0ff9a7e25cf5407786002963 Mon Sep 17 00:00:00 2001 From: Anton Lakotka Date: Tue, 25 May 2021 16:45:31 +0200 Subject: [PATCH] Don't copy extendsFrom configs for resolvableMetadataConfiguration Gradle's detached configurations doesn't respect extends from relation to other configurations due to gradle bug. In fact extendsFrom isn't required for resolvableMetadataConfiguration business logic. It is enough to include all originalDependencies to freshly created detached configuration. ^KT-46417 Fixed --- .../kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt index 05ca0aec86f..f90effa595a 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt @@ -320,8 +320,7 @@ internal fun resolvableMetadataConfiguration( attributes.attribute(key, allSourceSetsConfiguration.attributes.getAttribute(key)!!) } allSourceSetsConfiguration.attributes.keySet().forEach { copyAttribute(it) } - allSourceSetsConfiguration.extendsFrom.forEach { extendsFrom(it) } - dependencies.addAll(originalDependencies) // TODO: check if this line is redundant + dependencies.addAll(originalDependencies) } modifiedConfiguration!!.dependencies.add(dependency) }