update dependencies

rpc compiler: use protobuf metadata
jauntsdn · Aug 5, 2023 · 2d6bb33 · 2d6bb33
1 parent 6628a8a
commit 2d6bb33
Show file tree

Hide file tree

Showing 36 changed files with 1,902 additions and 86 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=com.jauntsdn.rsocket
-version=1.4.0
+version=1.5.0
 
 googleJavaFormatPluginVersion=0.9
 dependencyManagementPluginVersion=1.1.0
@@ -8,10 +8,10 @@ gitPluginVersion=0.13.0
 osDetectorPluginVersion=1.7.0
 versionsPluginVersion=0.45.0
 
-rSocketVersion=1.4.0
+rSocketVersion=1.5.0
 slf4jVersion=1.7.36
 logbackVersion=1.2.11
-grpcVersion=1.54.1
+grpcVersion=1.57.1
 
 org.gradle.parallel=true
 org.gradle.configureondemand=true
diff --git a/grpc-client/gradle.lockfile b/grpc-client/gradle.lockfile
@@ -4,34 +4,34 @@
 ch.qos.logback:logback-classic:1.2.11=runtimeClasspath
 ch.qos.logback:logback-core:1.2.11=runtimeClasspath
 com.google.android:annotations:4.1.1.4=compileProtoPath,runtimeClasspath,testCompileProtoPath
-com.google.api.grpc:proto-google-common-protos:2.9.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 com.google.code.findbugs:jsr305:1.3.9=googleJavaFormat1.6
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-com.google.code.gson:gson:2.9.0=compileProtoPath,runtimeClasspath,testCompileProtoPath
+com.google.code.gson:gson:2.10.1=compileProtoPath,runtimeClasspath,testCompileProtoPath
 com.google.errorprone:error_prone_annotations:2.0.18=googleJavaFormat1.6
 com.google.errorprone:error_prone_annotations:2.18.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:failureaccess:1.0.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 com.google.guava:guava:22.0=googleJavaFormat1.6
-com.google.guava:guava:31.1-android=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.google.guava:guava:32.0.1-android=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-com.google.j2objc:j2objc-annotations:1.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-com.google.protobuf:protobuf-java:3.22.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-com.google.protobuf:protoc:3.22.3=protobufToolsLocator_protoc
-io.grpc:grpc-api:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:grpc-context:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:grpc-core:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:grpc-netty-shaded:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:grpc-protobuf-lite:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:grpc-protobuf:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:grpc-stub:1.54.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.grpc:protoc-gen-grpc-java:1.54.1=protobufToolsLocator_grpc
-io.perfmark:perfmark-api:0.25.0=compileProtoPath,runtimeClasspath,testCompileProtoPath
+com.google.j2objc:j2objc-annotations:2.8=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.google.protobuf:protobuf-java:3.23.4=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.google.protobuf:protoc:3.23.4=protobufToolsLocator_protoc
+io.grpc:grpc-api:1.57.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.grpc:grpc-context:1.57.1=compileProtoPath,runtimeClasspath,testCompileProtoPath
+io.grpc:grpc-core:1.57.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.grpc:grpc-netty-shaded:1.57.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.grpc:grpc-protobuf-lite:1.57.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.grpc:grpc-protobuf:1.57.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.grpc:grpc-stub:1.57.1=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.grpc:protoc-gen-grpc-java:1.57.1=protobufToolsLocator_grpc
+io.perfmark:perfmark-api:0.26.0=compileProtoPath,runtimeClasspath,testCompileProtoPath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-org.checkerframework:checker-qual:3.12.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+org.checkerframework:checker-qual:3.33.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
-org.codehaus.mojo:animal-sniffer-annotations:1.21=compileProtoPath,runtimeClasspath,testCompileProtoPath
+org.codehaus.mojo:animal-sniffer-annotations:1.23=compileProtoPath,runtimeClasspath,testCompileProtoPath
 org.slf4j:slf4j-api:1.7.36=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 empty=annotationProcessor,protobuf,testProtobuf
