KT-71784 Fix classpath for KMP shared source sets

dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt

@@ -74,7 +74,7 @@ class AndroidComposeIT {
                 val expectedFileTree = expectedHtml.toTreeString()
                 val actualFileTree = actualHtmlDir.toTreeString()
                 withClue((actualFileTree to expectedFileTree).sideBySide()) {
-                    expectedFileTree shouldBe actualFileTree
+                    actualFileTree shouldBe expectedFileTree
 
                     actualHtmlDir shouldBeADirectoryWithSameContentAs expectedHtml
                 }

dokka-integration-tests/gradle/src/test/kotlin/AndroidProjectIT.kt

@@ -75,7 +75,7 @@ class AndroidProjectIT {
                 val expectedFileTree = expectedHtml.toTreeString()
                 val actualFileTree = actualHtmlDir.toTreeString()
                 withClue((actualFileTree to expectedFileTree).sideBySide()) {
-                    expectedFileTree shouldBe actualFileTree
+                    actualFileTree shouldBe expectedFileTree
 
                     actualHtmlDir shouldBeADirectoryWithSameContentAs expectedHtml
                 }

dokka-integration-tests/gradle/src/testExampleProjects/kotlin/ExampleProjectsTest.kt

@@ -206,7 +206,7 @@ class ExampleProjectsTest {
                     withClue("expect file trees are the same") {
                         val expectedFileTree = expectedDataDir.toTreeString()
                         val actualFileTree = dokkaOutputDir.toTreeString()
-                        expectedFileTree shouldBe actualFileTree
+                        actualFileTree shouldBe expectedFileTree
                     }
 
                     withClue("expect directories are the same") {

dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/KotlinAdapter.kt

@@ -167,7 +167,7 @@ abstract class KotlinAdapter @Inject constructor(
         projectPath: String,
         details: KotlinSourceSetDetails,
     ): Provider<KotlinPlatform> {
-        return details.compilations.map { compilations: List<KotlinCompilationDetails> ->
+        return details.allCompilations.map { compilations: List<KotlinCompilationDetails> ->
             val allPlatforms = compilations
                 // Exclude metadata compilations: they are always KotlinPlatform.Common, which isn't relevant here.
                 // Dokka only cares about the compilable KMP targets of a KotlinSourceSet.
@@ -193,7 +193,7 @@ abstract class KotlinAdapter @Inject constructor(
     private fun determineClasspath(
         details: KotlinSourceSetDetails
     ): Provider<FileCollection> {
-        return details.compilations.map { compilations: List<KotlinCompilationDetails> ->
+        return details.primaryCompilations.map { compilations: List<KotlinCompilationDetails> ->
             val classpath = objects.fileCollection()
 
             if (compilations.isNotEmpty()) {
@@ -258,7 +258,8 @@ private data class KotlinCompilationDetails(
     val isMetadata: Boolean,
     /** [KotlinCompilation.platformType] name. */
     val kotlinPlatform: KotlinPlatform,
-    val allKotlinSourceSetsNames: Set<String>,
+    val primarySourceSetNames: Set<String>,
+    val allSourceSetNames: Set<String>,
     /**
      * Whether the compilation is published or not.
      *
@@ -267,7 +268,7 @@ private data class KotlinCompilationDetails(
      * (E.g. 'main' compilations are published, 'test' compilations are not.)
      */
     val publishedCompilation: Boolean,
-    /** [KotlinCompilation.defaultSourceSet] → [KotlinSourceSet.dependsOn] names. */
+    /** [KotlinCompilation.kotlinSourceSets] → [KotlinSourceSet.dependsOn] names. */
     val dependentSourceSetNames: Set<String>,
     val compilationClasspath: FileCollection,
     /** [KotlinCompilation.defaultSourceSet] name. */
@@ -305,19 +306,19 @@ private class KotlinCompilationDetailsBuilder(
     private fun createCompilationDetails(
         compilation: KotlinCompilation<*>,
     ): KotlinCompilationDetails {
-        val allKotlinSourceSetsNames =
-            compilation.allKotlinSourceSets.map { it.name } + compilation.defaultSourceSet.name
 
-        val dependentSourceSetNames =
-            compilation.defaultSourceSet.dependsOn.map { it.name }
+        val primarySourceSetNames = compilation.kotlinSourceSets.map { it.name }
+        val allSourceSetNames = compilation.allKotlinSourceSets.map { it.name }
+        val dependentSourceSetNames = compilation.kotlinSourceSets.flatMap { it.dependsOn }.map { it.name }
 
         val compilationClasspath: FileCollection =
             collectKotlinCompilationClasspath(compilation = compilation)
 
         return KotlinCompilationDetails(
             target = compilation.target.name,
             kotlinPlatform = KotlinPlatform.fromString(compilation.platformType.name),
-            allKotlinSourceSetsNames = allKotlinSourceSetsNames.toSet(),
+            primarySourceSetNames = primarySourceSetNames.toSet(),
+            allSourceSetNames = allSourceSetNames.toSet(),
             publishedCompilation = compilation.isPublished(),
             dependentSourceSetNames = dependentSourceSetNames.toSet(),
             compilationClasspath = compilationClasspath,
@@ -476,11 +477,14 @@ private abstract class KotlinSourceSetDetails @Inject constructor(
     abstract val sourceDirectoriesOfDependents: ConfigurableFileCollection
 
     /** The specific compilations used to build this source set. */
-    abstract val compilations: ListProperty<KotlinCompilationDetails>
+    abstract val primaryCompilations: ListProperty<KotlinCompilationDetails>
+
+    /** Associated compilations that this [KotlinSourceSet] participates in. */
+    abstract val allCompilations: ListProperty<KotlinCompilationDetails>
 
     /** Estimate if this Kotlin source set contains 'published' sources. */
     fun isPublishedSourceSet(): Provider<Boolean> =
-        compilations.map { values ->
+        allCompilations.map { values ->
             values.any { it.publishedCompilation }
         }
 
@@ -518,6 +522,7 @@ private class KotlinSourceSetDetailsBuilder(
         return sourceSetDetails
     }
 
+    /** Register a [DokkaSourceSetSpec]. */
     private fun NamedDomainObjectContainer<KotlinSourceSetDetails>.register(
         kotlinSourceSet: KotlinSourceSet,
         allKotlinCompilationDetails: ListProperty<KotlinCompilationDetails>,
@@ -530,9 +535,15 @@ private class KotlinSourceSetDetailsBuilder(
             kotlinSourceSet.kotlin.sourceDirectories.filter { it.exists() }
         }
 
-        val compilations = allKotlinCompilationDetails.map { allCompilations ->
+        val primaryCompilations = allKotlinCompilationDetails.map { primaryCompilations ->
+            primaryCompilations.filter { compilation ->
+                kotlinSourceSet.name in compilation.primarySourceSetNames
+            }
+        }
+
+        val allCompilations = allKotlinCompilationDetails.map { allCompilations ->
             allCompilations.filter { compilation ->
-                kotlinSourceSet.name in compilation.allKotlinSourceSetsNames
+                kotlinSourceSet.name in compilation.allSourceSetNames
             }
         }
 
@@ -565,7 +576,8 @@ private class KotlinSourceSetDetailsBuilder(
             this.dependentSourceSetIds.addAll(dependentSourceSetIds)
             this.sourceDirectories.from(extantSourceDirectories)
             this.sourceDirectoriesOfDependents.from(sourceDirectoriesOfDependents)
-            this.compilations.addAll(compilations)
+            this.primaryCompilations.addAll(primaryCompilations)
+            this.allCompilations.addAll(allCompilations)
         }
     }