upgrade ruby, C# python and ObC to protobuf 3.14

4 years ago · 9bb2aefd02
parent 6c99a037d0
commit 9bb2aefd02
10 changed files with 10 additions and 10 deletions
--- a/build_handwritten.yaml
+++ b/build_handwritten.yaml
@ -15,7 +15,7 @@ settings:
  core_version: 14.0.0
  csharp_major_version: 2
  g_stands_for: gecko
-  protobuf_version: 3.13.0
+  protobuf_version: 3.14.0
  version: 1.35.0-pre1
 targets:
 - name: check_epollexclusive
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -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'
  s.add_dependency 'googleapis-common-protos-types', '~> 1.0'

  s.add_development_dependency 'bundler',            '>= 1.9'
--- a/src/cpp/Protobuf-C++.podspec
+++ b/src/cpp/Protobuf-C++.podspec
@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name     = 'Protobuf-C++'
-  s.version  = '3.13.0'
+  s.version  = '3.14.0'
  s.summary  = 'Protocol Buffers v3 runtime library for C++.'
  s.homepage = 'https://github.com/google/protobuf'
  s.license  = '3-Clause BSD License'
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@ -2,6 +2,6 @@
 <Project>
  <PropertyGroup>
    <GrpcCsharpVersion>2.35.0-pre1</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.13.0</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.14.0</GoogleProtobufVersion>
  </PropertyGroup>
 </Project>
--- 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.13.0'
+  s.dependency '!ProtoCompiler', '3.14.0'
  # For the Protobuf dependency not to complain:
  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.10'
--- 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.13.0'
+  s.dependency '!ProtoCompiler', '3.14.0'
  # For the Protobuf dependency not to complain:
  s.ios.deployment_target = '9.0'
  s.osx.deployment_target = '10.10'
--- 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.13.0'
+  v = '3.14.0'
  s.version  = v
  s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
  s.description = <<-DESC
--- a/third_party/protobuf
+++ b/third_party/protobuf
@ -1 +1 @@
-Subproject commit 2514f0bd7da7e2af1bed4c5d1b84f031c4d12c10
+Subproject commit fde7cf7358ec7cd69e8db9be4f1fa6a5c431386a
--- 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.35.0rc1'
-PROTOBUF_VERSION = '3.13.0'
+PROTOBUF_VERSION = '3.14.0'
--- 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.35.0rc1'
-PROTOBUF_VERSION = '3.13.0'
+PROTOBUF_VERSION = '3.14.0'