From 40782eba7d8da01c88de27f0633f43f3275d83b4 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Thu, 29 Oct 2020 13:51:08 -0600
Subject: [PATCH] switch examples to correct stub-lite usage

---
 examples/build.gradle.kts              |  2 +-
 examples/stub-android/build.gradle.kts | 11 +----------
 examples/stub-lite/build.gradle.kts    | 11 +----------
 examples/stub/build.gradle.kts         |  2 --
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
index 5d78d5d3..83bc6532 100644
--- a/examples/build.gradle.kts
+++ b/examples/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 // todo: move to subprojects, but how?
 ext["grpcVersion"] = "1.32.1"
-ext["grpcKotlinVersion"] = "0.2.0" // CURRENT_GRPC_KOTLIN_VERSION
+ext["grpcKotlinVersion"] = "0.2.1" // CURRENT_GRPC_KOTLIN_VERSION
 ext["protobufVersion"] = "3.13.0"
 
 allprojects {
diff --git a/examples/stub-android/build.gradle.kts b/examples/stub-android/build.gradle.kts
index 6da5d2a8..c552f66e 100644
--- a/examples/stub-android/build.gradle.kts
+++ b/examples/stub-android/build.gradle.kts
@@ -18,16 +18,7 @@ dependencies {
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
     api("com.google.protobuf:protobuf-javalite:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-protobuf-lite:${rootProject.ext["grpcVersion"]}")
-
-    // todo: I think we should be able to just include this:
-    // api("io.grpc:grpc-kotlin-stub-lite:${rootProject.ext["grpcKotlinVersion"]}")
-    // but it doesn't pull transitives correctly
-
-    api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
-    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}") {
-        exclude("io.grpc", "grpc-protobuf")
-    }
+    api("io.grpc:grpc-kotlin-stub-lite:${rootProject.ext["grpcKotlinVersion"]}")
 }
 
 android {
diff --git a/examples/stub-lite/build.gradle.kts b/examples/stub-lite/build.gradle.kts
index aacd6ed2..c629048e 100644
--- a/examples/stub-lite/build.gradle.kts
+++ b/examples/stub-lite/build.gradle.kts
@@ -17,16 +17,7 @@ dependencies {
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
     api("com.google.protobuf:protobuf-javalite:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-protobuf-lite:${rootProject.ext["grpcVersion"]}")
-
-    // todo: I think we should be able to just include this:
-    // api("io.grpc:grpc-kotlin-stub-lite:${rootProject.ext["grpcKotlinVersion"]}")
-    // but it doesn't pull transitives correctly
-
-    api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
-    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}") {
-        exclude("io.grpc", "grpc-protobuf")
-    }
+    api("io.grpc:grpc-kotlin-stub-lite:${rootProject.ext["grpcKotlinVersion"]}")
 }
 
 java {
diff --git a/examples/stub/build.gradle.kts b/examples/stub/build.gradle.kts
index 2ab5495c..91dcfd6c 100644
--- a/examples/stub/build.gradle.kts
+++ b/examples/stub/build.gradle.kts
@@ -17,8 +17,6 @@ dependencies {
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
     api("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-stub:${rootProject.ext["grpcVersion"]}")
-    api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
     api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
 }