From a91475010810991815417f946149df3bdbc79d7f Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 12 Sep 2022 09:35:35 +0200 Subject: [PATCH] [Gradle][MPP] Fix MetadataMappedCompilationDetails.compilation using wrong name for compilation ^KT-52726 Verification Pending --- .../kotlin/gradle/plugin/mpp/CompilationDetails.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt index 696192096ec..3b4698aa703 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompilationDetails.kt @@ -397,6 +397,11 @@ internal open class MetadataMappedCompilationDetails( defaultSourceSet: KotlinSourceSet, final override val compilationData: AbstractKotlinFragmentMetadataCompilationData ) : AbstractCompilationDetails(defaultSourceSet) { + + @Suppress("UNCHECKED_CAST") + override val compilation: KotlinCompilation + get() = target.compilations.getByName(defaultSourceSet.name) as KotlinCompilation + override val compileDependencyFilesHolder: GradleKpmDependencyFilesHolder = GradleKpmDependencyFilesHolder.ofMetadataCompilationDependencies(compilationData) @@ -411,7 +416,8 @@ internal open class MetadataMappedCompilationDetails( get() = emptySet() override fun whenSourceSetAdded(sourceSet: KotlinSourceSet) { - throw UnsupportedOperationException("metadata compilations have predefined sources") + if (sourceSet != defaultSourceSet) + throw UnsupportedOperationException("metadata compilations have predefined sources") } }