revert depending on all transitive source sets

Kotlin · Nov 21, 2024 · aca1c58 · aca1c58
1 parent 36eb7d7
commit aca1c58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/dokka-integration-tests/gradle/src/testExampleProjects/kotlin/ExampleProjectsTest.kt b/dokka-integration-tests/gradle/src/testExampleProjects/kotlin/ExampleProjectsTest.kt
@@ -28,6 +28,7 @@ import java.util.stream.Stream
 import kotlin.io.path.*
 import kotlin.streams.asStream
 
+
 class ExampleProjectsTest {
 
     class TestCaseProvider : ArgumentsProvider {

diff --git a/dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/KotlinAdapter.kt b/dokka-runners/dokka-gradle-plugin/src/main/kotlin/adapters/KotlinAdapter.kt
@@ -42,7 +42,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataCompilation
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMetadataTarget
 import org.jetbrains.kotlin.tooling.core.KotlinToolingVersion
-import org.jetbrains.kotlin.tooling.core.closure
 import java.io.File
 import javax.inject.Inject
 import kotlin.reflect.jvm.jvmName
@@ -538,11 +537,10 @@ private class KotlinSourceSetDetailsBuilder(
         }
 
         // Determine the source sets IDs of _other_ source sets that _this_ source depends on.
-        // This MUST be explicit, including all transitive source sets.
-        // E.g. linuxX64 must list all of its 'parent' dependencies: linuxMain, nativeMain, and commonMain
-        val dependentSourceSets = providers.provider {
-            kotlinSourceSet.closure { it.dependsOn }
-        }
+        // Do not include transitive dependencies.
+        // (For example, linuxX64 depends on linuxMain, nativeMain, and commonMain,
+        // but only _directly_ depends on linuxMain, so dependentSourceSets should only contain linuxMain.)
+        val dependentSourceSets = providers.provider { kotlinSourceSet.dependsOn }
 
         val dependentSourceSetIds =
             providers.zip(