@@ -57,7 +57,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
57
57
import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
58
58
import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
59
59
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
60
- import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinCommonCompilation
61
60
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmAndroidCompilation
62
61
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
63
62
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinSharedNativeCompilation
@@ -360,16 +359,8 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
360
359
)
361
360
}
362
361
} else {
363
- val filteredTasks =
364
- kspExtension.excludedSources.buildDependencies.getDependencies(null ).map { it.name }
365
362
kotlinCompilation.allKotlinSourceSetsObservable.forAll { sourceSet ->
366
- kspTask.setSource(
367
- sourceSet.kotlin.srcDirs.filter {
368
- ! kotlinOutputDir.isParentOf(it) && ! javaOutputDir.isParentOf(it) &&
369
- it !in kspExtension.excludedSources
370
- }
371
- )
372
- kspTask.dependsOn(sourceSet.kotlin.nonSelfDeps(kspTaskName).filter { it.name !in filteredTasks })
363
+ kspTask.setSource(sourceSet.kotlin.sourceDirectories)
373
364
}
374
365
}
375
366
@@ -603,13 +594,7 @@ class KspGradleSubplugin @Inject internal constructor(private val registry: Tool
603
594
project.files(kotlinOutputDir).builtBy(kspTaskProvider),
604
595
project.files(javaOutputDir).builtBy(kspTaskProvider),
605
596
)
606
- if (kotlinCompilation is KotlinCommonCompilation ) {
607
- // Do not add generated sources to common source sets.
608
- // They will be observed by downstreams and violate current build scheme.
609
- kotlinCompileProvider.configure { it.source(* generatedSources) }
610
- } else {
611
- kotlinCompilation.defaultSourceSet.kotlin.srcDirs(* generatedSources)
612
- }
597
+ kotlinCompileProvider.configure { it.source(* generatedSources) }
613
598
614
599
kotlinCompileProvider.configure { kotlinCompile ->
615
600
when (kotlinCompile) {
0 commit comments