Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gRPC to the latest (1.41.0) and Protobuf #11380

Merged
merged 1 commit into from Oct 25, 2021
Merged

Update gRPC to the latest (1.41.0) and Protobuf #11380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions bazel-java-deps.bzl
View file
Open in desktop
Expand Up @@ -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():
Expand Down Expand Up @@ -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),
Expand Down
18 changes: 0 additions & 18 deletions bazel_tools/protobuf-win32.patch
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions deps.bzl
View file
Open in desktop
Expand Up @@ -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",
hubert-da marked this conversation as resolved.
Show resolved Hide resolved
],
strip_prefix = "protobuf-3.17.3",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.17.3.zip"],
patch_args = ["-p1"],
)

Expand Down
1 change: 0 additions & 1 deletion ledger-api/grpc-definitions/com/daml/ledger/api/v1/completion.proto
View file
Open in desktop
Expand Up @@ -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";
Expand Down