undo

Author: Mr3zee

gradle-conventions/src/main/kotlin/util/csm/template.kt

@@ -145,7 +145,7 @@ object CsmTemplateProcessor {
                     throw GradleException("Wildcard is not allowed in 'from' part of kotlin version range: $from, $pattern")
                 }
 
-                if (to.contains("-") || to.contains("-")) {
+                if (from.contains("-") || to.contains("-")) {
                     throw GradleException("Non stable versions are not allowed in kotlin version range: $pattern")
                 }
 

gradle-plugin/build.gradle.kts

@@ -16,10 +16,11 @@ version = rootProject.libs.versions.kotlinx.rpc.get()
 
 kotlin {
     explicitApi()
+
+    jvmToolchain(11)
 }
 
 dependencies {
-    implementation(libs.protobuf.gradle.plugin)
     compileOnly(libs.kotlin.gradle.plugin)
 }
 
@@ -50,6 +51,7 @@ abstract class GeneratePluginVersionTask @Inject constructor(
     @get:Input val protobufVersion: String,
     @get:Input val grpcVersion: String,
     @get:Input val grpcKotlinVersion: String,
+    @get:Input val bufToolVersion: String,
     @get:OutputDirectory val sourcesDir: File
 ) : DefaultTask() {
     @TaskAction
@@ -68,6 +70,7 @@ abstract class GeneratePluginVersionTask @Inject constructor(
             public const val PROTOBUF_VERSION: String = "$protobufVersion"
             public const val GRPC_VERSION: String = "$grpcVersion"
             public const val GRPC_KOTLIN_VERSION: String = "$grpcKotlinVersion"
+            public const val BUF_TOOL_VERSION: String = "$bufToolVersion"
             
             """.trimIndent()
         )
@@ -79,9 +82,10 @@ val sourcesDir = File(project.layout.buildDirectory.asFile.get(), "generated-sou
 val generatePluginVersionTask = tasks.register<GeneratePluginVersionTask>(
     "generatePluginVersion",
     version.toString(),
-    libs.versions.protobuf.asProvider().get().toString(),
-    libs.versions.grpc.asProvider().get().toString(),
-    libs.versions.grpc.kotlin.get().toString(),
+    libs.versions.protobuf.asProvider().get(),
+    libs.versions.grpc.asProvider().get(),
+    libs.versions.grpc.kotlin.get(),
+    libs.versions.buf.tool.get(),
     sourcesDir,
 )
 

gradle-plugin/src/main/kotlin/kotlinx/rpc/Extensions.kt

@@ -6,6 +6,7 @@
 
 package kotlinx.rpc
 
+import kotlinx.rpc.grpc.GrpcExtension
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.model.ObjectFactory
@@ -14,11 +15,12 @@ import org.gradle.kotlin.dsl.findByType
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.newInstance
 import org.gradle.kotlin.dsl.property
+import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
-public fun Project.rpcExtension(): RpcExtension = extensions.findByType<RpcExtension>() ?: RpcExtension(objects)
+public fun Project.rpcExtension(): RpcExtension = extensions.findByType<RpcExtension>() ?: RpcExtension(objects, this)
 
-public open class RpcExtension @Inject constructor(objects: ObjectFactory) {
+public open class RpcExtension @Inject constructor(objects: ObjectFactory, private val project: Project) {
     /**
      * Controls `@Rpc` [annotation type-safety](https://github.com/Kotlin/kotlinx-rpc/pull/240) compile-time checkers.
      *
@@ -42,10 +44,15 @@ public open class RpcExtension @Inject constructor(objects: ObjectFactory) {
         configure.execute(strict)
     }
 
+    internal val grpcApplied = AtomicBoolean(false)
+
     /**
      * Grpc settings.
      */
-    public val grpc: GrpcExtension = objects.newInstance<GrpcExtension>()
+    public val grpc: GrpcExtension by lazy {
+        grpcApplied.set(true)
+        objects.newInstance<GrpcExtension>()
+    }
 
     /**
      * Grpc settings.

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

@@ -4,6 +4,8 @@
 
 package kotlinx.rpc
 
+import kotlinx.rpc.grpc.configurePluginProtections
+import kotlinx.rpc.proto.createProtoExtensions
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.create
@@ -15,7 +17,8 @@ public class RpcGradlePlugin : Plugin<Project> {
 
         applyCompilerPlugin(target)
 
-        target.configureGrpc()
+        target.createProtoExtensions()
+        target.configurePluginProtections()
     }
 
     private fun applyCompilerPlugin(target: Project) {