Fix locators for protoc plugins

Author: Mr3zee

gradle-plugin/src/main/kotlin/kotlinx/rpc/grpc/GrpcExtension.kt

@@ -4,7 +4,9 @@
 
 package kotlinx.rpc.grpc
 
-import kotlinx.rpc.LIBRARY_VERSION
+import kotlinx.rpc.GRPC_KOTLIN_VERSION
+import kotlinx.rpc.GRPC_VERSION
+import kotlinx.rpc.PROTOBUF_VERSION
 import kotlinx.rpc.buf.BufExtension
 import kotlinx.rpc.proto.ProtocPlugin.Companion.GRPC_JAVA
 import kotlinx.rpc.proto.ProtocPlugin.Companion.GRPC_KOTLIN
@@ -15,8 +17,10 @@ import kotlinx.rpc.buf.tasks.BufGenerateTask
 import kotlinx.rpc.buf.tasks.registerBufGenYamlUpdateTask
 import kotlinx.rpc.buf.tasks.registerBufGenerateTask
 import kotlinx.rpc.buf.tasks.registerBufYamlUpdateTask
+import kotlinx.rpc.proto.KXRPC_PLUGIN_JAR_CONFIGURATION
 import kotlinx.rpc.proto.ProtoSourceSet
 import kotlinx.rpc.proto.ProtocPlugin
+import kotlinx.rpc.proto.configureKxRpcPluginJarConfiguration
 import kotlinx.rpc.proto.configureProtoExtensions
 import kotlinx.rpc.proto.grpcJava
 import kotlinx.rpc.proto.grpcKotlin
@@ -35,7 +39,10 @@ import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.kotlin.dsl.findByType
 import org.gradle.kotlin.dsl.newInstance
+import org.gradle.kotlin.dsl.the
 import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import javax.inject.Inject
@@ -60,6 +67,7 @@ public open class GrpcExtension @Inject constructor(
 
     init {
         project.configureBufExecutable()
+        project.configureKxRpcPluginJarConfiguration()
 
         createDefaultProtocPlugins()
 
@@ -193,33 +201,38 @@ public open class GrpcExtension @Inject constructor(
 
     private fun createDefaultProtocPlugins() {
         protocPlugins.create(KXRPC) {
-            remote {
-                locator.set("buf.build/kxrpc/grpc:${LIBRARY_VERSION}")
+            local {
+                javaJar(project.configurations.named(KXRPC_PLUGIN_JAR_CONFIGURATION).map { it.singleFile.absolutePath })
             }
 
             options.put("debugOutput", "protobuf-kxrpc-plugin.log")
             options.put("messageMode", "interface")
+            options.put("explicitApiModeEnabled", project.provider {
+                project.the<KotlinBaseExtension>().explicitApi != ExplicitApiMode.Disabled
+            })
         }
 
         protocPlugins.create(GRPC_JAVA) {
             isJava.set(true)
 
             remote {
-                locator.set("buf.build/grpc/java")
+                locator.set("buf.build/grpc/java:v$GRPC_VERSION")
             }
         }
 
         protocPlugins.create(GRPC_KOTLIN) {
             remote {
-                locator.set("buf.build/grpc/kotlin")
+                locator.set("buf.build/grpc/kotlin:v$GRPC_KOTLIN_VERSION")
             }
         }
 
         protocPlugins.create(PROTOBUF_JAVA) {
             isJava.set(true)
 
             remote {
-                locator.set("buf.build/protocolbuffers/java")
+                // for some reason they omit the first digit in this version:
+                // https://buf.build/protocolbuffers/java?version=v31.1
+                locator.set("buf.build/protocolbuffers/java:v${PROTOBUF_VERSION.substringAfter(".")}")
             }
         }
     }

gradle-plugin/src/main/kotlin/kotlinx/rpc/proto/ProtocPlugin.kt

@@ -58,8 +58,8 @@ public open class ProtocPlugin(
 ) {
     public val isJava: Property<Boolean> = project.objects.property<Boolean>().convention(false)
 
-    public val options: MapProperty<String, String?> = project.objects
-        .mapProperty<String, String?>()
+    public val options: MapProperty<String, Any?> = project.objects
+        .mapProperty<String, Any?>()
         .convention(emptyMap())
 
     public fun local(action: Action<Artifact.Local>) {

gradle-plugin/src/main/kotlin/kotlinx/rpc/proto/kxrpcPluginJar.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package kotlinx.rpc.proto
+
+import kotlinx.rpc.BUF_TOOL_VERSION
+import kotlinx.rpc.LIBRARY_VERSION
+import org.gradle.api.Project
+
+// https://maven.pkg.jetbrains.space/public/p/krpc/grpc/org/jetbrains/kotlinx/kotlinx-rpc-protobuf-plugin/0.8.1-grpc-99/kotlinx-rpc-protobuf-plugin-0.8.1-grpc-99-all.jar
+
+public const val KXRPC_PLUGIN_JAR_CONFIGURATION: String = "kxrpcPluginJar"
+
+internal fun Project.configureKxRpcPluginJarConfiguration() {
+    configurations.create(KXRPC_PLUGIN_JAR_CONFIGURATION)
+
+    dependencies.add(
+        KXRPC_PLUGIN_JAR_CONFIGURATION,
+        mapOf(
+            "group" to "org.jetbrains.kotlinx",
+            "name" to "kotlinx-rpc-protobuf-plugin",
+            "version" to LIBRARY_VERSION,
+            "classifier" to "all",
+            "ext" to "jar",
+        ),
+    )
+}