auto-depend on grpc runtime artifact (#309)

open-toast · Dec 15, 2024 · 51d904d · 51d904d
1 parent e5b33fb
commit 51d904d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/buildSrc/src/main/kotlin/protokt.grpc-examples-conventions.gradle.kts b/buildSrc/src/main/kotlin/protokt.grpc-examples-conventions.gradle.kts
@@ -19,7 +19,6 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":protokt-runtime-grpc-lite"))
     implementation(libs.grpc.stub)
 
     runtimeOnly(libs.grpc.netty)

diff --git a/examples/grpc-node/build.gradle.kts b/examples/grpc-node/build.gradle.kts
@@ -45,7 +45,6 @@ protokt {
 }
 
 dependencies {
-    implementation(project(":protokt-runtime-grpc-lite"))
     implementation(project(":examples:protos"))
     implementation(libs.kotlinx.coroutines.core)
 

diff --git a/shared-src/gradle-plugin/protokt/v1/gradle/ProtoktBuild.kt b/shared-src/gradle-plugin/protokt/v1/gradle/ProtoktBuild.kt
@@ -64,6 +64,7 @@ internal fun configureProtokt(
     project.afterEvaluate {
         project.configurations.named(EXTENSIONS) {
             project.resolveProtoktCoreDep(protoktVersion)?.let(dependencies::add)
+            project.resolveProtoktGrpcDep(protoktVersion)?.let(dependencies::add)
         }
     }
 }
@@ -232,6 +233,25 @@ internal fun Project.resolveProtoktCoreDep(protoktVersion: Any?): Dependency? {
     }
 }
 
+internal fun Project.resolveProtoktGrpcDep(protoktVersion: Any?): Dependency? {
+    val artifactId =
+        if (the<ProtoktExtension>().generate.grpcDescriptors) {
+            if (the<ProtoktExtension>().generate.descriptors) {
+                "protokt-runtime-grpc"
+            } else {
+                "protokt-runtime-grpc-lite"
+            }
+        } else {
+            return null
+        }
+
+    return if (protoktVersion == null) {
+        dependencies.project(":$artifactId")
+    } else {
+        dependencies.create("com.toasttab.protokt:$artifactId:$protoktVersion")
+    }
+}
+
 internal fun Project.appliedKotlinPlugin() =
     when {
         plugins.hasPlugin("org.jetbrains.kotlin.multiplatform") ->

diff --git a/testing/interop/build.gradle.kts b/testing/interop/build.gradle.kts
@@ -34,7 +34,6 @@ dependencies {
     protoktExtensions(project(":extensions:protokt-extensions"))
 
     implementation(libs.grpc.stub)
-    implementation(project(":protokt-runtime-grpc"))
 
     testImplementation(project(":protokt-reflect"))
     testImplementation(project(":testing:protobuf-java"))

diff --git a/testing/options/build.gradle.kts b/testing/options/build.gradle.kts
@@ -34,7 +34,6 @@ dependencies {
     protoktExtensions(project(":third-party:proto-google-common-protos-extensions"))
 
     implementation(libs.grpc.stub)
-    implementation(project(":protokt-runtime-grpc-lite"))
 
     testImplementation(kotlin("reflect"))
     testImplementation(project(":testing:protokt-generation"))

diff --git a/testing/protokt-generation/build.gradle.kts b/testing/protokt-generation/build.gradle.kts
@@ -33,7 +33,6 @@ protokt {
 
 dependencies {
     implementation(kotlin("reflect"))
-    implementation(project(":protokt-runtime-grpc"))
     implementation(project(":testing:protobuf-java"))
     implementation(libs.grpc.kotlin.stub)
     implementation(libs.grpc.stub)

diff --git a/third-party/proto-google-common-protos-grpc-kotlin/build.gradle.kts b/third-party/proto-google-common-protos-grpc-kotlin/build.gradle.kts
@@ -36,7 +36,6 @@ protokt {
 dependencies {
     protobufExcludingProtobufJava(libs.protoGoogleCommonProtos)
 
-    api(project(":protokt-runtime-grpc"))
     api(project(":third-party:proto-google-common-protos-grpc"))
     api(libs.grpc.kotlin.stub)
 }
diff --git a/third-party/proto-google-common-protos-grpc/build.gradle.kts b/third-party/proto-google-common-protos-grpc/build.gradle.kts
@@ -36,7 +36,6 @@ protokt {
 dependencies {
     protobufExcludingProtobufJava(libs.protoGoogleCommonProtos)
 
-    api(project(":protokt-runtime-grpc-lite"))
     api(project(":third-party:proto-google-common-protos"))
     api(libs.grpc.stub)
 }