From 25f6b4c92240ed55fbb78844db98e030cf73ded5 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Tue, 7 Feb 2023 14:42:18 +0100 Subject: [PATCH] [Gradle][Minor] Make collectAllProjectStructureMetadataInCurrentBuild private ^KT-56431 Verification Pending ^KT-56461 Verification Pending --- .../gradle/plugin/mpp/KotlinProjectStructureMetadata.kt | 8 -------- ...pDependencyProjectStructureMetadataExtractorFactory.kt | 6 ++++++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt index 83823350572..1f30dee9aaf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt @@ -450,14 +450,6 @@ internal object GlobalProjectStructureMetadataStorage { } } -internal fun collectAllProjectStructureMetadataInCurrentBuild(project: Project): Map> { - return project - .rootProject - .allprojects - .associateBy { it.path } - .mapValues { (_, subProject) -> lazy { subProject.multiplatformExtensionOrNull?.kotlinProjectStructureMetadata } } -} - private const val ROOT_NODE_NAME = "projectStructure" private const val PUBLISHED_AS_ROOT_NAME = "isPublishedAsRoot" private const val FORMAT_VERSION_NODE_NAME = "formatVersion" diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractorFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractorFactory.kt index 707a4219811..28c9ef2c78c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractorFactory.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/MppDependencyProjectStructureMetadataExtractorFactory.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.plugin.mpp import org.gradle.api.Project import org.gradle.api.artifacts.component.ProjectComponentIdentifier import org.gradle.api.artifacts.result.ResolvedArtifactResult +import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull import org.jetbrains.kotlin.gradle.plugin.extraProperties import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.toSingleKpmModuleIdentifier import org.jetbrains.kotlin.gradle.utils.compositeBuildRootProject @@ -65,3 +66,8 @@ private constructor( } } } + +private fun collectAllProjectStructureMetadataInCurrentBuild(project: Project): Map> = + project.rootProject.allprojects.associate { subproject -> + subproject.path to lazy { subproject.multiplatformExtensionOrNull?.kotlinProjectStructureMetadata } + }