Fixed full KMP + Android support

Author: Mr3zee

gradle-plugin/build.gradle.kts

@@ -47,11 +47,6 @@ dependencies {
 }
 
 tasks.test {
-    val forwardOutput: Boolean = (properties.getOrDefault("gradle.test.forward.output", "false")
-         as String).toBooleanStrictOrNull() ?: false
-
-    systemProperty("gradle.test.forward.output", forwardOutput)
-
     useJUnitPlatform()
 
     val protocGen = gradle.includedBuild("protoc-gen")

gradle-plugin/src/main/kotlin/kotlinx/rpc/buf/tasks/BufGenerateTask.kt

@@ -18,12 +18,10 @@ import java.io.File
 import kotlinx.rpc.buf.BufGenerateExtension
 import kotlinx.rpc.protoc.DefaultProtoSourceSet
 import kotlinx.rpc.protoc.ProtoTask
-import kotlinx.rpc.protoc.protoTaskProperties
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputDirectories
-import org.gradle.kotlin.dsl.listProperty
 import javax.inject.Inject
 
 /**
@@ -92,15 +90,16 @@ public abstract class BufGenerateTask @Inject internal constructor(
     @get:OutputDirectory
     public abstract val outputDirectory: Property<File>
 
-    private val outputSourceDirectoriesInternal: ListProperty<File> = project.objects.listProperty()
-
     /**
      * Generated source directories by plugin name.
      *
-     * Can be used in [SourceDirectorySet.srcDirs].
+     * Can be used in [SourceDirectorySet.srcDir] or similar `srcDir` functions from other source set directories.
      */
     @get:OutputDirectories
-    public val outputSourceDirectories: Provider<List<File>> = outputSourceDirectoriesInternal
+    public val outputSourceDirectories: Provider<List<File>> = pluginNames.map { plugins ->
+        val out = outputDirectory.get()
+        plugins.map { out.resolve(it) }
+    }
 
     init {
         command.set("generate")
@@ -125,11 +124,6 @@ public abstract class BufGenerateTask @Inject internal constructor(
         }
 
         this.args.set(args)
-
-        outputSourceDirectoriesInternal.set(pluginNames.map { plugins ->
-            val out = outputDirectory.get()
-            plugins.map { out.resolve(it) }
-        })
     }
 
     internal companion object {

gradle-plugin/src/main/kotlin/kotlinx/rpc/protoc/DefaultProtoSourceSet.kt

@@ -6,9 +6,8 @@ package kotlinx.rpc.protoc
 
 import kotlinx.rpc.buf.tasks.BufGenerateTask
 import kotlinx.rpc.rpcExtension
-import kotlinx.rpc.util.KotlinPluginId
 import kotlinx.rpc.util.findOrCreate
-import kotlinx.rpc.util.withAndroid
+import kotlinx.rpc.util.withLegacyAndroid
 import kotlinx.rpc.util.withAndroidSourceSets
 import kotlinx.rpc.util.withKotlin
 import kotlinx.rpc.util.withLazyJavaPluginExtension
@@ -51,7 +50,7 @@ internal class ProtoSourceSetFactory(
 }
 
 internal fun Project.findOrCreateProtoSourceSets(): NamedDomainObjectContainer<ProtoSourceSet> =
-    project.findOrCreate(PROTO_SOURCE_SETS) {
+    findOrCreate(PROTO_SOURCE_SETS) {
         val container = objects.domainObjectContainer(
             ProtoSourceSet::class.java,
             ProtoSourceSetFactory(project)
@@ -119,6 +118,9 @@ internal open class DefaultProtoSourceSet(
         }
     }
 
+    val tasksConfigured: Property<Boolean> = project.objects.property<Boolean>()
+        .convention(false)
+
     // Collection of AndroidSourceSet, KotlinSourceSet, SourceSet (java) associated with this proto source set
     val languageSourceSets: ListProperty<Any> = project.objects.listProperty<Any>()
     val generateTask: Property<BufGenerateTask?> = project.objects.property<BufGenerateTask?>()
@@ -133,18 +135,6 @@ internal open class DefaultProtoSourceSet(
     internal val isLegacyAndroid: Property<Boolean> = project.objects.property<Boolean>()
         .convention(false)
 
-    // when com.android.* (not kotlin.multiplatform.library) is applied - kotlin has proxy source sets:
-    // | AndroidSourceSet | KotlinSourceSet |
-    // | main             | androidMain     |
-    // | test             | androidUnitTest |
-    // | debug            | androidDebug    |
-    // ...
-    //
-    // these kotlin 'proxy' source sets have propper dependsOn values, but should not have tasks configures,
-    // as tasks are configured once for the android source sets
-    internal val isKotlinProxyLegacyAndroid: Property<Boolean> = project.objects.property<Boolean>()
-        .convention(false)
-
     // used to track tasks' dependencies for main/commonMain/commonTest tasks, e.g.:
     // - bufGenerateTestDebug depends on bufGenerateDebug
     // - bufGenerateTestDebug depends on bufGenerateCommonTest and bufGenerateDebug for KMP
@@ -250,19 +240,15 @@ internal fun Project.createProtoExtensions() {
 
     // CCE free check for kotlin
     withKotlin {
-        withKotlinSourceSets { id, extension ->
+        withKotlinSourceSets { extension ->
             extension.sourceSets.all {
                 findOrCreateAndConfigure(name, this)
             }
-
-            if (id != KotlinPluginId.MULTIPLATFORM) {
-                return@withKotlinSourceSets
-            }
         }
     }
 
     // CCE free check for android
-    withAndroid {
+    withLegacyAndroid {
         withAndroidSourceSets { sourceSets ->
             sourceSets.all {
                 findOrCreateAndConfigure(name, this)
@@ -284,6 +270,6 @@ internal fun Project.createProtoExtensions() {
 internal fun DefaultProtoSourceSet.protoTaskProperties(): ProtoTask.Properties {
     return androidProperties.orNull ?: ProtoTask.Properties(
         isTest = name.lowercase().endsWith("test"),
-        sourceSetName = name,
+        sourceSetNames = setOf(name),
     )
 }