upgrade protobuf to 3.18.1 (automatically generated) (#27722)

* Update third_party/protobuf

* run tools/distrib/python/make_grpcio_tools.py

* regenerate protos for csharp, ruby, php

* update build_handwritten.yaml

* update Protobuf-C++.podspec

* regenerate projects

* [objc] Patch protobuf podspec for 3.18.1 update

- excluding reflection_tester with gtest dependency

Co-authored-by: dennycd <dennycd@google.com>

bazel/grpc_deps.bzl

@@ -212,11 +212,11 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            sha256 = "dd53cb731b1b6b515d3d679644344bf33bb9f5b88c98187ae5c7be734a665c57",
-            strip_prefix = "protobuf-909a0f36a10075c4b4bc70fdee2c7e32dd612a72",
+            sha256 = "74b5c6f7ca553a8d7c365ff0b5008ef5a44bc1aaeca6f964ad7557c2fa430691",
+            strip_prefix = "protobuf-0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928",
             urls = [
-                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/909a0f36a10075c4b4bc70fdee2c7e32dd612a72.tar.gz",
-                "https://github.com/protocolbuffers/protobuf/archive/909a0f36a10075c4b4bc70fdee2c7e32dd612a72.tar.gz",
+                "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/protobuf/archive/0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928.tar.gz",
+                "https://github.com/protocolbuffers/protobuf/archive/0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928.tar.gz",
             ],
             patches = ["@com_github_grpc_grpc//third_party:protobuf.patch"],
             patch_args = ["-p1"],

build_handwritten.yaml

@@ -15,7 +15,7 @@ settings:
   core_version: 19.1.0
   csharp_major_version: 2
   g_stands_for: granola
-  protobuf_version: 3.17.3
+  protobuf_version: 3.18.1
   version: 1.42.0-dev
 targets:
 - name: check_epollexclusive

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.17'
+  s.add_dependency 'google-protobuf', '~> 3.18'
   s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
 
   s.add_development_dependency 'bundler',            '>= 1.9'

src/cpp/Protobuf-C++.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '3.17.3'
+  s.version  = '3.18.1'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = '3-Clause BSD License'
@@ -21,7 +21,8 @@ Pod::Spec.new do |s|
                     'src/google/**/*_unittest.{h,cc}',
                     'src/google/protobuf/test_util*.{h,cc}',
                     'src/google/protobuf/map_lite_test_util.{h,cc}',
-                    'src/google/protobuf/map_test_util*.{h,cc,inc}'
+                    'src/google/protobuf/map_test_util*.{h,cc,inc}',
+                    'src/google/protobuf/reflection_tester.{h,cc}'
 
   s.header_mappings_dir = 'src'
 

src/csharp/build/dependencies.props

@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <GrpcCsharpVersion>2.42.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.17.3</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.18.1</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

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.17.3'
+  s.dependency '!ProtoCompiler', '3.18.1'
   # For the Protobuf dependency not to complain:
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'

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.17.3'
+  s.dependency '!ProtoCompiler', '3.18.1'
   # For the Protobuf dependency not to complain:
   s.ios.deployment_target = '9.0'
   s.osx.deployment_target = '10.10'

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.17.3'
+  v = '3.18.1'
   s.version  = v
   s.summary  = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
   s.description = <<-DESC

src/ruby/pb/src/proto/grpc/testing/test_pb.rb

@@ -1,10 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: src/proto/grpc/testing/test.proto
 
-require 'google/protobuf'
-
 require 'src/proto/grpc/testing/empty_pb'
 require 'src/proto/grpc/testing/messages_pb'
+require 'google/protobuf'
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("src/proto/grpc/testing/test.proto", :syntax => :proto3) do
   end

src/ruby/qps/src/proto/grpc/testing/benchmark_service_pb.rb

@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: src/proto/grpc/testing/benchmark_service.proto
 
+require 'src/proto/grpc/testing/messages_pb'
 require 'google/protobuf'
 
-require 'src/proto/grpc/testing/messages_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("src/proto/grpc/testing/benchmark_service.proto", :syntax => :proto3) do
   end

src/ruby/qps/src/proto/grpc/testing/control_pb.rb

@@ -1,10 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: src/proto/grpc/testing/control.proto
 
-require 'google/protobuf'
-
 require 'src/proto/grpc/testing/payloads_pb'
 require 'src/proto/grpc/testing/stats_pb'
+require 'google/protobuf'
+
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("src/proto/grpc/testing/control.proto", :syntax => :proto3) do
     add_message "grpc.testing.PoissonParams" do

src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_pb.rb

@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: src/proto/grpc/testing/report_qps_scenario_service.proto
 
+require 'src/proto/grpc/testing/control_pb'
 require 'google/protobuf'
 
-require 'src/proto/grpc/testing/control_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("src/proto/grpc/testing/report_qps_scenario_service.proto", :syntax => :proto3) do
   end

src/ruby/qps/src/proto/grpc/testing/stats_pb.rb

@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: src/proto/grpc/testing/stats.proto
 
+require 'src/proto/grpc/core/stats_pb'
 require 'google/protobuf'
 
-require 'src/proto/grpc/core/stats_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("src/proto/grpc/testing/stats.proto", :syntax => :proto3) do
     add_message "grpc.testing.ServerStats" do

src/ruby/qps/src/proto/grpc/testing/worker_service_pb.rb

@@ -1,9 +1,9 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: src/proto/grpc/testing/worker_service.proto
 
+require 'src/proto/grpc/testing/control_pb'
 require 'google/protobuf'
 
-require 'src/proto/grpc/testing/control_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
   add_file("src/proto/grpc/testing/worker_service.proto", :syntax => :proto3) do
   end

third_party/protobuf

@@ -1 +1 @@
-Subproject commit 909a0f36a10075c4b4bc70fdee2c7e32dd612a72
+Subproject commit 0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928

third_party/protobuf.patch

@@ -5,7 +5,7 @@ index 97ac28028..8b7585d9d 100644
 @@ -31,3 +31,9 @@
  # Copyright 2007 Google Inc. All Rights Reserved.
 
- __version__ = '3.17.3'
+ __version__ = '3.18.1'
 +
 +if __name__ != '__main__':
 +  try:

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.42.0.dev0'
-PROTOBUF_VERSION = '3.17.3'
+PROTOBUF_VERSION = '3.18.1'

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.42.0.dev0'
-PROTOBUF_VERSION = '3.17.3'
+PROTOBUF_VERSION = '3.18.1'

tools/run_tests/sanity/check_submodules.sh

@@ -36,7 +36,7 @@ third_party/googletest c9ccac7cb7345901884aabf5d1a786cfa6e2f397
 third_party/libuv 02a9e1be252b623ee032a3137c0b0c94afbe6809
 third_party/opencensus-proto 4aa53e15cbf1a47bc9087e6cfdca214c1eea4e89
 third_party/opentelemetry 60fa8754d890b5c55949a8c68dcfd7ab5c2395df
-third_party/protobuf 909a0f36a10075c4b4bc70fdee2c7e32dd612a72
+third_party/protobuf 0dab03ba7bc438d7ba3eac2b2c1eb39ed520f928
 third_party/protoc-gen-validate 59da36e59fef2267fc2b1849a05159e3ecdf24f3
 third_party/re2 8e08f47b11b413302749c0d8b17a1c94777495d5
 third_party/xds cb28da3451f158a947dfc45090fe92b07b243bc1