Merge pull request #56853 from rschu1ze/bump-grpc-and-protobuf

Bump gRPC to v1.59 and protobuf to v24.4

contrib/abseil-cpp

@@ -1 +1 @@
-Subproject commit 5655528c41830f733160de4fb0b99073841bae9e
+Subproject commit 3bd86026c93da5a40006fd53403dff9d5f5e30e3

contrib/google-protobuf

@@ -1 +1 @@
-Subproject commit 089b89c8d4140f0d49fe4222b047a8ea814bc752
+Subproject commit 0862007f6ca1f5723c58f10f0ca34f3f25a63b2e

contrib/google-protobuf-cmake/CMakeLists.txt

@@ -82,7 +82,6 @@ set(libprotobuf_lite_files
   ${protobuf_source_dir}/src/google/protobuf/any_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/arena.cc
   ${protobuf_source_dir}/src/google/protobuf/arena_align.cc
-  ${protobuf_source_dir}/src/google/protobuf/arena_config.cc
   ${protobuf_source_dir}/src/google/protobuf/arenastring.cc
   ${protobuf_source_dir}/src/google/protobuf/arenaz_sampler.cc
   ${protobuf_source_dir}/src/google/protobuf/extension_set.cc
@@ -131,17 +130,18 @@ set(libprotobuf_files
   ${protobuf_source_dir}/src/google/protobuf/any_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/arena.cc
   ${protobuf_source_dir}/src/google/protobuf/arena_align.cc
-  ${protobuf_source_dir}/src/google/protobuf/arena_config.cc
   ${protobuf_source_dir}/src/google/protobuf/arenastring.cc
   ${protobuf_source_dir}/src/google/protobuf/arenaz_sampler.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/importer.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/parser.cc
+  ${protobuf_source_dir}/src/google/protobuf/cpp_features.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/descriptor.cc
   ${protobuf_source_dir}/src/google/protobuf/descriptor.pb.cc
   ${protobuf_source_dir}/src/google/protobuf/descriptor_database.cc
   ${protobuf_source_dir}/src/google/protobuf/dynamic_message.cc
   ${protobuf_source_dir}/src/google/protobuf/extension_set.cc
   ${protobuf_source_dir}/src/google/protobuf/extension_set_heavy.cc
+  ${protobuf_source_dir}/src/google/protobuf/feature_resolver.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_enum_util.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_message_bases.cc
   ${protobuf_source_dir}/src/google/protobuf/generated_message_reflection.cc
@@ -174,6 +174,9 @@ set(libprotobuf_files
   ${protobuf_source_dir}/src/google/protobuf/message.cc
   ${protobuf_source_dir}/src/google/protobuf/message_lite.cc
   ${protobuf_source_dir}/src/google/protobuf/parse_context.cc
+  ${protobuf_source_dir}/src/google/protobuf/port.cc
+  ${protobuf_source_dir}/src/google/protobuf/raw_ptr.cc
+  ${protobuf_source_dir}/src/google/protobuf/reflection_mode.cc
   ${protobuf_source_dir}/src/google/protobuf/reflection_ops.cc
   ${protobuf_source_dir}/src/google/protobuf/repeated_field.cc
   ${protobuf_source_dir}/src/google/protobuf/repeated_ptr_field.cc
@@ -208,11 +211,13 @@ add_library(protobuf::libprotobuf ALIAS _libprotobuf)
 
 
 set(libprotoc_files
+  ${protobuf_source_dir}/src/google/protobuf/compiler/allowlists/editions.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/code_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/command_line_interface.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/enum.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/extension.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/cord_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/map_field.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/cpp/field_generators/message_field.cc
@@ -299,6 +304,13 @@ set(libprotoc_files
   ${protobuf_source_dir}/src/google/protobuf/compiler/python/pyi_generator.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/retention.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/ruby/ruby_generator.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/accessors/accessors.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/accessors/singular_bytes.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/accessors/singular_scalar.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/context.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/generator.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/message.cc
+  ${protobuf_source_dir}/src/google/protobuf/compiler/rust/naming.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/subprocess.cc
   ${protobuf_source_dir}/src/google/protobuf/compiler/zip_writer.cc
 )
@@ -357,7 +369,7 @@ else ()
                 "-Dprotobuf_BUILD_PROTOC_BINARIES=1"
                 "-DABSL_ROOT_DIR=${abseil_source_dir}"
                 "-DABSL_ENABLE_INSTALL=0"
-                "${protobuf_source_dir}/cmake"
+                "${protobuf_source_dir}"
             WORKING_DIRECTORY "${PROTOC_BUILD_DIR}"
             COMMAND_ECHO STDOUT)
 

contrib/grpc

@@ -1 +1 @@
-Subproject commit a08fe1a34075c93bb2d606dd608b9a3953288b81
+Subproject commit 740e3dfd97301a52ad8165b65285bcc149d9e817