Changed BufTasks into ProtoTasks

Author: Mr3zee

gradle-plugin/build.gradle.kts

@@ -19,6 +19,8 @@ kotlin {
     explicitApi()
 
     jvmToolchain(17)
+
+    compilerOptions.optIn.add("kotlinx.rpc.internal.InternalRpcApi")
 }
 
 tasks.withType<KotlinCompile>().configureEach {

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

@@ -4,13 +4,10 @@
 
 package kotlinx.rpc.buf
 
-import kotlinx.rpc.buf.tasks.BufAllTasks
-import kotlinx.rpc.buf.tasks.BufAllTasksImpl
 import kotlinx.rpc.buf.tasks.BufExecTask
-import kotlinx.rpc.buf.tasks.BufGenerateTask
-import kotlinx.rpc.buf.tasks.BufTasks
-import kotlinx.rpc.buf.tasks.BufTasksImpl
+import kotlinx.rpc.protoc.ProtoTasks
 import kotlinx.rpc.protoc.ProtocPlugin
+import kotlinx.rpc.protoc.protoTasks
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
@@ -104,13 +101,6 @@ public open class BufExtension @Inject internal constructor(objects: ObjectFacto
  * Allows registering custom Buf tasks that can operate on the generated workspace.
  */
 public open class BufTasksExtension @Inject internal constructor(internal val project: Project) {
-    /**
-     * Returns a collection of all `buf` tasks registered in the project.
-     */
-    public fun all(): BufAllTasks {
-        return BufAllTasksImpl(project, project.tasks.withType(BufExecTask::class.java))
-    }
-
     /**
      * Registers a custom Buf task that operates on the generated workspace.
      *
@@ -123,11 +113,11 @@ public open class BufTasksExtension @Inject internal constructor(internal val pr
         kClass: KClass<T>,
         name: String,
         configure: Action<T> = Action {},
-    ): BufTasks<T> {
+    ): ProtoTasks<T> {
         @Suppress("UNCHECKED_CAST")
         customTasks.add(Definition(name, kClass, configure))
 
-        return all().matchingType(kClass)
+        return project.protoTasks.matchingType(kClass)
     }
 
     /**
@@ -141,7 +131,7 @@ public open class BufTasksExtension @Inject internal constructor(internal val pr
     public inline fun <reified T : BufExecTask> registerWorkspaceTask(
         name: String,
         configure: Action<T> = Action {},
-    ): BufTasks<T> {
+    ): ProtoTasks<T> {
         return registerWorkspaceTask(T::class, name, configure)
     }
 
@@ -161,13 +151,6 @@ public open class BufTasksExtension @Inject internal constructor(internal val pr
  * @see [BUF_GEN_YAML]
  */
 public open class BufGenerateExtension @Inject internal constructor(internal val project: Project) {
-    /**
-     * Returns a collection of all `buf generate` tasks registered in the project.
-     */
-    public fun allTasks(): BufTasks<BufGenerateTask> {
-        return BufTasksImpl(project, project.tasks.withType(BufGenerateTask::class.java), BufGenerateTask::class)
-    }
-
     /**
      * `--include-imports` option.
      *

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

@@ -7,9 +7,7 @@ package kotlinx.rpc.buf.tasks
 import kotlinx.rpc.buf.BUF_EXECUTABLE_CONFIGURATION
 import kotlinx.rpc.buf.BufExtension
 import kotlinx.rpc.buf.execBuf
-import kotlinx.rpc.protoc.PROTO_GROUP
 import kotlinx.rpc.rpcExtension
-import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
@@ -26,25 +24,20 @@ import kotlin.reflect.KClass
 import kotlinx.rpc.buf.BUF_GEN_YAML
 import kotlinx.rpc.buf.BUF_YAML
 import kotlinx.rpc.buf.BufTasksExtension
+import kotlinx.rpc.protoc.DefaultProtoTask
+import kotlinx.rpc.protoc.ProtoTask
 import org.gradle.api.logging.LogLevel
-import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Classpath
 import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.SkipWhenEmpty
 import javax.inject.Inject
 
 /**
  * Abstract base class for `buf` tasks.
  */
 public abstract class BufExecTask @Inject constructor(
-    @Internal
-    public val properties: Provider<Properties>,
-) : DefaultTask() {
-    init {
-        group = PROTO_GROUP
-    }
-
+    properties: ProtoTask.Properties,
+) : DefaultProtoTask(properties) {
     // unsued, but required for Gradle to properly recognise inputs
     @get:InputFiles
     @get:SkipWhenEmpty
@@ -54,77 +47,12 @@ public abstract class BufExecTask @Inject constructor(
     @get:InputFiles
     internal abstract val importProtoFiles: ListProperty<File>
 
-    // list of buf task dependencies of the same type
-    @get:Internal
-    internal abstract val bufTaskDependencies: SetProperty<String>
-
     @get:InputFile
     internal abstract val bufExecutable: Property<File>
 
     @get:Input
     internal abstract val debug: Property<Boolean>
 
-    /**
-     * Properties of the buf task.
-     *
-     * Can be used with [BufTasks] to filter tasks.
-     */
-    public open class Properties internal constructor(
-        /**
-         * Whether the task is for a test source set.
-         */
-        public val isTest: Boolean,
-        /**
-         * Name of the [kotlinx.rpc.protoc.ProtoSourceSet] this task is associated with.
-         */
-        public val sourceSetName: String,
-    )
-
-    /**
-     * Properties of the buf task for android source sets.
-     *
-     * Can be used with [BufTasks] to filter tasks.
-     */
-    public class AndroidProperties internal constructor(
-        isTest: Boolean,
-        sourceSetName: String,
-
-        /**
-         * Name of the android flavors this task is associated with.
-         *
-         * Can be empty for 'com.android.kotlin.multiplatform.library' source sets.
-         *
-         * @see com.android.build.api.variant.Variant.productFlavors
-         */
-        public val flavors: List<String>,
-
-        /**
-         * Name of the android build type this task is associated with.
-         *
-         * @see com.android.build.api.variant.Variant.buildType
-         */
-        public val buildType: String?,
-
-        /**
-         * Name of the android variant this task is associated with.
-         *
-         * Can be `null` for 'com.android.kotlin.multiplatform.library' source sets.
-         *
-         * @see com.android.build.api.variant.Variant.name
-         */
-        public val variant: String?,
-
-        /**
-         * Whether the task is for instrumentation tests.
-         */
-        public val isInstrumentedTest: Boolean,
-
-        /**
-         * Whether the task is for unit tests.
-         */
-        public val isUnitTest: Boolean,
-    ) : Properties(isTest, sourceSetName)
-
     /**
      * The `buf` command to execute.
      *
@@ -185,7 +113,7 @@ public abstract class BufExecTask @Inject constructor(
 public inline fun <reified T : BufExecTask> Project.registerBufExecTask(
     name: String,
     workingDir: Provider<File>,
-    properties: Provider<BufExecTask.Properties>,
+    properties: ProtoTask.Properties,
     noinline configuration: T.() -> Unit,
 ): TaskProvider<T> = registerBufExecTask(T::class, name, workingDir, properties, configuration)
 
@@ -194,7 +122,7 @@ internal fun <T : BufExecTask> Project.registerBufExecTask(
     clazz: KClass<T>,
     name: String,
     workingDir: Provider<File>,
-    properties: Provider<BufExecTask.Properties>,
+    properties: ProtoTask.Properties,
     configuration: T.() -> Unit = {},
 ): TaskProvider<T> = tasks.register(name, clazz, properties).apply {
     configure {

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

@@ -17,7 +17,8 @@ import org.gradle.api.tasks.TaskProvider
 import java.io.File
 import kotlinx.rpc.buf.BufGenerateExtension
 import kotlinx.rpc.protoc.DefaultProtoSourceSet
-import kotlinx.rpc.protoc.bufExecProperties
+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
@@ -31,7 +32,7 @@ import javax.inject.Inject
  * @see <a href="https://buf.build/docs/reference/cli/buf/generate/">buf generate</a>
  */
 public abstract class BufGenerateTask @Inject internal constructor(
-    properties: Provider<Properties>,
+    properties: ProtoTask.Properties,
 ) : BufExecTask(properties) {
     // used to properly calculate output directories
     @get:Input
@@ -141,13 +142,12 @@ internal fun Project.registerBufGenerateTask(
     workingDir: File,
     outputDirectory: File,
     includedPlugins: Provider<Set<ProtocPlugin>>,
+    properties: ProtoTask.Properties,
     configure: BufGenerateTask.() -> Unit = {},
 ): TaskProvider<BufGenerateTask> {
     val capitalName = protoSourceSet.name.replaceFirstChar { it.uppercase() }
     val bufGenerateTaskName = "${BufGenerateTask.NAME_PREFIX}$capitalName"
 
-    val properties = protoSourceSet.bufExecProperties()
-
     return registerBufExecTask<BufGenerateTask>(bufGenerateTaskName, provider { workingDir }, properties) {
         group = PROTO_GROUP
         description = "Generates code from .proto files using 'buf generate'"