Merge pull request #41 from grpc-up-and-running/dev

Update gradle, grpc, golang , java, kotlin versions
grpc-up-and-running · Jul 17, 2021 · 86d1349 · 86d1349
2 parents 90b1d57 + bc838a1
commit 86d1349
Show file tree

Hide file tree

Showing 46 changed files with 331 additions and 300 deletions.
diff --git a/ch02/productinfo/go/README.md b/ch02/productinfo/go/README.md
@@ -5,7 +5,7 @@
 In order to build, Go to ``Go`` module root directory location (productinfo/go/server) and execute the following
  shell command,
 ```
-go build -i -v -o bin/server
+go build -v -o bin/server
 ```
 
 In order to run, Go to ``Go`` module root directory location (productinfo/go/server) and execute the following
@@ -20,7 +20,7 @@ shell command,
 In order to build, Go to ``Go`` module root directory location (productinfo/go/client) and execute the following
  shell command,
 ```
-go build -i -v -o bin/client
+go build -v -o bin/client
 ```
 
 In order to run, Go to ``Go`` module root directory location (productinfo/go/client) and execute the following

diff --git a/ch02/productinfo/go/client/go.mod b/ch02/productinfo/go/client/go.mod
@@ -1,5 +1,7 @@
 module productinfo/client
 
