diff options
author | Michael Lumish <mlumish@google.com> | 2017-06-27 12:46:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-27 12:46:01 -0700 |
commit | 844d5940035b6d96022076f89d6602faab464390 (patch) | |
tree | 3cf549c31c99f774e0c6101d1fdcc66f99d194e1 /src | |
parent | 52e68e938339ac20869a01fcc8fbbda87ca49c52 (diff) | |
parent | ab14a0b4c839a3960d9ca3a8c1e044a28a696f82 (diff) |
Merge pull request #11620 from murgatroid99/version_bump_1.4.1
Bump version to 1.4.1
Diffstat (limited to 'src')
-rw-r--r-- | src/cpp/common/version_cc.cc | 2 | ||||
-rwxr-xr-x | src/csharp/Grpc.Core/Version.csproj.include | 2 | ||||
-rw-r--r-- | src/csharp/Grpc.Core/VersionInfo.cs | 4 | ||||
-rwxr-xr-x | src/csharp/build_packages_dotnetcli.bat | 2 | ||||
-rwxr-xr-x | src/csharp/build_packages_dotnetcli.sh | 4 | ||||
-rw-r--r-- | src/node/health_check/package.json | 4 | ||||
-rw-r--r-- | src/node/tools/package.json | 2 | ||||
-rw-r--r-- | src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 | ||||
-rw-r--r-- | src/objective-c/GRPCClient/private/version.h | 2 | ||||
-rw-r--r-- | src/php/composer.json | 2 | ||||
-rw-r--r-- | src/php/ext/grpc/version.h | 2 | ||||
-rw-r--r-- | src/python/grpcio/grpc/_grpcio_metadata.py | 2 | ||||
-rw-r--r-- | src/python/grpcio/grpc_version.py | 2 | ||||
-rw-r--r-- | src/python/grpcio_health_checking/grpc_version.py | 2 | ||||
-rw-r--r-- | src/python/grpcio_reflection/grpc_version.py | 2 | ||||
-rw-r--r-- | src/python/grpcio_tests/grpc_version.py | 2 | ||||
-rw-r--r-- | src/ruby/lib/grpc/version.rb | 2 | ||||
-rw-r--r-- | src/ruby/tools/version.rb | 2 |
18 files changed, 21 insertions, 21 deletions
diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 4691696a23..75763fa6a2 100644 --- a/src/cpp/common/version_cc.cc +++ b/src/cpp/common/version_cc.cc @@ -37,5 +37,5 @@ #include <grpc++/grpc++.h> namespace grpc { -grpc::string Version() { return "1.4.0"; } +grpc::string Version() { return "1.4.1"; } } diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 09fef990c4..4b4f7f18d0 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -1,7 +1,7 @@ <!-- This file is generated --> <Project> <PropertyGroup> - <GrpcCsharpVersion>1.4.0</GrpcCsharpVersion> + <GrpcCsharpVersion>1.4.1</GrpcCsharpVersion> <GoogleProtobufVersion>3.3.0</GoogleProtobufVersion> </PropertyGroup> </Project> diff --git a/src/csharp/Grpc.Core/VersionInfo.cs b/src/csharp/Grpc.Core/VersionInfo.cs index 541323fb3d..e8f2f2a68d 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -48,11 +48,11 @@ namespace Grpc.Core /// <summary> /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies /// </summary> - public const string CurrentAssemblyFileVersion = "1.4.0.0"; + public const string CurrentAssemblyFileVersion = "1.4.1.0"; /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "1.4.0"; + public const string CurrentVersion = "1.4.1"; } } diff --git a/src/csharp/build_packages_dotnetcli.bat b/src/csharp/build_packages_dotnetcli.bat index 4fcf209c07..46a0d4320a 100755 --- a/src/csharp/build_packages_dotnetcli.bat +++ b/src/csharp/build_packages_dotnetcli.bat @@ -28,7 +28,7 @@ @rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @rem Current package versions -set VERSION=1.4.0 +set VERSION=1.4.1 @rem Adjust the location of nuget.exe set NUGET=C:\nuget\nuget.exe diff --git a/src/csharp/build_packages_dotnetcli.sh b/src/csharp/build_packages_dotnetcli.sh index 9f4bf2fa91..7ffd178dce 100755 --- a/src/csharp/build_packages_dotnetcli.sh +++ b/src/csharp/build_packages_dotnetcli.sh @@ -54,7 +54,7 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts -nuget pack Grpc.nuspec -Version "1.4.0" -OutputDirectory ../../artifacts -nuget pack Grpc.Tools.nuspec -Version "1.4.0" -OutputDirectory ../../artifacts +nuget pack Grpc.nuspec -Version "1.4.1" -OutputDirectory ../../artifacts +nuget pack Grpc.Tools.nuspec -Version "1.4.1" -OutputDirectory ../../artifacts (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) diff --git a/src/node/health_check/package.json b/src/node/health_check/package.json index f619e3f3e1..3cdcb41c11 100644 --- a/src/node/health_check/package.json +++ b/src/node/health_check/package.json @@ -1,6 +1,6 @@ { "name": "grpc-health-check", - "version": "1.4.0", + "version": "1.4.1", "author": "Google Inc.", "description": "Health check service for use with gRPC", "repository": { @@ -15,7 +15,7 @@ } ], "dependencies": { - "grpc": "^1.4.0", + "grpc": "^1.4.1", "lodash": "^3.9.3", "google-protobuf": "^3.0.0" }, diff --git a/src/node/tools/package.json b/src/node/tools/package.json index 777be92f2d..03cd90f950 100644 --- a/src/node/tools/package.json +++ b/src/node/tools/package.json @@ -1,6 +1,6 @@ { "name": "grpc-tools", - "version": "1.4.0", + "version": "1.4.1", "author": "Google Inc.", "description": "Tools for developing with gRPC on Node.js", "homepage": "http://www.grpc.io/", diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 180b2e9cde..5ad1eeb82f 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.4.0' + v = '1.4.1' 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/private/version.h b/src/objective-c/GRPCClient/private/version.h index 7b8da4db66..09130fd085 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -38,4 +38,4 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.4.0" +#define GRPC_OBJC_VERSION_STRING @"1.4.1" diff --git a/src/php/composer.json b/src/php/composer.json index a4fba7e4f6..56561b7b48 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 Developement use only", "license": "BSD-3-Clause", - "version": "1.4.0", + "version": "1.4.1", "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 993ef2de27..eab6ffa34c 100644 --- a/src/php/ext/grpc/version.h +++ b/src/php/ext/grpc/version.h @@ -35,6 +35,6 @@ #ifndef VERSION_H #define VERSION_H -#define PHP_GRPC_VERSION "1.4.0" +#define PHP_GRPC_VERSION "1.4.1" #endif /* VERSION_H */ diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index 4ef4034314..40a3009267 100644 --- a/src/python/grpcio/grpc/_grpcio_metadata.py +++ b/src/python/grpcio/grpc/_grpcio_metadata.py @@ -29,4 +29,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! -__version__ = """1.4.0""" +__version__ = """1.4.1""" diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index 044a9cd9f6..78f7e6ce31 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='1.4.0' +VERSION='1.4.1' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index 15636c7bc0..b323b5c93c 100644 --- a/src/python/grpcio_health_checking/grpc_version.py +++ b/src/python/grpcio_health_checking/grpc_version.py @@ -29,4 +29,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! -VERSION='1.4.0' +VERSION='1.4.1' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 7e699db4f6..cc54e60196 100644 --- a/src/python/grpcio_reflection/grpc_version.py +++ b/src/python/grpcio_reflection/grpc_version.py @@ -29,4 +29,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! -VERSION='1.4.0' +VERSION='1.4.1' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index 00b31bcdb9..f26860ae83 100644 --- a/src/python/grpcio_tests/grpc_version.py +++ b/src/python/grpcio_tests/grpc_version.py @@ -29,4 +29,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! -VERSION='1.4.0' +VERSION='1.4.1' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index 7801316561..164ca177a5 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 = '1.4.0' + VERSION = '1.4.1' end diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb index 74c2fd38a4..9d70c0c23a 100644 --- a/src/ruby/tools/version.rb +++ b/src/ruby/tools/version.rb @@ -29,6 +29,6 @@ module GRPC module Tools - VERSION = '1.4.0' + VERSION = '1.4.1' end end |