diff --git a/Makefile b/Makefile index c023ee96032ffc0ba44f7a8d05fcfd45834d950f..d9cc89d9d00aa478891d3b80ace737a7df944287 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,7 @@ E = @echo Q = @ endif -VERSION = 0.13.0-dev +VERSION = 0.14.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/build.yaml b/build.yaml index 292ce7d943989c9398a61466fdb19bc4b61052ed..630a49410f7ef4d5f1dec8e57d7ad8f8b6b370f4 100644 --- a/build.yaml +++ b/build.yaml @@ -7,7 +7,7 @@ settings: '#3': Use "-preN" suffixes to identify pre-release versions '#4': Per-language overrides are possible with (eg) ruby_version tag here '#5': See the expand_version.py for all the quirks here - version: 0.13.0-dev + version: 0.14.0-dev filegroups: - name: census public_headers: diff --git a/package.json b/package.json index 59e18128ee391293384c5166a0c3e2712f5cafa2..9a86f4d998d180819b84482126a119a442e1b65f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "0.12.0", + "version": "0.14.0-dev", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "http://www.grpc.io/", diff --git a/src/core/surface/version.c b/src/core/surface/version.c index b33c99ab19d19af59a5c3820595c6a802a515d81..7723f3940146b6364adf33474ce8a283dbef5dd6 100644 --- a/src/core/surface/version.c +++ b/src/core/surface/version.c @@ -36,4 +36,4 @@ #include <grpc/grpc.h> -const char *grpc_version_string(void) { return "0.13.0-dev"; } +const char *grpc_version_string(void) { return "0.14.0-dev"; } diff --git a/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs index 78295cf6d4103f6fa25437e6e5195f4a53a5ee49..ab12c120cbaf5988eb574f49ce500767779a441e 100644 --- a/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs +++ b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs @@ -84,7 +84,7 @@ namespace Grpc.Core.Tests { var coreVersion = GrpcEnvironment.GetCoreVersionString(); var parts = coreVersion.Split('.'); - Assert.AreEqual(4, parts.Length); + Assert.AreEqual(3, parts.Length); } } } diff --git a/src/csharp/Grpc.Core/Version.cs b/src/csharp/Grpc.Core/Version.cs index d02b301cac75c1ce2c3b0088129727fea132d16f..8a26bd83623f72d2267e872d3abd942ce88b8381 100644 --- a/src/csharp/Grpc.Core/Version.cs +++ b/src/csharp/Grpc.Core/Version.cs @@ -34,4 +34,4 @@ using System.Reflection; // The current version of gRPC C#. -[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentVersion + ".0")] +[assembly: AssemblyVersion(Grpc.Core.VersionInfo.CurrentAssemblyVersion)] diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 7124ec85d36a65876f194734a64eb8fde23ecd7c..4bd4f204dd5ad7b9997dea2cf2af9f081c3c3f02 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -38,9 +38,14 @@ namespace Grpc.Core /// </summary> public static class VersionInfo { + /// <summary> + /// Current version of gRPC C# assemblies + /// </summary> + public const string CurrentAssemblyVersion = "0.14.0.0"; + /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "0.13.0-dev"; + public const string CurrentVersion = "0.14.0-dev"; } } diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat index 2c4e4e514d473f817509fb4c565e52215fca45b9..b7768f782147824c42c0ac7849968bd7f75bf93a 100644 --- a/src/csharp/build_packages.bat +++ b/src/csharp/build_packages.bat @@ -1,7 +1,7 @@ @rem Builds gRPC NuGet packages @rem Current package versions -set VERSION=0.13.0-dev +set VERSION=0.14.0-dev set PROTOBUF_VERSION=3.0.0-beta2 @rem Packages that depend on prerelease packages (like Google.Protobuf) need to have prerelease suffix as well. diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index 8a40544981fd95bc4261d95f7b81f331565636a3..75b88cfd61eeeaa52dd297dcffb4823193e7cb57 100644 --- a/src/python/grpcio/grpc_version.py +++ b/src/python/grpcio/grpc_version.py @@ -29,4 +29,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! -VERSION='0.13.0.dev0' +VERSION='0.14.0.dev0' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index e701d5847898bba5f287894a24fec8ec910823c6..9cbd36a355e6a042023b2b50a5e1693a8fff0eec 100644 --- a/src/ruby/lib/grpc/version.rb +++ b/src/ruby/lib/grpc/version.rb @@ -29,5 +29,5 @@ # GRPC contains the General RPC module. module GRPC - VERSION = '0.13.0-dev' + VERSION = '0.14.0-dev' end diff --git a/templates/package.json.template b/templates/package.json.template index ed4dca50e28039c2dc4e8a7b92499ce27f9f6513..ec444976eda23d4b8b63e0e75b31d916cf95e4e0 100644 --- a/templates/package.json.template +++ b/templates/package.json.template @@ -2,7 +2,7 @@ --- | { "name": "grpc", - "version": "0.12.0", + "version": "${settings.node_version}", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "http://www.grpc.io/", diff --git a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template index 578f01f07939a4018f5404104c42398b32d37d70..59864fa058334510eb8559c7eb8fbc82dbfd4ca8 100644 --- a/templates/src/csharp/Grpc.Core/VersionInfo.cs.template +++ b/templates/src/csharp/Grpc.Core/VersionInfo.cs.template @@ -40,6 +40,11 @@ /// </summary> public static class VersionInfo { + /// <summary> + /// Current version of gRPC C# assemblies + /// </summary> + public const string CurrentAssemblyVersion = "${settings.version.major}.${settings.version.minor}.${settings.version.patch}.0"; + /// <summary> /// Current version of gRPC C# /// </summary> diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index 5bc38a9aec9e89a32f8a40724db788d143663048..5de1a15604aceb52b4104bd8776e7ebc6f50a879 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 = 0.13.0-dev +PROJECT_NUMBER = 0.14.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 ec71d2e9cddf717a0e00181e41b1200ccb50e740..bd724d8bdaf668c5ed2878ca24bdf6924f8911b2 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 = 0.13.0-dev +PROJECT_NUMBER = 0.14.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.core b/tools/doxygen/Doxyfile.core index 0f22620686cf253a5666999c5b8a86b5f469b1bf..e00fcfc99980198f01f4a4971db8bcc327516dc5 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.13.0-dev +PROJECT_NUMBER = 0.14.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.core.internal b/tools/doxygen/Doxyfile.core.internal index a3540778c1f8501f91ac4a6949df1985e062422b..c7b5be758bafdac236e5c5c81b36614e38ae2b69 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 0.13.0-dev +PROJECT_NUMBER = 0.14.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