diff --git a/grpc-client/src/generated/main/grpc/futures/DinerGrpc.java b/grpc-client/src/generated/main/grpc/futures/DinerGrpc.java
@@ -5,14 +5,14 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.54.1)",
+    value = "by gRPC proto compiler (version 1.57.1)",
     comments = "Source: service.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DinerGrpc {
 
   private DinerGrpc() {}
 
-  public static final String SERVICE_NAME = "futures.Diner";
+  public static final java.lang.String SERVICE_NAME = "futures.Diner";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<futures.Order,
@@ -334,9 +334,9 @@ private static final class DinerFileDescriptorSupplier
   private static final class DinerMethodDescriptorSupplier
       extends DinerBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    DinerMethodDescriptorSupplier(String methodName) {
+    DinerMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

diff --git a/grpc-client/src/generated/main/java/futures/Meal.java b/grpc-client/src/generated/main/java/futures/Meal.java
diff --git a/grpc-client/src/generated/main/java/futures/Order.java b/grpc-client/src/generated/main/java/futures/Order.java
diff --git a/grpc-client/src/generated/main/java/futures/Payment.java b/grpc-client/src/generated/main/java/futures/Payment.java
diff --git a/grpc-client/src/generated/main/java/io/rsocket/rpc/RSocketMethodOptions.java b/grpc-client/src/generated/main/java/io/rsocket/rpc/RSocketMethodOptions.java
diff --git a/messagestreams-futures-client/build.gradle b/messagestreams-futures-client/build.gradle
@@ -29,6 +29,7 @@ compileJava {
 
 dependencies {
     protobuf project(":messagestreams-service-idl")
+    protobuf "com.jauntsdn.rsocket:rsocket-rpc-metadata-idl"
 
     implementation project(":messagestreams-runtime")
     implementation "com.jauntsdn.rsocket:rsocket-rpc-futures"
@@ -65,6 +66,7 @@ if (findProperty("generateProto") == "true" && osdetector.os == "linux") {
                     messageStreamsRpc {
                         option "metadataless-method-definitions"
                         option "generate-codec-suffix=none"
+                        option "typed-metadata"
                     }
                 }
             }

diff --git a/messagestreams-futures-client/gradle.lockfile b/messagestreams-futures-client/gradle.lockfile
@@ -7,15 +7,16 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
 com.google.guava:guava:22.0=googleJavaFormat1.6
 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
-com.google.protobuf:protobuf-java:3.22.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-com.google.protobuf:protoc:3.22.3=protobufToolsLocator_protoc
-com.jauntsdn.rsocket:rsocket-futures:1.4.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-com.jauntsdn.rsocket:rsocket-messages:1.4.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.google.protobuf:protobuf-java:3.23.4=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.google.protobuf:protoc:3.23.4=protobufToolsLocator_protoc
+com.jauntsdn.rsocket:rsocket-futures:1.5.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.jauntsdn.rsocket:rsocket-messages:1.5.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 com.jauntsdn.rsocket:rsocket-rpc-futures-compiler:1.1.3=protobufToolsLocator_rsocketRpc
-com.jauntsdn.rsocket:rsocket-rpc-futures-compiler:1.4.0=protobufToolsLocator_messageStreamsRpc
-com.jauntsdn.rsocket:rsocket-rpc-futures:1.4.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.netty:netty-buffer:4.1.92.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-io.netty:netty-common:4.1.92.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.jauntsdn.rsocket:rsocket-rpc-futures-compiler:1.5.0=protobufToolsLocator_messageStreamsRpc
+com.jauntsdn.rsocket:rsocket-rpc-futures:1.5.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+com.jauntsdn.rsocket:rsocket-rpc-metadata-idl:1.5.0=protobuf
+io.netty:netty-buffer:4.1.96.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
+io.netty:netty-common:4.1.96.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 org.slf4j:slf4j-api:1.7.36=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath
-empty=annotationProcessor,protobuf,testProtobuf
+empty=annotationProcessor,testProtobuf