[manual] Sync c-core 1.58.0 (#211)

* [manual] Sync c-core 1.58.0 * update swift package dependencies
grpc · Sep 7, 2023 · e6306cd · e6306cd
1 parent b61cbf6
commit e6306cd
Show file tree

Hide file tree

Showing 40 changed files with 45 additions and 45 deletions.
diff --git a/native/BUILD b/native/BUILD
@@ -215,7 +215,7 @@ g_stands_for = "goku"  # @unused
 
 core_version = "35.0.0"  # @unused
 
-version = "1.58.0-pre1"  # @unused
+version = "1.58.0"  # @unused
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",

diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt
diff --git a/native/Makefile b/native/Makefile
diff --git a/native/REVISION.txt b/native/REVISION.txt
@@ -1 +1 @@
-e097a3220b694ae0c9d25634297b95b3a3eae69f
+0417b882aa7abc1512f534e56f9cd97c557bb68f
diff --git a/native/_metadata.py b/native/_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!!
 
-__version__ = """1.58.0rc1"""
+__version__ = """1.58.0"""
diff --git a/native/build_handwritten.yaml b/native/build_handwritten.yaml
@@ -16,7 +16,7 @@ settings:
   csharp_major_version: 2
   g_stands_for: goku
   protobuf_version: 3.23.4
-  version: 1.58.0-pre1
+  version: 1.58.0
 configs:
   asan:
     CC: clang

diff --git a/native/config.m4 b/native/config.m4
diff --git a/native/gRPC-C++.podspec b/native/gRPC-C++.podspec
diff --git a/native/gRPC-Core.podspec b/native/gRPC-Core.podspec
diff --git a/native/gRPC-ProtoRPC.podspec b/native/gRPC-ProtoRPC.podspec
diff --git a/native/gRPC-RxLibrary.podspec b/native/gRPC-RxLibrary.podspec
diff --git a/native/gRPC.podspec b/native/gRPC.podspec
diff --git a/native/include/grpcpp/version_info.h b/native/include/grpcpp/version_info.h
@@ -21,7 +21,7 @@
 #define GRPC_CPP_VERSION_MAJOR 1
 #define GRPC_CPP_VERSION_MINOR 58
 #define GRPC_CPP_VERSION_PATCH 0
-#define GRPC_CPP_VERSION_TAG "pre1"
-#define GRPC_CPP_VERSION_STRING "1.58.0-pre1"
+#define GRPC_CPP_VERSION_TAG ""
+#define GRPC_CPP_VERSION_STRING "1.58.0"
 
 #endif  // GRPCPP_VERSION_INFO_H
diff --git a/native/package.xml b/native/package.xml
diff --git a/native/src/csharp/build/dependencies.props b/native/src/csharp/build/dependencies.props
@@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
   <PropertyGroup>
-    <GrpcCsharpVersion>2.58.0-pre1</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.58.0</GrpcCsharpVersion>
     <GoogleProtobufVersion>3.23.4</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>
diff --git a/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
@@ -42,7 +42,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-gRPCCppPlugin'
-  v = '1.58.0-pre1'
+  v = '1.58.0'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
   s.description = <<-DESC

diff --git a/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@@ -42,7 +42,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-gRPCPlugin'
-  v = '1.58.0-pre1'
+  v = '1.58.0'
   s.version  = v
   s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
   s.description = <<-DESC

diff --git a/native/src/objective-c/GRPCClient/version.h b/native/src/objective-c/GRPCClient/version.h
@@ -22,4 +22,4 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.58.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.58.0"
diff --git a/native/src/objective-c/tests/version.h b/native/src/objective-c/tests/version.h
@@ -22,5 +22,5 @@
 // instead. This file can be regenerated from the template by running
 // `tools/buildgen/generate_projects.sh`.
 
-#define GRPC_OBJC_VERSION_STRING @"1.58.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.58.0"
 #define GRPC_C_VERSION_STRING @"35.0.0"
diff --git a/native/src/php/ext/grpc/version.h b/native/src/php/ext/grpc/version.h
@@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define PHP_GRPC_VERSION "1.58.0RC1"
+#define PHP_GRPC_VERSION "1.58.0"
 
 #endif /* VERSION_H */
diff --git a/native/src/python/grpcio/grpc/_grpcio_metadata.py b/native/src/python/grpcio/grpc/_grpcio_metadata.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
 
-__version__ = """1.58.0rc1"""
+__version__ = """1.58.0"""
diff --git a/native/src/python/grpcio/grpc_version.py b/native/src/python/grpcio/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_admin/grpc_version.py b/native/src/python/grpcio_admin/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_admin/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_channelz/grpc_version.py b/native/src/python/grpcio_channelz/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_channelz/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_csds/grpc_version.py b/native/src/python/grpcio_csds/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_csds/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_health_checking/grpc_version.py b/native/src/python/grpcio_health_checking/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_reflection/grpc_version.py b/native/src/python/grpcio_reflection/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_status/grpc_version.py b/native/src/python/grpcio_status/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_testing/grpc_version.py b/native/src/python/grpcio_testing/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/python/grpcio_tests/grpc_version.py b/native/src/python/grpcio_tests/grpc_version.py
@@ -14,4 +14,4 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
diff --git a/native/src/ruby/lib/grpc/version.rb b/native/src/ruby/lib/grpc/version.rb
@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.58.0.pre1'
+  VERSION = '1.58.0'
 end
diff --git a/native/src/ruby/tools/version.rb b/native/src/ruby/tools/version.rb
@@ -14,6 +14,6 @@
 
 module GRPC
   module Tools
-    VERSION = '1.58.0.pre1'
+    VERSION = '1.58.0'
   end
 end
diff --git a/native/tools/distrib/python/grpc_version.py b/native/tools/distrib/python/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
 PROTOBUF_VERSION = '3.23.4'
diff --git a/native/tools/distrib/python/grpcio_tools/grpc_version.py b/native/tools/distrib/python/grpcio_tools/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
 PROTOBUF_VERSION = '3.23.4'
diff --git a/native/tools/distrib/python/xds_protos/grpc_version.py b/native/tools/distrib/python/xds_protos/grpc_version.py
@@ -14,5 +14,5 @@
 
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
 
-VERSION = '1.58.0rc1'
+VERSION = '1.58.0'
 PROTOBUF_VERSION = '3.23.4'
diff --git a/native/tools/doxygen/Doxyfile.c++ b/native/tools/doxygen/Doxyfile.c++
diff --git a/native/tools/doxygen/Doxyfile.c++.internal b/native/tools/doxygen/Doxyfile.c++.internal
diff --git a/native/tools/doxygen/Doxyfile.objc b/native/tools/doxygen/Doxyfile.objc
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.58.0-pre1
+PROJECT_NUMBER         = 1.58.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/native/tools/doxygen/Doxyfile.objc.internal b/native/tools/doxygen/Doxyfile.objc.internal
@@ -40,7 +40,7 @@ PROJECT_NAME           = "GRPC Objective-C"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.58.0-pre1
+PROJECT_NUMBER         = 1.58.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/native/tools/doxygen/Doxyfile.php b/native/tools/doxygen/Doxyfile.php
@@ -40,7 +40,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.58.0-pre1
+PROJECT_NUMBER         = 1.58.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a