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

[Gradle][Minor] Move evaluation of 'isResolvedToProject'

Browse Source 
KT-49933
This commit is contained in:
Sebastian Sellmair
2023-01-18 16:48:21 +01:00
committed by Space Team
parent 02c039ce8f
commit e0fde89262
1 changed files with 2 additions and 3 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/GranularMetadataTransformation.kt
+2 -3
View File
@@ -224,9 +224,6 @@ internal class GranularMetadataTransformation(
logger.debug("Transform composite metadata artifact: '${compositeMetadataArtifact.file}'") logger.debug("Transform composite metadata artifact: '${compositeMetadataArtifact.file}'")
val mppDependencyMetadataExtractor = params.projectStructureMetadataExtractorFactory.create(compositeMetadataArtifact) val mppDependencyMetadataExtractor = params.projectStructureMetadataExtractorFactory.create(compositeMetadataArtifact)
val isResolvedToProject = moduleId is ProjectComponentIdentifier && moduleId.build.isCurrentBuild
val projectStructureMetadata = mppDependencyMetadataExtractor.getProjectStructureMetadata() val projectStructureMetadata = mppDependencyMetadataExtractor.getProjectStructureMetadata()
?: return MetadataDependencyResolution.KeepOriginalDependency(module) ?: 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") 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 = val sourceSetVisibility =
params.sourceSetVisibilityProvider.getVisibleSourceSets( params.sourceSetVisibilityProvider.getVisibleSourceSets(
params.sourceSetName, params.sourceSetName,