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.

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

[Deps] Upgrade Protobuf to v23.1 #33164

Merged
merged 3 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions bazel/grpc_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
)

Expand Down Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion build_handwritten.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion gRPC-C++.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gRPC-Core.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/csharp/build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Project>
<PropertyGroup>
<GrpcCsharpVersion>2.56.0-dev</GrpcCsharpVersion>
<GoogleProtobufVersion>3.23.0</GoogleProtobufVersion>
<GoogleProtobufVersion>3.23.1</GoogleProtobufVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/gRPC-C++.podspec.template
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/gRPC-Core.podspec.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 <grpc/grpc.h>` as opposed to `#include
Expand Down
2 changes: 1 addition & 1 deletion third_party/abseil-cpp
2 changes: 1 addition & 1 deletion third_party/protobuf
Submodule protobuf updated 45 files
+22 −7 .github/workflows/test_cpp.yml
+1 −1 CMakeLists.txt
+1 −1 Protobuf-C++.podspec
+1 −1 Protobuf.podspec
+1 −1 csharp/Google.Protobuf.Tools.nuspec
+1 −1 csharp/src/Google.Protobuf/Google.Protobuf.csproj
+17 −7 csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
+3 −3 java/README.md
+1 −1 java/bom/pom.xml
+1 −1 java/core/pom.xml
+1 −1 java/kotlin-lite/pom.xml
+1 −1 java/kotlin/pom.xml
+1 −1 java/lite.md
+1 −1 java/lite/pom.xml
+1 −1 java/pom.xml
+1 −1 java/protoc/pom.xml
+1 −1 java/util/pom.xml
+2 −1 objectivec/GPBAny.pbobjc.h
+1 −1 php/ext/google/protobuf/protobuf.h
+2 −2 protobuf_deps.bzl
+5 −5 protobuf_version.bzl
+1 −1 python/google/protobuf/__init__.py
+1 −1 ruby/google-protobuf.gemspec
+2 −2 ruby/pom.xml
+1 −1 src/google/protobuf/any.pb.h
+1 −1 src/google/protobuf/api.pb.h
+12 −0 src/google/protobuf/compiler/cpp/message.cc
+4 −0 src/google/protobuf/compiler/plugin.pb.cc
+5 −1 src/google/protobuf/compiler/plugin.pb.h
+28 −0 src/google/protobuf/descriptor.pb.cc
+29 −1 src/google/protobuf/descriptor.pb.h
+1 −1 src/google/protobuf/duration.pb.h
+1 −1 src/google/protobuf/empty.pb.h
+1 −1 src/google/protobuf/field_mask.pb.h
+1 −1 src/google/protobuf/has_bits.h
+22 −4 src/google/protobuf/port_def.inc
+1 −0 src/google/protobuf/port_undef.inc
+1 −1 src/google/protobuf/source_context.pb.h
+4 −3 src/google/protobuf/string_block.h
+1 −1 src/google/protobuf/struct.pb.h
+1 −1 src/google/protobuf/stubs/common.h
+1 −1 src/google/protobuf/timestamp.pb.h
+1 −1 src/google/protobuf/type.pb.h
+1 −1 src/google/protobuf/wrappers.pb.h
+10 −10 version.json
2 changes: 1 addition & 1 deletion third_party/protobuf.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions third_party/upb/bazel/workspace_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)

Expand Down
2 changes: 1 addition & 1 deletion tools/distrib/python/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion tools/distrib/python/grpcio_tools/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion tools/distrib/python/grpcio_tools/protoc_lib_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,4 @@
]
PROTO_INCLUDE='third_party/protobuf/src'

PROTOBUF_SUBMODULE_VERSION="21b02b235393666be2f0f00928849fd986407e1c"
PROTOBUF_SUBMODULE_VERSION="2dca62f7296e5b49d729f7384f975cecb38382a0"
4 changes: 2 additions & 2 deletions tools/run_tests/sanity/check_submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX)

git submodule | awk '{ print $2 " " $1 }' | sort >"$submodules"
cat <<EOF | sort >"$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
Expand All @@ -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
Expand Down