Skip to content

Commit 1ddaafd

Browse files
author
Hao Nguyen
committed
Update protobuf version
1 parent b483c27 commit 1ddaafd

File tree

7 files changed

+46
-17
lines changed

7 files changed

+46
-17
lines changed

Diff for: bazel/grpc_deps.bzl

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ def grpc_deps():
127127
if "com_google_protobuf" not in native.existing_rules():
128128
http_archive(
129129
name = "com_google_protobuf",
130-
sha256 = "cf9e2fb1d2cd30ec9d51ff1749045208bd641f290f64b85046485934b0e03783",
131-
strip_prefix = "protobuf-582743bf40c5d3639a70f98f183914a2c0cd0680",
132-
url = "https://github.com/google/protobuf/archive/582743bf40c5d3639a70f98f183914a2c0cd0680.tar.gz",
130+
sha256 = "416212e14481cff8fd4849b1c1c1200a7f34808a54377e22d7447efdf54ad758",
131+
strip_prefix = "protobuf-09745575a923640154bcf307fba8aedff47f240a",
132+
url = "https://github.com/google/protobuf/archive/09745575a923640154bcf307fba8aedff47f240a.tar.gz",
133133
)
134134

135135
if "com_github_nanopb_nanopb" not in native.existing_rules():

Diff for: grpc.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
2929
s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
3030
s.platform = Gem::Platform::RUBY
3131

32-
s.add_dependency 'google-protobuf', '~> 3.7'
32+
s.add_dependency 'google-protobuf', '~> 3.8.0'
3333
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
3434

3535
s.add_development_dependency 'bundler', '~> 1.9'

Diff for: src/csharp/Grpc.Core/Version.csproj.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<Project>
33
<PropertyGroup>
44
<GrpcCsharpVersion>1.19.1</GrpcCsharpVersion>
5-
<GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
5+
<GoogleProtobufVersion>3.8.0</GoogleProtobufVersion>
66
</PropertyGroup>
77
</Project>

Diff for: src/csharp/Grpc.IntegrationTesting/EchoMessages.cs

