Updated grpc dependencies

Author: Mr3zee

build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
@@ -12,7 +12,7 @@ plugins {
     alias(libs.plugins.serialization) apply false
     alias(libs.plugins.kotlinx.rpc) apply false
     alias(libs.plugins.conventions.kover)
-    id("com.google.protobuf") version "0.9.4" apply false
+    alias(libs.plugins.protobuf) apply false
     alias(libs.plugins.conventions.gradle.doctor)
     alias(libs.plugins.atomicfu)
     id("build-util")

grpc/grpc-core/build.gradle.kts

@@ -19,12 +19,12 @@ kotlin {
 
         jvmMain {
             dependencies {
-                implementation("io.grpc:grpc-util:1.68.2")
-                implementation("io.grpc:grpc-stub:1.68.2")
-                implementation("io.grpc:grpc-protobuf:1.68.2")
-                implementation("io.grpc:grpc-kotlin-stub:1.4.1")
-                implementation("com.google.protobuf:protobuf-java-util:4.28.2")
-                implementation("com.google.protobuf:protobuf-kotlin:4.28.2")
+                implementation(libs.grpc.util)
+                implementation(libs.grpc.stub)
+                implementation(libs.grpc.protobuf)
+                implementation(libs.grpc.kotlin.stub)
+                implementation(libs.protobuf.java.util)
+                implementation(libs.protobuf.kotlin)
             }
         }
     }

protobuf-plugin/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
@@ -8,24 +8,25 @@ plugins {
     alias(libs.plugins.conventions.jvm)
     alias(libs.plugins.kotlinx.rpc)
     alias(libs.plugins.serialization)
-    id("com.google.protobuf")
+    alias(libs.plugins.protobuf)
 }
 
 dependencies {
-    implementation("com.google.protobuf:protobuf-java:3.24.1")
+    implementation(libs.protobuf.java)
 
     implementation(libs.slf4j.api)
     implementation(libs.logback.classic)
 
     testImplementation(projects.grpc.grpcCore)
     testImplementation(libs.coroutines.core)
     testImplementation(libs.kotlin.test)
-    testImplementation("io.grpc:grpc-stub:1.68.2")
-    testImplementation("io.grpc:grpc-netty:1.68.2")
-    testImplementation("io.grpc:grpc-protobuf:1.68.2")
-    testImplementation("io.grpc:grpc-kotlin-stub:1.4.1")
-    testImplementation("com.google.protobuf:protobuf-java-util:4.28.2")
-    testImplementation("com.google.protobuf:protobuf-kotlin:4.28.2")
+
+    testImplementation(libs.grpc.stub)
+    testImplementation(libs.grpc.netty)
+    testImplementation(libs.grpc.protobuf)
+    testImplementation(libs.grpc.kotlin.stub)
+    testImplementation(libs.protobuf.java.util)
+    testImplementation(libs.protobuf.kotlin)
 }
 
 sourceSets {
@@ -67,7 +68,7 @@ val buildDirPath: String = project.layout.buildDirectory.get().asFile.absolutePa
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:3.24.1"
+        artifact = libs.protoc.get().toString()
     }
 
     plugins {
@@ -76,11 +77,11 @@ protobuf {
         }
 
         create("grpc") {
-            artifact = "io.grpc:protoc-gen-grpc-java:1.57.2"
+            artifact = libs.grpc.protoc.gen.java.get().toString()
         }
 
         create("grpckt") {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:1.3.1:jdk8@jar"
+            artifact = libs.grpc.protoc.gen.kotlin.get().toString() + ":jdk8@jar"
         }
     }
 

versions-root/libs.versions.toml

@@ -21,6 +21,10 @@ intellij = "233.13135.128"
 gradle-doctor = "0.10.0"
 kotlinx-browser = "0.3"
 shadow-jar = "9.0.0-beta4"
+grpc = "1.69.0"
+grpc-kotlin = "1.4.1"
+protobuf = "4.29.3"
+protobuf-gradle = "0.9.4"
 
 # Stub versions – relpaced based on kotlin, mostly for gradle-related (plugins) dependencies
 #  but also for dependencies for compiler-specific modules.
@@ -87,6 +91,19 @@ junit5-platform-launcher = { module = "org.junit.platform:junit-platform-launche
 junit5-platform-runner = { module = "org.junit.platform:junit-platform-runner" }
 junit5-platform-suite-api = { module = "org.junit.platform:junit-platform-suite-api" }
 
+# grpc and protobuf
+protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
+protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
+protobuf-java-util = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protobuf" }
+protobuf-kotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
+grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
+grpc-util = { module = "io.grpc:grpc-util", version.ref = "grpc" }
+grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }
+grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
+grpc-kotlin-stub = { module = "io.grpc:grpc-protobuf", version.ref = "grpc-kotlin" }
+grpc-protoc-gen-java = { module = "io.grpc:protoc-gen-grpc-java", version.ref = "grpc" }
+grpc-protoc-gen-kotlin = { module = "io.grpc:protoc-gen-grpc-kotlin", version.ref = "grpc-kotlin" }
+
 # other
 kotlin-logging = { module = "io.github.oshai:kotlin-logging", version.ref = "kotlin-logging" }
 kotlin-logging-legacy = { module = "io.github.microutils:kotlin-logging", version.ref = "kotlin-logging" }
@@ -114,6 +131,7 @@ gradle-kotlin-dsl = { id = "org.gradle.kotlin.kotlin-dsl", version.ref = "gradle
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }
 shadow-jar = { id = "com.gradleup.shadow", version.ref = "shadow-jar" }
+protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradle" }
 
 # gradle-conventions project
 conventions-common = { id = "conventions-common", version.ref = "kotlinx-rpc" }