Update gRPC to the latest (1.41.0) and Protobuf

CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Oct 25, 2021 · 6ad997d · 6ad997d
1 parent 0ee59f5
commit 6ad997d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/bazel-java-deps.bzl b/bazel-java-deps.bzl
@@ -44,7 +44,7 @@ netty_version = "4.1.67.Final"
 # <tcnative.version>2.0.42.Final</tcnative.version>
 # ```
 netty_tcnative_version = "2.0.40.Final"
-grpc_version = "1.35.0"
+grpc_version = "1.41.0"
 akka_version = "2.6.13"
 
 def install_java_deps():
@@ -139,8 +139,8 @@ def install_java_deps():
             "io.netty:netty-resolver:{}".format(netty_version),
             "io.netty:netty-tcnative-boringssl-static:{}".format(netty_tcnative_version),
             # protobuf
-            "com.google.protobuf:protobuf-java:3.17.1",
-            #scalapb
+            "com.google.protobuf:protobuf-java:3.17.3",
+            # scalapb
             "com.thesamet.scalapb:compilerplugin_{}:{}".format(scala_major_version, scalapb_version),
             "com.thesamet.scalapb:lenses_{}:{}".format(scala_major_version, scalapb_version),
             "com.thesamet.scalapb:protoc-bridge_{}:{}".format(scala_major_version, scalapb_protoc_version),

diff --git a/bazel_tools/protobuf-win32.patch b/bazel_tools/protobuf-win32.patch
diff --git a/deps.bzl b/deps.bzl
@@ -156,13 +156,10 @@ def daml_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "bf0e5070b4b99240183b29df78155eee335885e53a8af8683964579c214ad301",
+            sha256 = "528927e398f4e290001886894dac17c5c6a2e5548f3fb68004cfb01af901b53a",
             # changing this version needs to be in sync with protobuf-java and grpc dependencies in bazel-java-bdeps.bzl
-            strip_prefix = "protobuf-3.14.0",
-            urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.14.0.zip"],
-            patches = [
-                "@com_github_digital_asset_daml//bazel_tools:protobuf-win32.patch",
-            ],
+            strip_prefix = "protobuf-3.17.3",
+            urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.17.3.zip"],
             patch_args = ["-p1"],
         )
 

diff --git a/ledger-api/grpc-definitions/com/daml/ledger/api/v1/completion.proto b/ledger-api/grpc-definitions/com/daml/ledger/api/v1/completion.proto
@@ -6,7 +6,6 @@ syntax = "proto3";
 package com.daml.ledger.api.v1;
 
 import "google/protobuf/duration.proto";
-import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
 option java_outer_classname = "CompletionOuterClass";