+go 1.16
+
 require (
 	github.com/golang/protobuf v1.3.2
 	google.golang.org/grpc v1.24.0

diff --git a/ch02/productinfo/go/server/go.mod b/ch02/productinfo/go/server/go.mod
@@ -1,5 +1,7 @@
 module productinfo/server
 
+go 1.16
+
 require (
 	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/golang/protobuf v1.3.2

diff --git a/ch02/productinfo/java/client/build.gradle b/ch02/productinfo/java/client/build.gradle
@@ -5,30 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
     dependencies {
         compile "io.grpc:grpc-netty:${grpcVersion}"
         compile "io.grpc:grpc-protobuf:${grpcVersion}"
         compile "io.grpc:grpc-stub:${grpcVersion}"
-        compile 'com.google.protobuf:protobuf-java:3.9.2'
-        implementation 'javax.annotation:javax.annotation-api:1.3.2'
+        compile 'com.google.protobuf:protobuf-java:3.17.2'
+        compile 'javax.annotation:javax.annotation-api:1.3.2'
     }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier
-        // gradle versions
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {

diff --git a/ch02/productinfo/java/server/build.gradle b/ch02/productinfo/java/server/build.gradle
@@ -5,29 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
 dependencies {
     compile "io.grpc:grpc-netty:${grpcVersion}"
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile 'com.google.protobuf:protobuf-java:3.9.2'
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    compile 'com.google.protobuf:protobuf-java:3.17.2'
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {

diff --git a/ch02/productinfo/kotlin/client/build.gradle b/ch02/productinfo/kotlin/client/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
-    ext.coroutines_version = '1.3.3'
-    ext.protobuf_version = '3.11.1'
-    ext.grpc_version = '1.28.0' // CURRENT_GRPC_VERSION
-    ext.grpc_kotlin_version = '0.1.1' // CURRENT_GRPC_KOTLIN_VERSION
+    ext.kotlin_version = '1.5.21'
+    ext.coroutines_version = '1.5.0'
+    ext.protobuf_version = '3.17.2'
+    ext.grpc_version = '1.39.0' // CURRENT_GRPC_VERSION
+    ext.grpc_kotlin_version = '1.1.0' // CURRENT_GRPC_KOTLIN_VERSION
 
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -33,9 +33,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"
 
     // gRPC and Protobuf
-    implementation 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
+    implementation 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     implementation "com.google.protobuf:protobuf-java:${protobuf_version}"
-    implementation "com.google.protobuf:protobuf-java-util:3.11.1"
+    implementation "com.google.protobuf:protobuf-java-util:${protobuf_version}"
     implementation "io.grpc:grpc-netty-shaded:${grpc_version}"
     implementation "io.grpc:grpc-protobuf:${grpc_version}"
     implementation "io.grpc:grpc-stub:${grpc_version}"
@@ -47,10 +47,10 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 
 protobuf {
@@ -60,7 +60,7 @@ protobuf {
             artifact = "io.grpc:protoc-gen-grpc-java:${grpc_version}"
         }
         grpckt {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:${grpc_kotlin_version}"
+            artifact = "io.grpc:protoc-gen-grpc-kotlin:${grpc_kotlin_version}:jdk7@jar"
         }
     }
     generateProtoTasks {

diff --git a/ch02/productinfo/kotlin/server/build.gradle b/ch02/productinfo/kotlin/server/build.gradle
@@ -1,15 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
-    ext.coroutines_version = '1.3.3'
-    ext.protobuf_version = '3.11.1'
-    ext.grpc_version = '1.28.0' // CURRENT_GRPC_VERSION
-    ext.grpc_kotlin_version = '0.1.1' // CURRENT_GRPC_KOTLIN_VERSION
+    ext.kotlin_version = '1.5.21'
+    ext.coroutines_version = '1.5.0'
+    ext.protobuf_version = '3.17.2'
+    ext.grpc_version = '1.39.0' // CURRENT_GRPC_VERSION
+    ext.grpc_kotlin_version = '1.1.0' // CURRENT_GRPC_KOTLIN_VERSION
 
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -29,13 +29,13 @@ repositories {
 dependencies {
     implementation "io.grpc:grpc-kotlin-stub:${grpc_kotlin_version}"
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61"
+//    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"
 
     // gRPC and Protobuf
-    implementation 'com.google.protobuf:protobuf-gradle-plugin:0.8.11'
+    implementation 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     implementation "com.google.protobuf:protobuf-java:${protobuf_version}"
-    implementation "com.google.protobuf:protobuf-java-util:3.11.1"
+    implementation "com.google.protobuf:protobuf-java-util:${protobuf_version}"
     implementation "io.grpc:grpc-netty-shaded:${grpc_version}"
     implementation "io.grpc:grpc-protobuf:${grpc_version}"
     implementation "io.grpc:grpc-stub:${grpc_version}"
@@ -47,10 +47,10 @@ dependencies {
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 compileTestKotlin {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions.jvmTarget = "11"
 }
 
 protobuf {
@@ -60,7 +60,7 @@ protobuf {
             artifact = "io.grpc:protoc-gen-grpc-java:${grpc_version}"
         }
         grpckt {
-            artifact = "io.grpc:protoc-gen-grpc-kotlin:${grpc_kotlin_version}"
+            artifact = "io.grpc:protoc-gen-grpc-kotlin:${grpc_kotlin_version}:jdk7@jar"
         }
     }
     generateProtoTasks {

diff --git a/ch02/productinfo/python/client/product_info_pb2.pyc b/ch02/productinfo/python/client/product_info_pb2.pyc
diff --git a/ch02/productinfo/python/client/product_info_pb2_grpc.pyc b/ch02/productinfo/python/client/product_info_pb2_grpc.pyc
diff --git a/ch02/productinfo/python/server/product_info_pb2.pyc b/ch02/productinfo/python/server/product_info_pb2.pyc
diff --git a/ch02/productinfo/python/server/product_info_pb2_grpc.pyc b/ch02/productinfo/python/server/product_info_pb2_grpc.pyc
diff --git a/ch03/order-service/java/client/build.gradle b/ch03/order-service/java/client/build.gradle
@@ -5,28 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
 dependencies {
     compile "io.grpc:grpc-netty:${grpcVersion}"
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile 'com.google.protobuf:protobuf-java:3.9.2'
+    compile 'com.google.protobuf:protobuf-java:3.17.2'
+    compile 'javax.annotation:javax.annotation-api:1.2'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {

diff --git a/ch03/order-service/java/server/build.gradle b/ch03/order-service/java/server/build.gradle
@@ -5,28 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
 dependencies {
     compile "io.grpc:grpc-netty:${grpcVersion}"
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile 'com.google.protobuf:protobuf-java:3.9.2'
+    compile 'com.google.protobuf:protobuf-java:3.17.2'
+    compile 'javax.annotation:javax.annotation-api:1.2'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {

diff --git a/ch05/cancellation/order-service/java/client/build.gradle b/ch05/cancellation/order-service/java/client/build.gradle
@@ -5,28 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
 dependencies {
     compile "io.grpc:grpc-netty:${grpcVersion}"
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile 'com.google.protobuf:protobuf-java:3.9.2'
+    compile 'com.google.protobuf:protobuf-java:3.17.2'
+    compile 'javax.annotation:javax.annotation-api:1.2'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {

diff --git a/ch05/cancellation/order-service/java/server/build.gradle b/ch05/cancellation/order-service/java/server/build.gradle
@@ -5,28 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
 dependencies {
     compile "io.grpc:grpc-netty:${grpcVersion}"
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile 'com.google.protobuf:protobuf-java:3.9.2'
+    compile 'com.google.protobuf:protobuf-java:3.17.2'
+    compile 'javax.annotation:javax.annotation-api:1.2'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {

diff --git a/ch05/compression/order-service/java/client/build.gradle b/ch05/compression/order-service/java/client/build.gradle
@@ -5,28 +5,28 @@ repositories {
     mavenCentral()
 }
 
-def grpcVersion = '1.24.1'
+def grpcVersion = '1.39.0'
 
 dependencies {
     compile "io.grpc:grpc-netty:${grpcVersion}"
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
-    compile 'com.google.protobuf:protobuf-java:3.9.2'
+    compile 'com.google.protobuf:protobuf-java:3.17.2'
+    compile 'javax.annotation:javax.annotation-api:1.2'
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17'
     }
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.9.2'
+        artifact = 'com.google.protobuf:protoc:3.17.2'
     }
     plugins {
         grpc {