From d9957335d37358d2548b9ab0cf2af558ca1eadec Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 25 Jan 2023 18:43:14 +0100 Subject: [PATCH] [Gradle] Don't fail when psm is missing from a given included build This basically restores behaviour as before changes related to the configuration cache support See: https://github.com/JetBrains/kotlin/blob/35dacd6add18e031902765fd1386f9f8aad7e738/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/KotlinProjectStructureMetadata.kt#L427 ^KT-56198 Verification Pending --- .../MppDependencyProjectStructureMetadataExtractorFactory.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 8eaa1680c86..0ed2a1ae261 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 @@ -42,13 +42,10 @@ private constructor( ) } else { val key = ProjectPathWithBuildName(moduleId.projectPath, moduleId.build.name) - val projectStructureMetadataProvider = includedBuildsProjectStructureMetadataProviders.value[key] - ?: error("Project structure metadata not found for project $key") - IncludedBuildMppDependencyProjectStructureMetadataExtractor( componentId = moduleId, primaryArtifact = metadataArtifact.file, - projectStructureMetadataProvider = projectStructureMetadataProvider::value + projectStructureMetadataProvider = { includedBuildsProjectStructureMetadataProviders.value[key]?.value } ) } } else {