try to remove stub-lite for #234

README.md

@@ -5,7 +5,6 @@
 
 [![grpc-kotlin-stub][label:stub]][maven:stub]
 [![protoc-gen-grpc-kotlin][label:plugin]][maven:plugin]
-[![grpc-kotlin-stub-lite][label:stub-lite]][maven:stub-lite]
 
 A Kotlin/JVM implementation of [gRPC](https://grpc.io): A high performance, open
 source, general RPC framework that puts mobile and HTTP/2 first.
@@ -23,10 +22,6 @@ This repo includes the sources for the following:
 - [grpc-kotlin-stub](stub): A Kotlin implementation of gRPC, providing runtime
   support for client-stubs and server-side code.
 
-- [grpc-kotlin-stub-lite](stub-lite): An implementation of `grpc-kotlin-stub`,
-  but with a dependency on `grpc-protobuf-lite` instead of `grpc-protobuf` for
-  Android projects.
-
 For more information, see the following [Kotlin/JVM pages from grpc.io][]:
 
 - [Quick start][]
@@ -40,6 +35,13 @@ How-to pages from this repo:
 
 Note that [official releases][] are [published to Maven Central][].
 
+## Upgrading
+
+### 1.0.0 -> 1.1.0
+
+TODO
+
+
 [API Reference]: https://grpc.io/docs/languages/kotlin/api/
 [Basics tutorial]: https://grpc.io/docs/languages/kotlin/basics/
 [Bazel Build Status]: https://github.com/grpc/grpc-kotlin/workflows/Bazel%20Build/badge.svg
@@ -48,10 +50,8 @@ Note that [official releases][] are [published to Maven Central][].
 [Kotlin/JVM pages from grpc.io]: https://grpc.io/docs/languages/kotlin/
 [label:plugin]: https://img.shields.io/maven-central/v/io.grpc/protoc-gen-grpc-kotlin.svg?label=protoc-gen-grpc-kotlin
 [label:stub]: https://img.shields.io/maven-central/v/io.grpc/grpc-kotlin-stub.svg?label=grpc-kotlin-stub
-[label:stub-lite]: https://img.shields.io/maven-central/v/io.grpc/grpc-kotlin-stub-lite.svg?label=grpc-kotlin-stub-lite
 [maven:plugin]: https://search.maven.org/search?q=g:%22io.grpc%22%20AND%20a:%22protoc-gen-grpc-kotlin%22
 [maven:stub]: https://search.maven.org/search?q=g:%22io.grpc%22%20AND%20a:%22grpc-kotlin-stub%22
-[maven:stub-lite]: https://search.maven.org/search?q=g:%22io.grpc%22%20AND%20a:%22grpc-kotlin-stub-lite%22
 [official releases]: https://github.com/grpc/grpc-kotlin/releases
 [protoc]: https://github.com/protocolbuffers/protobuf#protocol-compiler-installation
 [protocolbuffers/protobuf#3742]: https://github.com/protocolbuffers/protobuf/issues/3742

build.gradle

@@ -17,7 +17,7 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'org.jetbrains.kotlin.jvm'
     group = "io.grpc"
-    version = "1.0.0" // CURRENT_GRPC_KOTLIN_VERSION
+    version = "1.1.0-SNAPSHOT" // CURRENT_GRPC_KOTLIN_VERSION
     repositories {
         mavenCentral()
     }
@@ -53,11 +53,7 @@ subprojects {
         }
     }
 
-    if (
-        project.name == "grpc-kotlin-stub"
-        || project.name == "grpc-kotlin-compiler"
-        || project.name == "grpc-kotlin-stub-lite"
-    ) {
+    if (project.name == "grpc-kotlin-stub" || project.name == "grpc-kotlin-compiler") {
         apply plugin: 'maven-publish'
 
         plugins.withId("maven-publish") {

examples/README.md

@@ -78,9 +78,12 @@ The example sources are organized into the following top-level folders:
       mkdir android-sdk
       cd android-sdk
       unzip PATH_TO_SDK_ZIP/sdk-tools-linux-VERSION.zip
-      tools/bin/sdkmanager --update
-      tools/bin/sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;google;m2repository" "extras;android;m2repository"
-      tools/bin/sdkmanager --licenses
+      mv cmdline-tools latest
+      mkdir cmdline-tools
+      mv latest cmdline-tools
+      cmdline-tools/latest/bin/sdkmanager --update
+      cmdline-tools/latest/bin/sdkmanager "platforms;android-30" "build-tools;30.0.2" "extras;google;m2repository" "extras;android;m2repository"
+      cmdline-tools/latest/bin/sdkmanager --licenses
       ```
 
   1. Set an env var pointing to the `android-sdk`

examples/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 // todo: move to subprojects, but how?
 ext["grpcVersion"] = "1.32.1"
-ext["grpcKotlinVersion"] = "1.0.0" // CURRENT_GRPC_KOTLIN_VERSION
+ext["grpcKotlinVersion"] = "1.1.0-SNAPSHOT" // CURRENT_GRPC_KOTLIN_VERSION
 ext["protobufVersion"] = "3.13.0"
 
 allprojects {

examples/stub-android/build.gradle.kts

@@ -17,8 +17,10 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8")
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
+    api("io.grpc:grpc-protobuf-lite:${rootProject.ext["grpcVersion"]}")
+    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
+    api("com.google.guava:guava:28.2-android")
     api("com.google.protobuf:protobuf-javalite:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-kotlin-stub-lite:${rootProject.ext["grpcKotlinVersion"]}")
 }
 
 android {

examples/stub-lite/build.gradle.kts

@@ -16,8 +16,10 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8")
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
+    api("io.grpc:grpc-protobuf-lite:${rootProject.ext["grpcVersion"]}")
+    api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
+    api("com.google.guava:guava:28.2-jre")
     api("com.google.protobuf:protobuf-javalite:${rootProject.ext["protobufVersion"]}")
-    api("io.grpc:grpc-kotlin-stub-lite:${rootProject.ext["grpcKotlinVersion"]}")
 }
 
 java {

examples/stub/build.gradle.kts

@@ -16,6 +16,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8")
     implementation("javax.annotation:javax.annotation-api:1.3.2")
 
+    api("io.grpc:grpc-protobuf:${rootProject.ext["grpcVersion"]}")
     api("com.google.protobuf:protobuf-java-util:${rootProject.ext["protobufVersion"]}")
     api("io.grpc:grpc-kotlin-stub:${rootProject.ext["grpcKotlinVersion"]}")
 }

settings.gradle

@@ -3,8 +3,6 @@ rootProject.name = "grpc-kotlin"
 include 'interop_testing'
 include ":grpc-kotlin-stub"
 project(':grpc-kotlin-stub').projectDir = "$rootDir/stub" as File
-include ":grpc-kotlin-stub-lite"
-project(':grpc-kotlin-stub-lite').projectDir = "$rootDir/stub-lite" as File
 
 if (settings.hasProperty('skipCodegen') && skipCodegen.toBoolean()) {
     println '*** Skipping the build of codegen and compilation of proto files because skipCodegen=true'

stub/build.gradle

@@ -28,7 +28,6 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.ext.coroutinesVersion}"
 
     // Grpc and Protobuf
-    api "io.grpc:grpc-protobuf:${rootProject.ext.grpcVersion}"
     api "io.grpc:grpc-stub:${rootProject.ext.grpcVersion}"
 
     // Java