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

Try upgrading third_party/protobuf version to 3.14.0-rc2 #24723

Closed
wants to merge 3 commits into from
Closed
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
8 changes: 4 additions & 4 deletions bazel/grpc_deps.bzl
Expand Up @@ -164,11 +164,11 @@ def grpc_deps():
if "com_google_protobuf" not in native.existing_rules():
http_archive(
name = "com_google_protobuf",
sha256 = "e589e39ef46fb2b3b476b3ca355bd324e5984cbdfac19f0e1625f0042e99c276",
strip_prefix = "protobuf-fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a",
sha256 = "7481c9c4c51317974f9508917926c00b9030bd9cc435afe355ac97e179c841f4",
strip_prefix = "protobuf-fbbe11ae493e1e1bab6cc396dfbb7b4de9fd8bd0",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a.tar.gz",
"https://github.com/google/protobuf/archive/fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a.tar.gz",
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/protobuf/archive/fbbe11ae493e1e1bab6cc396dfbb7b4de9fd8bd0.tar.gz",
"https://github.com/google/protobuf/archive/fbbe11ae493e1e1bab6cc396dfbb7b4de9fd8bd0.tar.gz",
],
)

Expand Down
2 changes: 1 addition & 1 deletion grpc.gemspec
Expand Up @@ -32,7 +32,7 @@ Gem::Specification.new do |s|
s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
s.platform = Gem::Platform::RUBY

s.add_dependency 'google-protobuf', '~> 3.13'
s.add_dependency 'google-protobuf', '~> 3.14.0.rc.1'
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'

s.add_development_dependency 'bundler', '>= 1.9'
Expand Down
997 changes: 991 additions & 6 deletions src/csharp/Grpc.IntegrationTesting/Messages.cs

Large diffs are not rendered by default.

20 changes: 13 additions & 7 deletions src/csharp/Grpc.IntegrationTesting/Test.cs
Expand Up @@ -47,13 +47,19 @@ public static partial class TestReflection {
"bmcuRW1wdHkaEy5ncnBjLnRlc3RpbmcuRW1wdHkyiQEKEFJlY29ubmVjdFNl",
"cnZpY2USOwoFU3RhcnQSHS5ncnBjLnRlc3RpbmcuUmVjb25uZWN0UGFyYW1z",
"GhMuZ3JwYy50ZXN0aW5nLkVtcHR5EjgKBFN0b3ASEy5ncnBjLnRlc3Rpbmcu",
"RW1wdHkaGy5ncnBjLnRlc3RpbmcuUmVjb25uZWN0SW5mbzJ/ChhMb2FkQmFs",
"YW5jZXJTdGF0c1NlcnZpY2USYwoOR2V0Q2xpZW50U3RhdHMSJi5ncnBjLnRl",
"c3RpbmcuTG9hZEJhbGFuY2VyU3RhdHNSZXF1ZXN0GicuZ3JwYy50ZXN0aW5n",
"LkxvYWRCYWxhbmNlclN0YXRzUmVzcG9uc2UiADKLAQoWWGRzVXBkYXRlSGVh",
"bHRoU2VydmljZRI2CgpTZXRTZXJ2aW5nEhMuZ3JwYy50ZXN0aW5nLkVtcHR5",
"GhMuZ3JwYy50ZXN0aW5nLkVtcHR5EjkKDVNldE5vdFNlcnZpbmcSEy5ncnBj",
"LnRlc3RpbmcuRW1wdHkaEy5ncnBjLnRlc3RpbmcuRW1wdHliBnByb3RvMw=="));
"RW1wdHkaGy5ncnBjLnRlc3RpbmcuUmVjb25uZWN0SW5mbzKGAgoYTG9hZEJh",
"bGFuY2VyU3RhdHNTZXJ2aWNlEmMKDkdldENsaWVudFN0YXRzEiYuZ3JwYy50",
"ZXN0aW5nLkxvYWRCYWxhbmNlclN0YXRzUmVxdWVzdBonLmdycGMudGVzdGlu",
"Zy5Mb2FkQmFsYW5jZXJTdGF0c1Jlc3BvbnNlIgAShAEKGUdldENsaWVudEFj",
"Y3VtdWxhdGVkU3RhdHMSMS5ncnBjLnRlc3RpbmcuTG9hZEJhbGFuY2VyQWNj",
"dW11bGF0ZWRTdGF0c1JlcXVlc3QaMi5ncnBjLnRlc3RpbmcuTG9hZEJhbGFu",
"Y2VyQWNjdW11bGF0ZWRTdGF0c1Jlc3BvbnNlIgAyiwEKFlhkc1VwZGF0ZUhl",
"YWx0aFNlcnZpY2USNgoKU2V0U2VydmluZxITLmdycGMudGVzdGluZy5FbXB0",
"eRoTLmdycGMudGVzdGluZy5FbXB0eRI5Cg1TZXROb3RTZXJ2aW5nEhMuZ3Jw",
"Yy50ZXN0aW5nLkVtcHR5GhMuZ3JwYy50ZXN0aW5nLkVtcHR5MnsKH1hkc1Vw",
"ZGF0ZUNsaWVudENvbmZpZ3VyZVNlcnZpY2USWAoJQ29uZmlndXJlEiQuZ3Jw",
"Yy50ZXN0aW5nLkNsaWVudENvbmZpZ3VyZVJlcXVlc3QaJS5ncnBjLnRlc3Rp",
"bmcuQ2xpZW50Q29uZmlndXJlUmVzcG9uc2ViBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { global::Grpc.Testing.EmptyReflection.Descriptor, global::Grpc.Testing.MessagesReflection.Descriptor, },
new pbr::GeneratedClrTypeInfo(null, null, null));
Expand Down
230 changes: 229 additions & 1 deletion src/csharp/Grpc.IntegrationTesting/TestGrpc.cs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/csharp/build/dependencies.props
Expand Up @@ -2,6 +2,6 @@
<Project>
<PropertyGroup>
<GrpcCsharpVersion>2.34.0-dev</GrpcCsharpVersion>
<GoogleProtobufVersion>3.13.0</GoogleProtobufVersion>
<GoogleProtobufVersion>3.14.0-rc2</GoogleProtobufVersion>
</PropertyGroup>
</Project>
28 changes: 28 additions & 0 deletions src/ruby/pb/src/proto/grpc/testing/messages_pb.rb

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

18 changes: 18 additions & 0 deletions src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb

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

28 changes: 28 additions & 0 deletions src/ruby/qps/src/proto/grpc/testing/messages_pb.rb

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

2 changes: 1 addition & 1 deletion templates/grpc.gemspec.template
Expand Up @@ -34,7 +34,7 @@
s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
s.platform = Gem::Platform::RUBY

s.add_dependency 'google-protobuf', '~> 3.13'
s.add_dependency 'google-protobuf', '~> 3.14.0.rc.1'
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'

s.add_development_dependency 'bundler', '>= 1.9'
Expand Down
2 changes: 1 addition & 1 deletion templates/src/csharp/build/dependencies.props.template
Expand Up @@ -4,6 +4,6 @@
<Project>
<PropertyGroup>
<GrpcCsharpVersion>${settings.csharp_version}</GrpcCsharpVersion>
<GoogleProtobufVersion>3.13.0</GoogleProtobufVersion>
<GoogleProtobufVersion>3.14.0-rc2</GoogleProtobufVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion third_party/protobuf