From a3b5fe7df14e56d23e49c037ae376495851efe72 Mon Sep 17 00:00:00 2001
From: Marco Ferrer <35935108+marcoferrer@users.noreply.github.com>
Date: Thu, 3 Jan 2019 21:47:46 -0500
Subject: [PATCH] update changelog and example readme
---
CHANGELOG.md | 15 ++++-
build.gradle | 2 +-
example-grpc-client-server/README.md | 60 ++++++++++++++++++-
.../coroutines/CompletableDeferredResponse.kt | 2 +-
publishing.gradle | 2 +-
5 files changed, 73 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd45b6a..5649e77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
-## Version 0.2.2
-_2018-12-3_
+## Version 0.2.2-RC1
+_2018-01-03_
+* New: Update to kotlin ```1.3.11```
+
+#### Protoc Plugin
+* New: gRPC Coroutines Client & Server Code Generation
+* New: Stand alone version of gRPC code gen. ```protoc-gen-grpc-coroutines```
+
+#### Coroutines
+* New: Benchmark implementation of gRPC coroutines
+* New: Experimental global dispatcher ```Dispatchers.Grpc```
+* Deprecated: ```InboundStreamChannel``` in favor of new stub APIs
+* Deprecated: ```ServerBidiCallChannel``` in favor of new stub APIs
## Version 0.2.1
_2018-11-02_
diff --git a/build.gradle b/build.gradle
index e5e7b35..27459da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ subprojects{ subproject ->
apply plugin: 'kotlin'
group = 'com.github.marcoferrer.krotoplus'
- version = '0.2.2-SNAPSHOT'
+ version = '0.2.2-RC1'
compileKotlin {
kotlinOptions.jvmTarget = "1.8"
diff --git a/example-grpc-client-server/README.md b/example-grpc-client-server/README.md
index 61bf2af..cb0720a 100644
--- a/example-grpc-client-server/README.md
+++ b/example-grpc-client-server/README.md
@@ -10,7 +10,7 @@ cd kotlin-coroutines-gRPC-template && \
```
### Getting Started: Kroto+ Plugin
-_[Template](https://github.com/marcoferrer/kotlin-coroutines-gRPC-template/kroto-plus-template)_
+_[Template](https://github.com/marcoferrer/kotlin-coroutines-gRPC-template/tree/kroto-plus-template)_
Add the following configuration to your existing Kroto configuration file.
#### Asciipb (Proto Plain Text)
@@ -59,7 +59,61 @@ protobuf {
}
```
#### Maven
-_[Maven Template](https://github.com/marcoferrer/kotlin-coroutines-gRPC-template/maven)_
```xml
-TODO
+
+ org.xolstice.maven.plugins
+ protobuf-maven-plugin
+ 0.6.1
+
+ com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}
+
+
+
+ compile
+
+
+ grpc-java
+ compile-custom
+
+ grpc-java
+ io.grpc:protoc-gen-grpc-java:1.17.1:exe:${os.detected.classifier}
+
+
+
+
+ grpc-coroutines
+
+ compile-custom
+
+
+ grpc-coroutines
+ com.github.marcoferrer.krotoplus:protoc-gen-grpc-coroutines:0.2.2-RC1:jar:jvm8
+
+
+
+
+
+```
+Add generated sources to Kotlin plugin
+```xml
+
+ kotlin-maven-plugin
+ org.jetbrains.kotlin
+ ${kotlin.version}
+
+
+ compile
+
+ compile
+
+
+
+ ${project.basedir}/target/generated-sources/protobuf/grpc-java
+ ${project.basedir}/target/generated-sources/protobuf/grpc-coroutines
+
+
+
+
+
+```
```
\ No newline at end of file
diff --git a/kroto-plus-coroutines/src/main/kotlin/com/github/marcoferrer/krotoplus/coroutines/CompletableDeferredResponse.kt b/kroto-plus-coroutines/src/main/kotlin/com/github/marcoferrer/krotoplus/coroutines/CompletableDeferredResponse.kt
index 3d6b2e2..811d9e1 100644
--- a/kroto-plus-coroutines/src/main/kotlin/com/github/marcoferrer/krotoplus/coroutines/CompletableDeferredResponse.kt
+++ b/kroto-plus-coroutines/src/main/kotlin/com/github/marcoferrer/krotoplus/coroutines/CompletableDeferredResponse.kt
@@ -3,7 +3,7 @@ package com.github.marcoferrer.krotoplus.coroutines
import io.grpc.stub.StreamObserver
import kotlinx.coroutines.CompletableDeferred
-class CompletableDeferredObserver(
+class CompletableDeferredObserver internal constructor(
private val delegateObserver: StreamObserver,
private val delegateDeferred: CompletableDeferred = CompletableDeferred()
) : CompletableDeferred by delegateDeferred {
diff --git a/publishing.gradle b/publishing.gradle
index 982f736..40ffda0 100644
--- a/publishing.gradle
+++ b/publishing.gradle
@@ -85,7 +85,7 @@ publishing {
}
}
-//artifactoryPublish.skip = !(System.getenv('TRAVIS') == "true" && version.endsWith("SNAPSHOT"))
+artifactoryPublish.skip = !(System.getenv('TRAVIS') == "true" && version.endsWith("SNAPSHOT"))
artifactory {