diff --git a/RELEASE.md b/RELEASE.md index 150525f1b7..e71076bed4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,5 +1,9 @@ # Unreleased +## Breaking Changes + +* Updated `com_github_grpc_grpc` to version `1.50.0`. + # Release 0.78.0 ## Major Features and Improvements diff --git a/WORKSPACE b/WORKSPACE index 6ea72f28ff..37270a7f1d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -17,6 +17,12 @@ git_repository( tag = "1.3.0", ) +git_repository( + name = "com_github_grpc_grpc", + remote = "https://github.com/grpc/grpc.git", + tag = "v1.50.0", +) + git_repository( name = "com_google_benchmark", remote = "https://github.com/google/benchmark.git", @@ -119,7 +125,7 @@ git_repository( # Inlined transitive dependencies, grouped by direct dependency. # -# Required by pybind11_abseil and pybind11_protobuf +# Required by pybind11_abseil and pybind11_protobuf. new_git_repository( name = "pybind11", build_file = "@pybind11_bazel//:pybind11.BUILD", @@ -127,6 +133,14 @@ new_git_repository( tag = "v2.9.2", ) +# Required by com_github_grpc_grpc. This commit is determined by +# https://github.com/grpc/grpc/blob/v1.50.0/bazel/grpc_deps.bzl#L344. +git_repository( + name = "upb", + remote = "https://github.com/protocolbuffers/upb.git", + commit = "e4635f223e7d36dfbea3b722a4ca4807a7e882e2", +) + # # Transitive dependencies, grouped by direct dependency. # @@ -151,19 +165,8 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() -git_repository( - name = "com_github_grpc_grpc", - remote = "https://github.com/grpc/grpc.git", - tag = "v1.59.1", -) - +# Unable to load the `grpc_extra_deps` from gRPC because they conflict with the +# dependencies required by TensorFlow. load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") grpc_deps() - -# TODO: b/260598663 - Temporarily disable the direct dependency on -# `grpc_extra_deps`, for now we pick this dependency up from the TensorFlow -# workspace. -# load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") -# -# grpc_extra_deps() diff --git a/tensorflow_federated/cc/core/impl/executors/BUILD b/tensorflow_federated/cc/core/impl/executors/BUILD index d37c515ada..9e2d450622 100644 --- a/tensorflow_federated/cc/core/impl/executors/BUILD +++ b/tensorflow_federated/cc/core/impl/executors/BUILD @@ -674,6 +674,7 @@ cc_library( "//tensorflow_federated/proto/v0:executor_cc_grpc_proto", "//tensorflow_federated/proto/v0:executor_cc_proto", "@com_github_grpc_grpc//:grpc++", + "@com_github_grpc_grpc//:grpc_security_base", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", ],