From 4250d5d4ced6c9f42adf806cb099cac7f2c43863 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Mon, 2 Nov 2020 15:36:00 -0700
Subject: [PATCH] switch examples to correct stub-lite usage (#201)

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

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"]}")
 }