From e0fde892628bad738d2b0456d8e518edbc0c8581 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 18 Jan 2023 16:48:21 +0100 Subject: [PATCH] [Gradle][Minor] Move evaluation of 'isResolvedToProject' KT-49933 --- .../gradle/plugin/mpp/GranularMetadataTransformation.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt index 7dc584c5d5f..38116f227f2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/GranularMetadataTransformation.kt @@ -224,9 +224,6 @@ internal class GranularMetadataTransformation( logger.debug("Transform composite metadata artifact: '${compositeMetadataArtifact.file}'") val mppDependencyMetadataExtractor = params.projectStructureMetadataExtractorFactory.create(compositeMetadataArtifact) - - val isResolvedToProject = moduleId is ProjectComponentIdentifier && moduleId.build.isCurrentBuild - val projectStructureMetadata = mppDependencyMetadataExtractor.getProjectStructureMetadata() ?: return MetadataDependencyResolution.KeepOriginalDependency(module) @@ -234,6 +231,8 @@ internal class GranularMetadataTransformation( error("Artifacts of dependency ${module.id.displayName} is built by old Kotlin Gradle Plugin and can't be consumed in this way") } + val isResolvedToProject = moduleId is ProjectComponentIdentifier && moduleId.build.isCurrentBuild + val sourceSetVisibility = params.sourceSetVisibilityProvider.getVisibleSourceSets( params.sourceSetName,