Browse Source

Обновить GRPC в Аркадии до версии 1.51.0
426b5a970fb81b66991877c07290963f63e64b22

pazus 1 year ago
parent
commit
5e8541fe78

+ 3 - 2
build/conf/proto.conf

@@ -457,8 +457,9 @@ macro USE_JAVALITE() {
 # tag:proto tag:java-specific
 JAVA_PROTO_COMPILER_VERSION = 3.22.5
 JAVA_PROTO_RUNTIME_VERSION = 3.22.5
-JAVA_PROTO_COMMON_VERSION = 1.12.0
-JAVA_GRPC_VERSION = 1.43.2
+JAVA_PROTO_COMMON_VERSION = 2.9.0
+JAVA_GRPC_VERSION = 1.51.0
+JAVA_NETTY_NETTY_VERSION = 4.1.79.Final
 KOTLIN_PROTO=no
 KOTLIN_PROTO_PEERS=
 when ($JAVA_PROTO_RUNTIME == "javalite") {

+ 0 - 12
contrib/java/com/google/api/grpc/proto-google-common-protos/1.12.0/ya.make

@@ -1,12 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/com/google/protobuf/protobuf-java/3.5.1
-)
-
-JAR_RESOURCE(805479550)
-SRC_RESOURCE(805477995)
-
-END()

+ 0 - 12
contrib/java/com/google/api/grpc/proto-google-common-protos/2.0.1/ya.make

@@ -1,12 +0,0 @@
-JAVA_CONTRIB(proto-google-common-protos-2.0.1)
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/com/google/protobuf/protobuf-java/3.13.0
-)
-
-JAR_RESOURCE(1965473130)
-SRC_RESOURCE(1965469271)
-
-END()

+ 13 - 0
contrib/java/com/google/api/grpc/proto-google-common-protos/2.9.0/ya.make

@@ -0,0 +1,13 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/java/com/google/protobuf/protobuf-java/3.21.1
+)
+
+JAR_RESOURCE(3573996018)
+
+SRC_RESOURCE(3573990573)
+
+END()

+ 9 - 0
contrib/java/com/google/errorprone/error_prone_annotations/2.11.0/ya.make

@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+JAR_RESOURCE(3096861715)
+
+SRC_RESOURCE(3096861694)
+
+END()

+ 9 - 0
contrib/java/com/google/errorprone/error_prone_annotations/2.14.0/ya.make

@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+JAR_RESOURCE(3359065448)
+
+SRC_RESOURCE(3359067951)
+
+END()

+ 0 - 8
contrib/java/com/google/errorprone/error_prone_annotations/2.5.1/ya.make

@@ -1,8 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-JAR_RESOURCE(2155789749)
-SRC_RESOURCE(2155789748)
-
-END()

+ 0 - 9
contrib/java/com/google/errorprone/error_prone_annotations/2.9.0/ya.make

@@ -1,9 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-JAR_RESOURCE(2460308864)
-
-SRC_RESOURCE(2460308880)
-
-END()

+ 4 - 4
contrib/java/com/google/guava/guava/30.1.1-android/ya.make → contrib/java/com/google/guava/guava/31.1-android/ya.make

@@ -6,13 +6,13 @@ PEERDIR(
     contrib/java/com/google/guava/failureaccess/1.0.1
     contrib/java/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava
     contrib/java/com/google/code/findbugs/jsr305/3.0.2
-    contrib/java/org/checkerframework/checker-compat-qual/2.5.5
-    contrib/java/com/google/errorprone/error_prone_annotations/2.5.1
+    contrib/java/org/checkerframework/checker-qual/3.12.0
+    contrib/java/com/google/errorprone/error_prone_annotations/2.11.0
     contrib/java/com/google/j2objc/j2objc-annotations/1.3
 )
 
-JAR_RESOURCE(2283859002)
+JAR_RESOURCE(3096861724)
 
-SRC_RESOURCE(2283859288)
+SRC_RESOURCE(3096861737)
 
 END()

+ 0 - 8
contrib/java/com/google/protobuf/protobuf-java/3.13.0/ya.make

@@ -1,8 +0,0 @@
-JAVA_CONTRIB(protobuf-java-3.13.0)
-
-LICENSE(BSD-3-Clause)
-
-JAR_RESOURCE(1755015277)
-SRC_RESOURCE(1755014752)
-
-END()

Some files were not shown because too many files changed in this diff