From 21a50e214f3d834bd51525807929e1adb9d0fe6c Mon Sep 17 00:00:00 2001 From: Vadim Mishenev Date: Mon, 11 Apr 2022 20:28:57 +0300 Subject: [PATCH] Fix classpath in HMPP (#2431) --- .../jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt index 8fec309aab..fdb4642ccb 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt @@ -21,12 +21,13 @@ internal fun Project.allCompilationsOf( } internal fun Project.compilationsOf(sourceSet: KotlinSourceSet): List { - return allCompilationsOf(sourceSet).filter { compilation -> sourceSet in compilation.kotlinSourceSets } + //KT-45412 Make sure .kotlinSourceSets and .allKotlinSourceSets include the default source set + return allCompilationsOf(sourceSet).filter { compilation -> sourceSet in compilation.kotlinSourceSets || sourceSet == compilation.defaultSourceSet } } private fun KotlinMultiplatformExtension.allCompilationsOf(sourceSet: KotlinSourceSet): List { val allCompilations = targets.flatMap { target -> target.compilations } - return allCompilations.filter { compilation -> sourceSet in compilation.allKotlinSourceSets } + return allCompilations.filter { compilation -> sourceSet in compilation.allKotlinSourceSets || sourceSet == compilation.defaultSourceSet } } private fun KotlinSingleTargetExtension.allCompilationsOf(sourceSet: KotlinSourceSet): List {