diff --git a/CMakeLists.txt b/CMakeLists.txt index b87c77f064cc4518d71e029e21ecfd187b394071..584a35777d441752f393174e835c12c58aa79d3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,12 +24,12 @@ cmake_minimum_required(VERSION 3.5.1) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.25.0-dev") +set(PACKAGE_VERSION "1.26.0-dev") set(gRPC_CORE_VERSION "8.0.0") set(gRPC_CORE_SOVERSION "8") -set(gRPC_CPP_VERSION "1.25.0-dev") +set(gRPC_CPP_VERSION "1.26.0-dev") set(gRPC_CPP_SOVERSION "1") -set(gRPC_CSHARP_VERSION "2.25.0-dev") +set(gRPC_CSHARP_VERSION "2.26.0-dev") set(gRPC_CSHARP_SOVERSION "2") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") diff --git a/Makefile b/Makefile index 80c22383d372fb9d4a6d8da74618275d82c41cb7..59ba18b44a34c32832bdbc89e4e4a8335208abd0 100644 --- a/Makefile +++ b/Makefile @@ -461,8 +461,8 @@ Q = @ endif CORE_VERSION = 8.0.0 -CPP_VERSION = 1.25.0-dev -CSHARP_VERSION = 2.25.0-dev +CPP_VERSION = 1.26.0-dev +CSHARP_VERSION = 2.26.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index c0b4e654a2c01954cad0be0916e7ce605b9c17fa..6ca0742a6b262fb64e46c5ba05f3c1e61d877623 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - # version = '1.25.0-dev' + # version = '1.26.0-dev' version = '0.0.9-dev' s.version = version s.summary = 'gRPC C++ library' @@ -31,7 +31,7 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } - grpc_version = '1.25.0-dev' + grpc_version = '1.26.0-dev' s.source = { :git => 'https://github.com/grpc/grpc.git', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 13db6b975e6554f9f32b128fa41932462335c2c8..8f4f3b4f2c1be19abe33fc870332dca5f7c7325a 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.25.0-dev' + version = '1.26.0-dev' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index 551999bbea88aa2f13f9ccf5db1130d32d31ac85..43ab2557a0901bf118f332f188bc1f3006076831 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.25.0-dev' + version = '1.26.0-dev' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index dfa9363cd2c88a710e482aa4510bc404c4b1fd8a..d90c0de70e5000ea3349ac4426d1045b50b5600b 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.25.0-dev' + version = '1.26.0-dev' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index 38dc708ec0d045fa87421429748bfe1a421f58ee..77cbda576af27f21e17f86bc64881211f4af2d15 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.25.0-dev' + version = '1.26.0-dev' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/package.xml b/package.xml index 73b1a8e89366b95cd1dd73729d4e143154517482..30bd45170eacb77ca422b2c5bdbe2fc11fe69d87 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ <date>2019-09-24</date> <time>16:06:07</time> <version> - <release>1.25.0dev</release> - <api>1.25.0dev</api> + <release>1.26.0dev</release> + <api>1.26.0dev</api> </version> <stability> <release>beta</release> @@ -22,7 +22,7 @@ </stability> <license>Apache 2.0</license> <notes> -- gRPC Core 1.25.0 update +- gRPC Core 1.26.0 update </notes> <contents> <dir baseinstalldir="/" name="/"> diff --git a/src/core/lib/surface/version.cc b/src/core/lib/surface/version.cc index d05b6ab95634d9f679c67dca4cdc42f08ac50603..fde716acd3b40be54f54a3258405b6b9e44155f0 100644 --- a/src/core/lib/surface/version.cc +++ b/src/core/lib/surface/version.cc @@ -25,4 +25,4 @@ const char* grpc_version_string(void) { return "8.0.0"; } -const char* grpc_g_stands_for(void) { return "game"; } +const char* grpc_g_stands_for(void) { return "gon"; } diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 041956ecf5cc0b0077f30798c7f04e1dfc09d066..08c2868dac66b54ef1f0cc9338f6fd66b83120be 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -22,5 +22,5 @@ #include <grpcpp/grpcpp.h> namespace grpc { -grpc::string Version() { return "1.25.0-dev"; } +grpc::string Version() { return "1.26.0-dev"; } } // namespace grpc diff --git a/src/csharp/Grpc.Core.Api/VersionInfo.cs b/src/csharp/Grpc.Core.Api/VersionInfo.cs index 6d540155d9ace07d164b895cb0d0a8b7c45f97e8..a1330d62738f3cccfcc4443639bc4bb123bc045b 100644 --- a/src/csharp/Grpc.Core.Api/VersionInfo.cs +++ b/src/csharp/Grpc.Core.Api/VersionInfo.cs @@ -33,11 +33,11 @@ namespace Grpc.Core /// <summary> /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies /// </summary> - public const string CurrentAssemblyFileVersion = "2.25.0.0"; + public const string CurrentAssemblyFileVersion = "2.26.0.0"; /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "2.25.0-dev"; + public const string CurrentVersion = "2.26.0-dev"; } } diff --git a/src/csharp/build/dependencies.props b/src/csharp/build/dependencies.props index df109183253d6a1c0864fd56c5c3b21961d08988..20037a8982f7d2aff4e3ecd1d5aa414d2471beef 100644 --- a/src/csharp/build/dependencies.props +++ b/src/csharp/build/dependencies.props @@ -1,7 +1,7 @@ <!-- This file is generated --> <Project> <PropertyGroup> - <GrpcCsharpVersion>2.25.0-dev</GrpcCsharpVersion> + <GrpcCsharpVersion>2.26.0-dev</GrpcCsharpVersion> <GoogleProtobufVersion>3.8.0</GoogleProtobufVersion> </PropertyGroup> </Project> diff --git a/src/csharp/build_unitypackage.bat b/src/csharp/build_unitypackage.bat index 4e689754acab1328e255338410de4e35b885f492..a11571907844caf6e1fa55fba8f78a694d324bf5 100644 --- a/src/csharp/build_unitypackage.bat +++ b/src/csharp/build_unitypackage.bat @@ -13,7 +13,7 @@ @rem limitations under the License. @rem Current package versions -set VERSION=2.25.0-dev +set VERSION=2.26.0-dev @rem Adjust the location of nuget.exe set NUGET=C:\nuget\nuget.exe diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index 9103c785f8549f6ee9c32256ad9897a35712628e..34841f5cdf480dd1723545d9cd99341e38edb03e 100644 --- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec +++ b/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.25.0-dev' + v = '1.26.0-dev' s.version = v s.summary = 'The gRPC ProtoC plugin generates C++ files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 57230e6329c52a857fb418fa5405bea95b45cc85..293566f0c17ba15c275b34b42a1a32a6d65d8a56 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/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.25.0-dev' + v = '1.26.0-dev' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/GRPCClient/version.h b/src/objective-c/GRPCClient/version.h index 01ba728003deb801a2fa7efb95530b5a9e26f677..e123f1ca1671c4865f79f2ca3a594cf668c8e75a 100644 --- a/src/objective-c/GRPCClient/version.h +++ b/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.25.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.26.0-dev" diff --git a/src/objective-c/tests/version.h b/src/objective-c/tests/version.h index 54d05af82266312d3efdb68e5c883f1b94be91bf..2e7f5f5216c1674660fc55dce2f448adcf666757 100644 --- a/src/objective-c/tests/version.h +++ b/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.25.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.26.0-dev" #define GRPC_C_VERSION_STRING @"8.0.0" diff --git a/src/php/composer.json b/src/php/composer.json index 769f2285ed593130a6b37518f2c3c39f5ef62181..14f893fcb7708c45cb397e23fdb08217f62480aa 100644 --- a/src/php/composer.json +++ b/src/php/composer.json @@ -2,7 +2,7 @@ "name": "grpc/grpc-dev", "description": "gRPC library for PHP - for Development use only", "license": "Apache-2.0", - "version": "1.25.0", + "version": "1.26.0", "require": { "php": ">=5.5.0", "google/protobuf": "^v3.3.0" diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h index 8286312199026d12cb8250ec0b1086b61177dd27..2d7e9d45bc14926eea124a1071b166d3eef36d39 100644 --- a/src/php/ext/grpc/version.h +++ b/src/php/ext/grpc/version.h @@ -20,6 +20,6 @@ #ifndef VERSION_H #define VERSION_H -#define PHP_GRPC_VERSION "1.25.0dev" +#define PHP_GRPC_VERSION "1.26.0dev" #endif /* VERSION_H */ diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index cf9055adb498fc070a4c848906b08a4047de17a8..c07e0a58ac61e64472aaabd8381f7c643ad9b37f 100644 --- a/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/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.25.0.dev0""" +__version__ = """1.26.0.dev0""" diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index 3902f3fecacc736b52dbebd8787a9635faeb6f16..57b79d48dfaaefd755be0777d06654ca16eb757b 100644 --- a/src/python/grpcio/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/python/grpcio_channelz/grpc_version.py b/src/python/grpcio_channelz/grpc_version.py index 61a651d45d3489be4eaa4d104651a05030c60ecb..be1e97aee6c1c3f5f05da59ad1474438ffa51c0f 100644 --- a/src/python/grpcio_channelz/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index 7e9703c3c93d9587f8359160fec8a1e5fdfea477..4f01713d4df10679a853ecbdcb279f079a8ddbb2 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 0c82a4c77680d126e4bae63259c3647253ff327c..5713bdba97082fa25503d435d0c133169b97b765 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/python/grpcio_status/grpc_version.py b/src/python/grpcio_status/grpc_version.py index 307d9ba7245d739728091cc824abd034b3ad971c..044f43ea3385b6178edc553250917cf5996770d8 100644 --- a/src/python/grpcio_status/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/python/grpcio_testing/grpc_version.py b/src/python/grpcio_testing/grpc_version.py index b6a2dc2ba2142e6ad578c7fbe88df1cc1670917c..845c7fdf0cbbc6f91055b20d39c8c15b0a24a986 100644 --- a/src/python/grpcio_testing/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 4656e5af94a0740aa22766aea0ae31e087658aca..6afc11370c97068e3d9b5516491141e61647bf10 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/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.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index 40744531d72c37817312c492c09c75c7d8e9f1b6..8124cc98b8702148f4f678e7fa0e65594972b3dd 100644 --- a/src/ruby/lib/grpc/version.rb +++ b/src/ruby/lib/grpc/version.rb @@ -14,5 +14,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '1.25.0.dev' + VERSION = '1.26.0.dev' end diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb index 4d67f9c6302f7ae8022672b61670eea333d9e8eb..14bdcd3a3e43407b8942594a965bb401af999ced 100644 --- a/src/ruby/tools/version.rb +++ b/src/ruby/tools/version.rb @@ -14,6 +14,6 @@ module GRPC module Tools - VERSION = '1.25.0.dev' + VERSION = '1.26.0.dev' end end diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 716add95195fb16661138b1c73ce1fc96389a3dc..9bd0306dc68bbf82c833e10ed8a746fc80660bbe 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -14,4 +14,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.25.0.dev0' +VERSION = '1.26.0.dev0' diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 344a705137e9bfbec863317bd51601ccf1a6c842..d4ce01ea62907ab4dbabc9c3026c666809b32539 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/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.25.0-dev +PROJECT_NUMBER = 1.26.0-dev # 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/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 71cdff42584e3923a68aeba6cede6276cd0acbcc..542258159bd7915a3d9cfa768d5b6807c532fa37 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/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.25.0-dev +PROJECT_NUMBER = 1.26.0-dev # 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