From b931868d41cc811f4cf72f8262b7385098a65124 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Thu, 9 Feb 2023 11:50:39 +0100 Subject: [PATCH] [Gradle] GlobalProjectStructureMetadataStorage: Properly store PSM using the buildName... ...instead of the root projects name ^KT-56536 Verification Pending --- .../kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 10ace924f9c..83823350572 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 @@ -16,6 +16,7 @@ import org.gradle.api.tasks.Nested import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.GradleKpmModule +import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.currentBuildId import org.jetbrains.kotlin.gradle.plugin.sources.KotlinDependencyScope import org.jetbrains.kotlin.gradle.plugin.sources.sourceSetDependencyConfigurationByScope import org.jetbrains.kotlin.gradle.targets.metadata.dependsOnClosureWithInterCompilationDependencies @@ -417,7 +418,7 @@ internal object GlobalProjectStructureMetadataStorage { fun registerProjectStructureMetadata(project: Project, metadataProvider: () -> KotlinProjectStructureMetadata) { project.compositeBuildRootProject.extensions.extraProperties.set( - propertyName(project.rootProject.name, project.path), + propertyName(project.currentBuildId().name, project.path), { metadataProvider().toJson() } ) }