Rename protocPlugins into plugins

Author: Mr3zee

gradle-plugin/api/gradle-plugin.api

@@ -188,8 +188,8 @@ public abstract interface class kotlinx/rpc/protoc/ProtoSourceSet {
 public abstract interface class kotlinx/rpc/protoc/ProtocExtension {
 	public abstract fun buf (Lorg/gradle/api/Action;)V
 	public abstract fun getBuf ()Lkotlinx/rpc/buf/BufExtension;
-	public abstract fun getProtocPlugins ()Lorg/gradle/api/NamedDomainObjectContainer;
-	public abstract fun protocPlugins (Lorg/gradle/api/Action;)V
+	public abstract fun getPlugins ()Lorg/gradle/api/NamedDomainObjectContainer;
+	public abstract fun plugins (Lorg/gradle/api/Action;)V
 }
 
 public class kotlinx/rpc/protoc/ProtocPlugin {

gradle-plugin/src/main/kotlin/kotlinx/rpc/internal/configureLocalProtocGenDevelopmentDependency.kt

@@ -18,7 +18,7 @@ import org.gradle.kotlin.dsl.withType
 public fun Project.configureLocalProtocGenDevelopmentDependency() {
     val globalRootDir: String by extra
 
-    the<RpcExtension>().protoc.protocPlugins {
+    the<RpcExtension>().protoc.plugins {
         kotlinMultiplatform {
             local {
                 javaJar("$globalRootDir/protoc-gen/protobuf/build/libs/protobuf-$version-all.jar")

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

@@ -34,13 +34,13 @@ internal open class DefaultProtocExtension @Inject constructor(
     objects: ObjectFactory,
     private val project: Project,
 ) : ProtocExtension {
-    override val protocPlugins: NamedDomainObjectContainer<ProtocPlugin> =
+    override val plugins: NamedDomainObjectContainer<ProtocPlugin> =
         objects.domainObjectContainer(ProtocPlugin::class.java) { name ->
             ProtocPlugin(name, project)
         }
 
-    override fun protocPlugins(action: Action<NamedDomainObjectContainer<ProtocPlugin>>) {
-        action.execute(protocPlugins)
+    override fun plugins(action: Action<NamedDomainObjectContainer<ProtocPlugin>>) {
+        action.execute(plugins)
     }
 
     override val buf: BufExtension = project.objects.newInstance<BufExtension>()
@@ -56,8 +56,8 @@ internal open class DefaultProtocExtension @Inject constructor(
         createDefaultProtocPlugins()
 
         project.protoSourceSets.forEach { protoSourceSet ->
-            protoSourceSet.protocPlugin(protocPlugins.kotlinMultiplatform)
-            protoSourceSet.protocPlugin(protocPlugins.grpcKotlinMultiplatform)
+            protoSourceSet.protocPlugin(plugins.kotlinMultiplatform)
+            protoSourceSet.protocPlugin(plugins.grpcKotlinMultiplatform)
         }
 
         project.afterEvaluate {
@@ -100,7 +100,7 @@ internal open class DefaultProtocExtension @Inject constructor(
         val protocPluginNames = (protoSourceSet.protocPlugins.get() + mainProtocPlugins).distinct()
 
         val includedProtocPlugins = protocPluginNames.map {
-            protocPlugins.findByName(it)
+            this@DefaultProtocExtension.plugins.findByName(it)
                 ?: throw GradleException("Protoc plugin $it not found")
         }
 
@@ -279,7 +279,7 @@ internal open class DefaultProtocExtension @Inject constructor(
             project.the<KotlinBaseExtension>().explicitApi != ExplicitApiMode.Disabled
         }
 
-        protocPlugins.create(KOTLIN_MULTIPLATFORM) {
+        plugins.create(KOTLIN_MULTIPLATFORM) {
             local {
                 javaJar(project.kotlinMultiplatformProtocPluginJarPath)
             }
@@ -288,7 +288,7 @@ internal open class DefaultProtocExtension @Inject constructor(
             options.put("explicitApiModeEnabled", explicitApiModeEnabled)
         }
 
-        protocPlugins.create(GRPC_KOTLIN_MULTIPLATFORM) {
+        plugins.create(GRPC_KOTLIN_MULTIPLATFORM) {
             local {
                 javaJar(project.grpcKotlinMultiplatformProtocPluginJarPath)
             }

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

@@ -25,7 +25,7 @@ public interface ProtoSourceSet {
      *
      * Example:
      * ```kotlin
-     * protocPlugin(rpc.protoc.protocPlugins.myPlugin)
+     * protocPlugin(rpc.protoc.plugins.myPlugin)
      * ```
      */
     public fun protocPlugin(plugin: NamedDomainObjectProvider<ProtocPlugin>)
@@ -35,7 +35,7 @@ public interface ProtoSourceSet {
      *
      * Example:
      * ```kotlin
-     * protocPlugin(rpc.protoc.protocPlugins.myPlugin.get())
+     * protocPlugin(rpc.protoc.plugins.myPlugin.get())
      * ```
      */
     public fun protocPlugin(plugin: ProtocPlugin)

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

@@ -22,12 +22,12 @@ public interface ProtocExtension {
     /**
      * List of protoc plugins to be applied to the project.
      */
-    public val protocPlugins: NamedDomainObjectContainer<ProtocPlugin>
+    public val plugins: NamedDomainObjectContainer<ProtocPlugin>
 
     /**
      * Configures the protoc plugins.
      */
-    public fun protocPlugins(action: Action<NamedDomainObjectContainer<ProtocPlugin>>)
+    public fun plugins(action: Action<NamedDomainObjectContainer<ProtocPlugin>>)
 
     /**
      * Configuration for the Buf build tool.

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

@@ -13,7 +13,7 @@ import org.gradle.api.provider.Provider
  *
  * Can be used to customize the java executable path:
  * ```kotlin
- * rpc.protoc.protocPlugins.kotlinMultiplatform {
+ * rpc.protoc.plugins.kotlinMultiplatform {
  *     local {
  *         javaJar(kotlinMultiplatformProtocPluginJarPath, provider { "my-path-to-java" })
  *     }
@@ -35,7 +35,7 @@ internal fun Project.configureKotlinMultiplatformPluginJarConfiguration() {
  *
  * Can be used to customize the java executable path:
  * ```kotlin
- * rpc.protoc.protocPlugins.grpcKotlinMultiplatform {
+ * rpc.protoc.plugins.grpcKotlinMultiplatform {
  *     local {
  *         javaJar(grpcKotlinMultiplatformProtocPluginJarPath, provider { "my-path-to-java" })
  *     }

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/can_add_custom_protoc_plugins/build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 rpc {
     protoc {
-        protocPlugins {
+        plugins {
             create("myPlugin") {
                 local {
                     executor("path", "to", "protoc-gen-myplugin.exe")
@@ -38,7 +38,7 @@ rpc {
 
 protoSourceSets {
     main {
-        protocPlugin(rpc.protoc.protocPlugins.named("myPlugin"))
-        protocPlugin(rpc.protoc.protocPlugins.named("myRemotePlugin"))
+        protocPlugin(rpc.protoc.plugins.named("myPlugin"))
+        protocPlugin(rpc.protoc.plugins.named("myRemotePlugin"))
     }
 }

gradle-plugin/src/test/resources/projects/GrpcJvmProjectTest/custom_protoc_plugins_must_declare_an_artifact/build.gradle.kts

@@ -12,14 +12,14 @@ plugins {
 
 rpc {
     protoc {
-        protocPlugins {
+        plugins {
             create("myPlugin") {}
         }
     }
 }
 
 protoSourceSets {
     main {
-        protocPlugin(rpc.protoc.protocPlugins.named("myPlugin"))
+        protocPlugin(rpc.protoc.plugins.named("myPlugin"))
     }
 }