diff --git a/README.md b/README.md index 0b31f376..c01ca3af 100644 --- a/README.md +++ b/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 diff --git a/build.gradle b/build.gradle index b81fa0b8..6c94accb 100644 --- a/build.gradle +++ b/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") { diff --git a/examples/README.md b/examples/README.md index b699c200..d0270ace 100644 --- a/examples/README.md +++ b/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` diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts index 1acfa85b..c840887a 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"] = "1.0.0" // CURRENT_GRPC_KOTLIN_VERSION +ext["grpcKotlinVersion"] = "1.1.0-SNAPSHOT" // 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 c552f66e..60794876 100644 --- a/examples/stub-android/build.gradle.kts +++ b/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 { diff --git a/examples/stub-lite/build.gradle.kts b/examples/stub-lite/build.gradle.kts index c629048e..bdd03bb0 100644 --- a/examples/stub-lite/build.gradle.kts +++ b/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 { diff --git a/examples/stub/build.gradle.kts b/examples/stub/build.gradle.kts index 91dcfd6c..a30913fc 100644 --- a/examples/stub/build.gradle.kts +++ b/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"]}") } diff --git a/settings.gradle b/settings.gradle index a9f529e3..4259bbf9 100644 --- a/settings.gradle +++ b/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' diff --git a/stub-lite/build.gradle b/stub-lite/build.gradle deleted file mode 100644 index 0236464c..00000000 --- a/stub-lite/build.gradle +++ /dev/null @@ -1,45 +0,0 @@ -plugins { - id "org.jetbrains.dokka" version "0.10.1" - - // Generate IntelliJ IDEA's .idea & .iml project files - // Starting with 0.8.4 of protobuf-gradle-plugin, *.proto and the gen output files are added - // to IntelliJ as sources. It is no longer necessary to add them manually to the idea {} block - // to jump to definitions from Java and Kotlin files. - // For best results, install the Protobuf and Kotlin plugins for IntelliJ. - id "idea" - - id "java-library" - id "maven-publish" -} - -description = "gRPC Kotlin: Stub Lite" - -repositories { - google() - jcenter() - mavenCentral() - mavenLocal() -} - -dependencies { - // Kotlin - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${rootProject.ext.coroutinesVersion}" - - // Grpc and Protobuf - api "io.grpc:grpc-protobuf-lite:${rootProject.ext.grpcVersion}" - - api(project(":grpc-kotlin-stub")) { - exclude group: "io.grpc", module: "grpc-protobuf" - } - - // Java - implementation "javax.annotation:javax.annotation-api:1.2" -} - -publishing { - publications { - maven(MavenPublication) { - from components.java - } - } -} diff --git a/stub/build.gradle b/stub/build.gradle index dadad878..758e3be4 100644 --- a/stub/build.gradle +++ b/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