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 1bdad6ca322..49a6d304bc8 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 @@ -287,7 +287,9 @@ open class DefaultCompilationDetails( addSourcesToCompileTask( sourceSet, addAsCommonSources = lazy { - CompilationSourceSetUtil.sourceSetsInMultipleCompilations(project).contains(sourceSet.name) + target.project.kotlinExtension.sourceSets.any { otherSourceSet -> + sourceSet in otherSourceSet.dependsOn + } } ) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt index 8b9d6f8fe20..567b598e296 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/kotlinCompilations.kt @@ -282,11 +282,6 @@ internal object CompilationSourceSetUtil { return compilationNamesBySourceSetName.get() } - - fun sourceSetsInMultipleCompilations(project: Project) = - compilationsBySourceSets(project).mapNotNullTo(mutableSetOf()) { (sourceSet, compilations) -> - sourceSet.name.takeIf { compilations.size > 1 } - } } private val invalidModuleNameCharactersRegex = """[\\/\r\n\t]""".toRegex()