From a3dae00f897a3a06ee17e042f43aa82befc525d0 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Thu, 18 May 2023 14:46:59 -0700 Subject: [PATCH] [Deps] Upgrade Protobuf to v23.1 (#33164) Along with the required Abseil & upb upgrade. --- bazel/grpc_deps.bzl | 26 +++++++++---------- build_handwritten.yaml | 2 +- gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- src/csharp/build/dependencies.props | 2 +- .../!ProtoCompiler-gRPCCppPlugin.podspec | 2 +- .../!ProtoCompiler-gRPCPlugin.podspec | 2 +- src/objective-c/!ProtoCompiler.podspec | 2 +- templates/gRPC-C++.podspec.template | 2 +- templates/gRPC-Core.podspec.template | 2 +- third_party/abseil-cpp | 2 +- third_party/protobuf | 2 +- third_party/protobuf.patch | 2 +- third_party/upb/bazel/workspace_deps.bzl | 8 +++--- tools/distrib/python/grpc_version.py | 2 +- .../python/grpcio_tools/grpc_version.py | 2 +- .../python/grpcio_tools/protoc_lib_deps.py | 2 +- tools/run_tests/sanity/check_submodules.sh | 4 +-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl index 3f5ab027f6e..bae09a3beb1 100644 --- a/bazel/grpc_deps.bzl +++ b/bazel/grpc_deps.bzl @@ -253,12 +253,12 @@ def grpc_deps(): if "com_google_protobuf" not in native.existing_rules(): http_archive( name = "com_google_protobuf", - sha256 = "38a74632e35273f8b90bbfed3d7e8835fcffcc68869763c481220143655d7bde", - strip_prefix = "protobuf-21b02b235393666be2f0f00928849fd986407e1c", + sha256 = "209385d3c08252e320196b628584c8007f849f9ec8a26c2796a886345ee58bb6", + strip_prefix = "protobuf-2dca62f7296e5b49d729f7384f975cecb38382a0", urls = [ - # https://github.com/protocolbuffers/protobuf/commits/23.x - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/21b02b235393666be2f0f00928849fd986407e1c.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/21b02b235393666be2f0f00928849fd986407e1c.tar.gz", + # https://github.com/protocolbuffers/protobuf/commits/v23.1 + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/2dca62f7296e5b49d729f7384f975cecb38382a0.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/2dca62f7296e5b49d729f7384f975cecb38382a0.tar.gz", ], patches = [ "@com_github_grpc_grpc//third_party:protobuf.patch", @@ -338,11 +338,11 @@ def grpc_deps(): if "com_google_absl" not in native.existing_rules(): http_archive( name = "com_google_absl", - sha256 = "9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906", - strip_prefix = "abseil-cpp-20230125.2", + sha256 = "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36", + strip_prefix = "abseil-cpp-20230125.3", urls = [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230125.2.tar.gz", - "https://github.com/abseil/abseil-cpp/archive/20230125.2.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/abseil/abseil-cpp/archive/20230125.3.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/20230125.3.tar.gz", ], ) @@ -393,12 +393,12 @@ def grpc_deps(): if "upb" not in native.existing_rules(): http_archive( name = "upb", - sha256 = "4e43a960676dc4d75d4913582af9ecf5f19ac3d0a00f00c091c40ba84f1f2e15", - strip_prefix = "upb-af735076087f77099835f546572556a91c97b047", + sha256 = "7d19f2ac9c1e508a86a272913d9aa67c8147827f949035828910bb05d9f2cf03", + strip_prefix = "upb-61a97efa24a5ce01fb8cc73c9d1e6e7060f8ea98", urls = [ # https://github.com/protocolbuffers/upb/commits/23.x - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/af735076087f77099835f546572556a91c97b047.tar.gz", - "https://github.com/protocolbuffers/upb/archive/af735076087f77099835f546572556a91c97b047.tar.gz", + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/61a97efa24a5ce01fb8cc73c9d1e6e7060f8ea98.tar.gz", + "https://github.com/protocolbuffers/upb/archive/61a97efa24a5ce01fb8cc73c9d1e6e7060f8ea98.tar.gz", ], ) diff --git a/build_handwritten.yaml b/build_handwritten.yaml index b87346090ef..1305eadbf59 100644 --- a/build_handwritten.yaml +++ b/build_handwritten.yaml @@ -15,7 +15,7 @@ settings: core_version: 32.0.0 csharp_major_version: 2 g_stands_for: galvanized - protobuf_version: 3.23.0 + protobuf_version: 3.23.1 version: 1.56.0-dev configs: asan: diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 629657dbd22..36ce9f32d49 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -214,7 +214,7 @@ Pod::Spec.new do |s| ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20230125.0' + abseil_version = '1.20230125.3' ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/core_headers', abseil_version ss.dependency 'abseil/cleanup/cleanup', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 923831da1ad..85ac919aa76 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -46,7 +46,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '1.20230125.0' + abseil_version = '1.20230125.3' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props index 2ed984901a0..e184897d1c3 100644 --- a/src/csharp/build/dependencies.props +++ b/src/csharp/build/dependencies.props @@ -2,6 +2,6 @@ 2.56.0-dev - 3.23.0 + 3.23.1 diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index e9ce7062994..d42639a9c36 100644 --- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec @@ -100,7 +100,7 @@ Pod::Spec.new do |s| s.preserve_paths = plugin # Restrict the protoc version to the one supported by this plugin. - s.dependency '!ProtoCompiler', '3.23.0' + s.dependency '!ProtoCompiler', '3.23.1' # For the Protobuf dependency not to complain: s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.10' diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index aa411c61c5c..a8a93bb6066 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -102,7 +102,7 @@ Pod::Spec.new do |s| s.preserve_paths = plugin # Restrict the protoc version to the one supported by this plugin. - s.dependency '!ProtoCompiler', '3.23.0' + s.dependency '!ProtoCompiler', '3.23.1' # For the Protobuf dependency not to complain: s.ios.deployment_target = '9.0' s.osx.deployment_target = '10.10' diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec index 79b751edf04..0bf744954e9 100644 --- a/src/objective-c/!ProtoCompiler.podspec +++ b/src/objective-c/!ProtoCompiler.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler' - v = '3.23.0' + v = '3.23.1' s.version = v s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.description = <<-DESC diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index 7bd1b8395a1..0372b143eb8 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -171,7 +171,7 @@ ss.header_mappings_dir = '.' ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '1.20230125.0' + abseil_version = '1.20230125.3' % for abseil_spec in grpcpp_abseil_specs: ss.dependency '${abseil_spec}', abseil_version % endfor diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index b5fcde3bc72..ab70683b5cf 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -122,7 +122,7 @@ s.requires_arc = false name = 'grpc' - abseil_version = '1.20230125.0' + abseil_version = '1.20230125.3' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp index b971ac5250e..c2435f8342c 160000 --- a/third_party/abseil-cpp +++ b/third_party/abseil-cpp @@ -1 +1 @@ -Subproject commit b971ac5250ea8de900eae9f95e06548d14cd95fe +Subproject commit c2435f8342c2d0ed8101cb43adfd605fdc52dca2 diff --git a/third_party/protobuf b/third_party/protobuf index 21b02b23539..2dca62f7296 160000 --- a/third_party/protobuf +++ b/third_party/protobuf @@ -1 +1 @@ -Subproject commit 21b02b235393666be2f0f00928849fd986407e1c +Subproject commit 2dca62f7296e5b49d729f7384f975cecb38382a0 diff --git a/third_party/protobuf.patch b/third_party/protobuf.patch index 0443ed3211c..11b5b2467c0 100644 --- a/third_party/protobuf.patch +++ b/third_party/protobuf.patch @@ -5,7 +5,7 @@ index 97ac28028..8b7585d9d 100644 @@ -31,3 +31,9 @@ # Copyright 2007 Google Inc. All Rights Reserved. - __version__ = '4.23.0' + __version__ = '4.23.1' + +if __name__ != '__main__': + try: diff --git a/third_party/upb/bazel/workspace_deps.bzl b/third_party/upb/bazel/workspace_deps.bzl index 456fad796cc..2223e921798 100644 --- a/third_party/upb/bazel/workspace_deps.bzl +++ b/third_party/upb/bazel/workspace_deps.bzl @@ -15,16 +15,16 @@ def upb_deps(): _github_archive, name = "com_google_absl", repo = "https://github.com/abseil/abseil-cpp", - commit = "b971ac5250ea8de900eae9f95e06548d14cd95fe", # Abseil LTS 20230125.2 - sha256 = "f7c2cb2c5accdcbbbd5c0c59f241a988c0b1da2a3b7134b823c0bd613b1a6880", + commit = "c2435f8342c2d0ed8101cb43adfd605fdc52dca2", # Abseil LTS 20230125.3 + sha256 = "ea1d31db00eb37e607bfda17ffac09064670ddf05da067944c4766f517876390", ) maybe( _github_archive, name = "com_google_protobuf", repo = "https://github.com/protocolbuffers/protobuf", - commit = "12c835107e44172e4e95817f36159911cdfd805d", - sha256 = "c1894498ca65f7f52df83b99a6f8f372507e8a5cbf124c8271e9ee6b723b87b4", + commit = "71fca0ca15ca6f0cfe12c6593e7fc840f7ae0809", + sha256 = "0b467b7c0b34515cf88a20c2fe5a550ae18cb55dcc76f8e2e659349c1169d48f", patches = ["@upb//bazel:protobuf.patch"], ) diff --git a/tools/distrib/python/grpc_version.py b/tools/distrib/python/grpc_version.py index e147e367ee4..5a6f0710cdc 100644 --- a/tools/distrib/python/grpc_version.py +++ b/tools/distrib/python/grpc_version.py @@ -15,4 +15,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! VERSION = '1.56.0.dev0' -PROTOBUF_VERSION = '3.23.0' +PROTOBUF_VERSION = '3.23.1' diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 6df54c17934..3f463db2652 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -15,4 +15,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! VERSION = '1.56.0.dev0' -PROTOBUF_VERSION = '3.23.0' +PROTOBUF_VERSION = '3.23.1' diff --git a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py index 64815b00e00..f1f851ce10e 100644 --- a/tools/distrib/python/grpcio_tools/protoc_lib_deps.py +++ b/tools/distrib/python/grpcio_tools/protoc_lib_deps.py @@ -303,4 +303,4 @@ CC_INCLUDES=[ ] PROTO_INCLUDE='third_party/protobuf/src' -PROTOBUF_SUBMODULE_VERSION="21b02b235393666be2f0f00928849fd986407e1c" +PROTOBUF_SUBMODULE_VERSION="2dca62f7296e5b49d729f7384f975cecb38382a0" diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index b46c49043e3..fe191b41c12 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules" cat <"$want_submodules" -third_party/abseil-cpp b971ac5250ea8de900eae9f95e06548d14cd95fe +third_party/abseil-cpp c2435f8342c2d0ed8101cb43adfd605fdc52dca2 third_party/benchmark 361e8d1cfe0c6c36d30b39f1b61302ece5507320 third_party/bloaty 60209eb1ccc34d5deefb002d1b7f37545204f7f2 third_party/boringssl-with-bazel e46383fc18d08def901b2ed5a194295693e905c7 @@ -36,7 +36,7 @@ third_party/googletest 0e402173c97aea7a00749e825b194bfede4f2e45 third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df -third_party/protobuf 21b02b235393666be2f0f00928849fd986407e1c +third_party/protobuf 2dca62f7296e5b49d729f7384f975cecb38382a0 third_party/re2 0c5616df9c0aaa44c9440d87422012423d91c7d1 third_party/xds 4003588d1b747e37e911baa5a9c1c07fde4ca518 third_party/zlib 04f42ceca40f73e2978b50e93806c2a18c1281fc