+37-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static EchoMessagesReflection() {
2828
"DGdycGMudGVzdGluZyIyCglEZWJ1Z0luZm8SFQoNc3RhY2tfZW50cmllcxgB",
2929
"IAMoCRIOCgZkZXRhaWwYAiABKAkiUAoLRXJyb3JTdGF0dXMSDAoEY29kZRgB",
3030
"IAEoBRIVCg1lcnJvcl9tZXNzYWdlGAIgASgJEhwKFGJpbmFyeV9lcnJvcl9k",
31-
"ZXRhaWxzGAMgASgJIv8DCg1SZXF1ZXN0UGFyYW1zEhUKDWVjaG9fZGVhZGxp",
31+
"ZXRhaWxzGAMgASgJIqAECg1SZXF1ZXN0UGFyYW1zEhUKDWVjaG9fZGVhZGxp",
3232
"bmUYASABKAgSHgoWY2xpZW50X2NhbmNlbF9hZnRlcl91cxgCIAEoBRIeChZz",
3333
"ZXJ2ZXJfY2FuY2VsX2FmdGVyX3VzGAMgASgFEhUKDWVjaG9fbWV0YWRhdGEY",
3434
"BCABKAgSGgoSY2hlY2tfYXV0aF9jb250ZXh0GAUgASgIEh8KF3Jlc3BvbnNl",
@@ -39,18 +39,19 @@ static EchoMessagesReflection() {
3939
"Zy5EZWJ1Z0luZm8SEgoKc2VydmVyX2RpZRgMIAEoCBIcChRiaW5hcnlfZXJy",
4040
"b3JfZGV0YWlscxgNIAEoCRIxCg5leHBlY3RlZF9lcnJvchgOIAEoCzIZLmdy",
4141
"cGMudGVzdGluZy5FcnJvclN0YXR1cxIXCg9zZXJ2ZXJfc2xlZXBfdXMYDyAB",
42-
"KAUSGwoTYmFja2VuZF9jaGFubmVsX2lkeBgQIAEoBSJKCgtFY2hvUmVxdWVz",
43-
"dBIPCgdtZXNzYWdlGAEgASgJEioKBXBhcmFtGAIgASgLMhsuZ3JwYy50ZXN0",
44-
"aW5nLlJlcXVlc3RQYXJhbXMiRgoOUmVzcG9uc2VQYXJhbXMSGAoQcmVxdWVz",
45-
"dF9kZWFkbGluZRgBIAEoAxIMCgRob3N0GAIgASgJEgwKBHBlZXIYAyABKAki",
46-
"TAoMRWNob1Jlc3BvbnNlEg8KB21lc3NhZ2UYASABKAkSKwoFcGFyYW0YAiAB",
47-
"KAsyHC5ncnBjLnRlc3RpbmcuUmVzcG9uc2VQYXJhbXNiBnByb3RvMw=="));
42+
"KAUSGwoTYmFja2VuZF9jaGFubmVsX2lkeBgQIAEoBRIfChdlY2hvX21ldGFk",
43+
"YXRhX2luaXRpYWxseRgRIAEoCCJKCgtFY2hvUmVxdWVzdBIPCgdtZXNzYWdl",
44+
"GAEgASgJEioKBXBhcmFtGAIgASgLMhsuZ3JwYy50ZXN0aW5nLlJlcXVlc3RQ",
45+
"YXJhbXMiRgoOUmVzcG9uc2VQYXJhbXMSGAoQcmVxdWVzdF9kZWFkbGluZRgB",
46+
"IAEoAxIMCgRob3N0GAIgASgJEgwKBHBlZXIYAyABKAkiTAoMRWNob1Jlc3Bv",
47+
"bnNlEg8KB21lc3NhZ2UYASABKAkSKwoFcGFyYW0YAiABKAsyHC5ncnBjLnRl",
48+
"c3RpbmcuUmVzcG9uc2VQYXJhbXNCA/gBAWIGcHJvdG8z"));
4849
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
4950
new pbr::FileDescriptor[] { },
5051
new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
5152
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.DebugInfo), global::Grpc.Testing.DebugInfo.Parser, new[]{ "StackEntries", "Detail" }, null, null, null),
5253
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ErrorStatus), global::Grpc.Testing.ErrorStatus.Parser, new[]{ "Code", "ErrorMessage", "BinaryErrorDetails" }, null, null, null),
53-
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.RequestParams), global::Grpc.Testing.RequestParams.Parser, new[]{ "EchoDeadline", "ClientCancelAfterUs", "ServerCancelAfterUs", "EchoMetadata", "CheckAuthContext", "ResponseMessageLength", "EchoPeer", "ExpectedClientIdentity", "SkipCancelledCheck", "ExpectedTransportSecurityType", "DebugInfo", "ServerDie", "BinaryErrorDetails", "ExpectedError", "ServerSleepUs", "BackendChannelIdx" }, null, null, null),
54+
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.RequestParams), global::Grpc.Testing.RequestParams.Parser, new[]{ "EchoDeadline", "ClientCancelAfterUs", "ServerCancelAfterUs", "EchoMetadata", "CheckAuthContext", "ResponseMessageLength", "EchoPeer", "ExpectedClientIdentity", "SkipCancelledCheck", "ExpectedTransportSecurityType", "DebugInfo", "ServerDie", "BinaryErrorDetails", "ExpectedError", "ServerSleepUs", "BackendChannelIdx", "EchoMetadataInitially" }, null, null, null),
5455
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.EchoRequest), global::Grpc.Testing.EchoRequest.Parser, new[]{ "Message", "Param" }, null, null, null),
5556
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.ResponseParams), global::Grpc.Testing.ResponseParams.Parser, new[]{ "RequestDeadline", "Host", "Peer" }, null, null, null),
5657
new pbr::GeneratedClrTypeInfo(typeof(global::Grpc.Testing.EchoResponse), global::Grpc.Testing.EchoResponse.Parser, new[]{ "Message", "Param" }, null, null, null)
@@ -441,6 +442,7 @@ public RequestParams(RequestParams other) : this() {
441442
expectedError_ = other.expectedError_ != null ? other.expectedError_.Clone() : null;
442443
serverSleepUs_ = other.serverSleepUs_;
443444
backendChannelIdx_ = other.backendChannelIdx_;
445+
echoMetadataInitially_ = other.echoMetadataInitially_;
444446
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
445447
}
446448

