diff --git a/native/BUILD b/native/BUILD index 87130c41c9..f1b4cf68c1 100644 --- a/native/BUILD +++ b/native/BUILD @@ -215,7 +215,7 @@ g_stands_for = "gjallarhorn" # @unused core_version = "37.0.0" # @unused -version = "1.60.0-pre1" # @unused +version = "1.60.0" # @unused GPR_PUBLIC_HDRS = [ "include/grpc/support/alloc.h", diff --git a/native/CMakeLists.txt b/native/CMakeLists.txt index 2466570427..06e6453b5c 100644 --- a/native/CMakeLists.txt +++ b/native/CMakeLists.txt @@ -25,10 +25,10 @@ cmake_minimum_required(VERSION 3.8) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.60.0-pre1") +set(PACKAGE_VERSION "1.60.0") set(gRPC_CORE_VERSION "37.0.0") set(gRPC_CORE_SOVERSION "37") -set(gRPC_CPP_VERSION "1.60.0-pre1") +set(gRPC_CPP_VERSION "1.60.0") set(gRPC_CPP_SOVERSION "1.60") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") diff --git a/native/Makefile b/native/Makefile index bf74a0a0ff..6e28210460 100644 --- a/native/Makefile +++ b/native/Makefile @@ -411,7 +411,7 @@ Q = @ endif CORE_VERSION = 37.0.0 -CPP_VERSION = 1.60.0-pre1 +CPP_VERSION = 1.60.0 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/native/REVISION.txt b/native/REVISION.txt index c264c413ee..1b881300fd 100644 --- a/native/REVISION.txt +++ b/native/REVISION.txt @@ -1 +1 @@ -7f48251101b412e480163f5df551042d4213cea9 +0ef13a7555dbaadd4633399242524129eef5e231 diff --git a/native/_metadata.py b/native/_metadata.py index 9c77d53d70..dcdc2268d3 100644 --- a/native/_metadata.py +++ b/native/_metadata.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/_metadata.py.template`!!! -__version__ = """1.60.0rc1""" +__version__ = """1.60.0""" diff --git a/native/build_handwritten.yaml b/native/build_handwritten.yaml index fd7a3e2455..28b101d031 100644 --- a/native/build_handwritten.yaml +++ b/native/build_handwritten.yaml @@ -16,7 +16,7 @@ settings: csharp_major_version: 2 g_stands_for: gjallarhorn protobuf_version: 3.25.0 - version: 1.60.0-pre1 + version: 1.60.0 configs: asan: CC: clang diff --git a/native/config.m4 b/native/config.m4 index 9b9641d0c7..184cdd6ae0 100644 --- a/native/config.m4 +++ b/native/config.m4 @@ -1348,7 +1348,7 @@ if test "$PHP_GRPC" != "no"; then -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DGRPC_ARES=0 \ -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 \ -DGRPC_XDS_USER_AGENT_NAME_SUFFIX='"\"PHP\""' \ - -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.60.0RC1\""') + -DGRPC_XDS_USER_AGENT_VERSION_SUFFIX='"\"1.60.0\""') PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/backend_metrics) PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/census) diff --git a/native/gRPC-C++.podspec b/native/gRPC-C++.podspec index 068af880aa..8d7b7ea0ba 100644 --- a/native/gRPC-C++.podspec +++ b/native/gRPC-C++.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - version = '1.60.0-pre1' + version = '1.60.0' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' diff --git a/native/gRPC-Core.podspec b/native/gRPC-Core.podspec index 8fbf03019a..59217810c4 100644 --- a/native/gRPC-Core.podspec +++ b/native/gRPC-Core.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.60.0-pre1' + version = '1.60.0' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' diff --git a/native/gRPC-ProtoRPC.podspec b/native/gRPC-ProtoRPC.podspec index 7eb1979697..82724c1084 100644 --- a/native/gRPC-ProtoRPC.podspec +++ b/native/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.60.0-pre1' + version = '1.60.0' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/native/gRPC-RxLibrary.podspec b/native/gRPC-RxLibrary.podspec index e4e8b787bd..c9bd618197 100644 --- a/native/gRPC-RxLibrary.podspec +++ b/native/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.60.0-pre1' + version = '1.60.0' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/native/gRPC.podspec b/native/gRPC.podspec index 1b6ed9b871..cd36a31b34 100644 --- a/native/gRPC.podspec +++ b/native/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.60.0-pre1' + version = '1.60.0' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/native/include/grpcpp/version_info.h b/native/include/grpcpp/version_info.h index 6ecb1083b1..afc040cc13 100644 --- 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 60 #define GRPC_CPP_VERSION_PATCH 0 -#define GRPC_CPP_VERSION_TAG "pre1" -#define GRPC_CPP_VERSION_STRING "1.60.0-pre1" +#define GRPC_CPP_VERSION_TAG "" +#define GRPC_CPP_VERSION_STRING "1.60.0" #endif // GRPCPP_VERSION_INFO_H diff --git a/native/package.xml b/native/package.xml index 496b73bc6c..1098323199 100644 --- a/native/package.xml +++ b/native/package.xml @@ -13,12 +13,12 @@ 2019-09-24 - 1.60.0RC1 - 1.60.0RC1 + 1.60.0 + 1.60.0 - beta - beta + stable + stable Apache 2.0 diff --git a/native/src/csharp/build/dependencies.props b/native/src/csharp/build/dependencies.props index 118aa5d4e6..bcc831bf47 100644 --- a/native/src/csharp/build/dependencies.props +++ b/native/src/csharp/build/dependencies.props @@ -1,7 +1,7 @@ - 2.60.0-pre1 + 2.60.0 3.25.0 diff --git a/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/native/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index 78adc29357..c0b2fc229e 100644 --- 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.60.0-pre1' + v = '1.60.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 index f02b4a344e..b070480696 100644 --- 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.60.0-pre1' + v = '1.60.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 index 4767d9aa74..03f5d97987 100644 --- 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.60.0-pre1" +#define GRPC_OBJC_VERSION_STRING @"1.60.0" diff --git a/native/src/objective-c/tests/version.h b/native/src/objective-c/tests/version.h index f6cdfd6bab..0ff80fe8f0 100644 --- 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.60.0-pre1" +#define GRPC_OBJC_VERSION_STRING @"1.60.0" #define GRPC_C_VERSION_STRING @"37.0.0" diff --git a/native/src/php/ext/grpc/version.h b/native/src/php/ext/grpc/version.h index 4b2704e202..191accbb25 100644 --- 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.60.0RC1" +#define PHP_GRPC_VERSION "1.60.0" #endif /* VERSION_H */ diff --git a/native/src/python/grpcio/grpc/_grpcio_metadata.py b/native/src/python/grpcio/grpc/_grpcio_metadata.py index 37e46e2351..7cf21386c3 100644 --- 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.60.0rc1""" +__version__ = """1.60.0""" diff --git a/native/src/python/grpcio/grpc_version.py b/native/src/python/grpcio/grpc_version.py index 881e7f2c7a..0449e6b6dd 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_admin/grpc_version.py b/native/src/python/grpcio_admin/grpc_version.py index 0e546f9ce1..2a4cf135d6 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_channelz/grpc_version.py b/native/src/python/grpcio_channelz/grpc_version.py index ae099ddc2a..cffc7f8997 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_csds/grpc_version.py b/native/src/python/grpcio_csds/grpc_version.py index c1941c1dec..1b83d2bb82 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_health_checking/grpc_version.py b/native/src/python/grpcio_health_checking/grpc_version.py index c8a10e0974..1b550ed00a 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_reflection/grpc_version.py b/native/src/python/grpcio_reflection/grpc_version.py index aa4d7d6394..cea84ca176 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_status/grpc_version.py b/native/src/python/grpcio_status/grpc_version.py index 0b7915aa8c..c672d9d89a 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_testing/grpc_version.py b/native/src/python/grpcio_testing/grpc_version.py index 6facda357a..3711d6f942 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/python/grpcio_tests/grpc_version.py b/native/src/python/grpcio_tests/grpc_version.py index e425b734b0..8d324c830d 100644 --- 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.60.0rc1' +VERSION = '1.60.0' diff --git a/native/src/ruby/lib/grpc/version.rb b/native/src/ruby/lib/grpc/version.rb index 3d7be30c78..a5f161884c 100644 --- 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.60.0.pre1' + VERSION = '1.60.0' end diff --git a/native/src/ruby/nativedebug/version.rb b/native/src/ruby/nativedebug/version.rb index a9da8c90cd..bb12e364c0 100644 --- a/native/src/ruby/nativedebug/version.rb +++ b/native/src/ruby/nativedebug/version.rb @@ -14,6 +14,6 @@ module GRPC module NativeDebug - VERSION = '1.60.0.pre1' + VERSION = '1.60.0' end end diff --git a/native/src/ruby/tools/version.rb b/native/src/ruby/tools/version.rb index b3d7377690..9568cccbeb 100644 --- a/native/src/ruby/tools/version.rb +++ b/native/src/ruby/tools/version.rb @@ -14,6 +14,6 @@ module GRPC module Tools - VERSION = '1.60.0.pre1' + VERSION = '1.60.0' end end diff --git a/native/tools/distrib/python/grpc_version.py b/native/tools/distrib/python/grpc_version.py index f67258e218..4cf406430f 100644 --- 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.60.0rc1' +VERSION = '1.60.0' PROTOBUF_VERSION = '3.25.0' diff --git a/native/tools/distrib/python/grpcio_tools/grpc_version.py b/native/tools/distrib/python/grpcio_tools/grpc_version.py index 2d28cb101e..005cf24042 100644 --- 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.60.0rc1' +VERSION = '1.60.0' PROTOBUF_VERSION = '3.25.0' diff --git a/native/tools/distrib/python/xds_protos/grpc_version.py b/native/tools/distrib/python/xds_protos/grpc_version.py index 7f5ede1c2c..81943d863d 100644 --- 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.60.0rc1' +VERSION = '1.60.0' PROTOBUF_VERSION = '3.25.0' diff --git a/native/tools/doxygen/Doxyfile.c++ b/native/tools/doxygen/Doxyfile.c++ index cacab35e7f..bb05d4a2d2 100644 --- a/native/tools/doxygen/Doxyfile.c++ +++ b/native/tools/doxygen/Doxyfile.c++ @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0-pre1 +PROJECT_NUMBER = 1.60.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.c++.internal b/native/tools/doxygen/Doxyfile.c++.internal index f95a38a13b..1e6c9ca071 100644 --- a/native/tools/doxygen/Doxyfile.c++.internal +++ b/native/tools/doxygen/Doxyfile.c++.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.60.0-pre1 +PROJECT_NUMBER = 1.60.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 b/native/tools/doxygen/Doxyfile.objc index eeb5f6fa8f..b13abbf1e8 100644 --- 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.60.0-pre1 +PROJECT_NUMBER = 1.60.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 index 4c34cf3905..60f1e12fd2 100644 --- 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.60.0-pre1 +PROJECT_NUMBER = 1.60.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 index 8658434eb1..c5c1fe6780 100644 --- 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.60.0-pre1 +PROJECT_NUMBER = 1.60.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