grpc: Reduce dependencies

Author: Jozott00

grpc/grpc-client/build.gradle.kts

@@ -9,10 +9,6 @@ import kotlinx.rpc.internal.InternalRpcApi
 plugins {
     alias(libs.plugins.conventions.kmp)
     alias(libs.plugins.kotlinx.rpc)
-
-    // TODO: Check if we can drop these plugins
-    alias(libs.plugins.atomicfu)
-    alias(libs.plugins.serialization) // for tests
 }
 
 kotlin {
@@ -24,34 +20,12 @@ kotlin {
         commonMain {
             dependencies {
                 api(projects.grpc.grpcCore)
-
-                implementation(libs.atomicfu)
-                implementation(libs.kotlinx.io.core)
-            }
-        }
-
-        jvmMain {
-            dependencies {
-                // TODO: Check if we can drop the API dependencies
-                api(libs.grpc.api)
-                api(libs.grpc.util)
-                api(libs.grpc.stub)
-                api(libs.grpc.protobuf)
-                api(libs.grpc.protobuf.lite)
-                implementation(libs.grpc.kotlin.stub) // causes problems to jpms if api
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation(libs.grpc.netty)
             }
         }
 
         nativeMain {
             dependencies {
-                // required for status.proto
-                implementation(projects.protobuf.protobufCore)
+                implementation(libs.atomicfu)
             }
         }
     }

grpc/grpc-ktor-server/build.gradle.kts

@@ -25,7 +25,7 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
 
-                implementation(projects.grpc.grpcCore)
+                implementation(projects.grpc.grpcClient)
                 implementation(projects.grpc.grpcKtorServer)
 
                 implementation(libs.grpc.kotlin.stub)

grpc/grpc-ktor-server/src/jvmTest/kotlin/kotlinx/rpc/grpc/ktor/server/test/TestServer.kt

@@ -5,7 +5,7 @@
 package kotlinx.rpc.grpc.ktor.server.test
 
 import io.ktor.server.testing.*
-import kotlinx.rpc.grpc.GrpcClient
+import kotlinx.rpc.grpc.client.GrpcClient
 import kotlinx.rpc.grpc.ktor.server.grpc
 import kotlinx.rpc.withService
 import kotlin.test.Test
@@ -25,7 +25,9 @@ class TestServer {
     fun testPlainRequests() = testApplication {
         application {
             grpc(PORT) {
-                registerService<KtorTestService> { KtorTestServiceImpl() }
+                services {
+                    registerService<KtorTestService> { KtorTestServiceImpl() }
+                }
             }
         }
 

grpc/grpc-server/build.gradle.kts

@@ -9,10 +9,6 @@ import kotlinx.rpc.internal.InternalRpcApi
 plugins {
     alias(libs.plugins.conventions.kmp)
     alias(libs.plugins.kotlinx.rpc)
-
-    // TODO: Check if we can drop these plugins
-    alias(libs.plugins.atomicfu)
-    alias(libs.plugins.serialization) // for tests
 }
 
 kotlin {
@@ -26,32 +22,12 @@ kotlin {
                 api(projects.grpc.grpcCore)
 
                 implementation(libs.atomicfu)
-                implementation(libs.kotlinx.io.core)
-            }
-        }
-
-        jvmMain {
-            dependencies {
-                // TODO: Check if we can drop the API dependencies
-                api(libs.grpc.api)
-                api(libs.grpc.util)
-                api(libs.grpc.stub)
-                api(libs.grpc.protobuf)
-                api(libs.grpc.protobuf.lite)
-                implementation(libs.grpc.kotlin.stub) // causes problems to jpms if api
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation(libs.grpc.netty)
             }
         }
 
         nativeMain {
             dependencies {
-                // required for status.proto
-                implementation(projects.protobuf.protobufCore)
+                implementation(libs.kotlinx.io.core)
             }
         }
     }