@@ -637,6 +639,17 @@ public int BackendChannelIdx {
637639
}
638640
}
639641

642+
/// <summary>Field number for the "echo_metadata_initially" field.</summary>
643+
public const int EchoMetadataInitiallyFieldNumber = 17;
644+
private bool echoMetadataInitially_;
645+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
646+
public bool EchoMetadataInitially {
647+
get { return echoMetadataInitially_; }
648+
set {
649+
echoMetadataInitially_ = value;
650+
}
651+
}
652+
640653
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
641654
public override bool Equals(object other) {
642655
return Equals(other as RequestParams);
@@ -666,6 +679,7 @@ public bool Equals(RequestParams other) {
666679
if (!object.Equals(ExpectedError, other.ExpectedError)) return false;
667680
if (ServerSleepUs != other.ServerSleepUs) return false;
668681
if (BackendChannelIdx != other.BackendChannelIdx) return false;
682+
if (EchoMetadataInitially != other.EchoMetadataInitially) return false;
669683
return Equals(_unknownFields, other._unknownFields);
670684
}
671685

@@ -688,6 +702,7 @@ public override int GetHashCode() {
688702
if (expectedError_ != null) hash ^= ExpectedError.GetHashCode();
689703
if (ServerSleepUs != 0) hash ^= ServerSleepUs.GetHashCode();
690704
if (BackendChannelIdx != 0) hash ^= BackendChannelIdx.GetHashCode();
705+
if (EchoMetadataInitially != false) hash ^= EchoMetadataInitially.GetHashCode();
691706
if (_unknownFields != null) {
692707
hash ^= _unknownFields.GetHashCode();
693708
}
@@ -765,6 +780,10 @@ public void WriteTo(pb::CodedOutputStream output) {
765780
output.WriteRawTag(128, 1);
766781
output.WriteInt32(BackendChannelIdx);
767782
}
783+
if (EchoMetadataInitially != false) {
784+
output.WriteRawTag(136, 1);
785+
output.WriteBool(EchoMetadataInitially);
786+
}
768787
if (_unknownFields != null) {
769788
_unknownFields.WriteTo(output);
770789
}
@@ -821,6 +840,9 @@ public int CalculateSize() {
821840
if (BackendChannelIdx != 0) {
822841
size += 2 + pb::CodedOutputStream.ComputeInt32Size(BackendChannelIdx);
823842
}
843+
if (EchoMetadataInitially != false) {
844+
size += 2 + 1;
845+
}
824846
if (_unknownFields != null) {
825847
size += _unknownFields.CalculateSize();
826848
}
@@ -886,6 +908,9 @@ public void MergeFrom(RequestParams other) {
886908
if (other.BackendChannelIdx != 0) {
887909
BackendChannelIdx = other.BackendChannelIdx;
888910
}
911+
if (other.EchoMetadataInitially != false) {
912+
EchoMetadataInitially = other.EchoMetadataInitially;
913+
}
889914
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
890915
}
891916

@@ -967,6 +992,10 @@ public void MergeFrom(pb::CodedInputStream input) {
967992
BackendChannelIdx = input.ReadInt32();
968993
break;
969994
}
995+
case 136: {
996+
EchoMetadataInitially = input.ReadBool();
997+
break;
998+
}
970999
}
9711000
}
9721001
}

Diff for: templates/grpc.gemspec.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
3232
s.platform = Gem::Platform::RUBY
3333

34-
s.add_dependency 'google-protobuf', '~> 3.7'
34+
s.add_dependency 'google-protobuf', '~> 3.8.0'
3535
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
3636

3737
s.add_development_dependency 'bundler', '~> 1.9'

0 commit comments

Comments
 (0)