diff --git a/BUILD b/BUILD index 2070ce3311d7e3b36f84ea328ece5ed70371450a..9b36e3bd17ef9e990c1a00b9d6799911cff74587 100644 --- a/BUILD +++ b/BUILD @@ -51,9 +51,9 @@ load( # This should be updated along with build.yaml g_stands_for = "gregarious" -core_version = "4.0.0-pre1" +core_version = "4.0.0" -version = "1.4.0-pre1" +version = "1.4.0" grpc_cc_library( name = "gpr", diff --git a/CMakeLists.txt b/CMakeLists.txt index acae19ef39f19ad1a1eff4dfe9e07a4f71a0205f..4b43c5482dd60d42bfee44ad6959201d520d9610 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ cmake_minimum_required(VERSION 2.8) set(PACKAGE_NAME "grpc") -set(PACKAGE_VERSION "1.4.0-pre1") +set(PACKAGE_VERSION "1.4.0") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") diff --git a/Makefile b/Makefile index c87fd191445fec600f013ab300c6453505fbec49..e3ba47cd03664705e5a7d40c9cf172d7f0dd3212 100644 --- a/Makefile +++ b/Makefile @@ -422,9 +422,9 @@ E = @echo Q = @ endif -CORE_VERSION = 4.0.0-pre1 -CPP_VERSION = 1.4.0-pre1 -CSHARP_VERSION = 1.4.0-pre1 +CORE_VERSION = 4.0.0 +CPP_VERSION = 1.4.0 +CSHARP_VERSION = 1.4.0 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) diff --git a/build.yaml b/build.yaml index fd43d64b1a964bb9ae35d4d57f312ed47bd35d9e..627ff5cce28119c5368270d1fe4c96eed8c98e54 100644 --- a/build.yaml +++ b/build.yaml @@ -12,9 +12,9 @@ settings: '#08': Use "-preN" suffixes to identify pre-release versions '#09': Per-language overrides are possible with (eg) ruby_version tag here '#10': See the expand_version.py for all the quirks here - core_version: 4.0.0-pre1 + core_version: 4.0.0 g_stands_for: gregarious - version: 1.4.0-pre1 + version: 1.4.0 filegroups: - name: census public_headers: diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 44e8931fbcadcd260df8166700379d1f275c7b7e..3b1fd4b534cbd59f8a22cd307cf16d73f5491634 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -37,7 +37,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.4.0-pre1' + version = '1.4.0' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'http://www.grpc.io' diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index 88a64b8d11b8d900078ee9ea1522a9a79b4f8d40..596579e693eef7d5ea9334c1d9807fff4900f3a4 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.4.0-pre1' + version = '1.4.0' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'http://www.grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index cc6ab6c5cf84b64ac315df8e3968cd09e5dd14dd..0cb7128f59825d130b24af90ed3aaf99af64a92f 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -36,7 +36,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.4.0-pre1' + version = '1.4.0' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'http://www.grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index cf63bfeac75d3fce77e2b9b18838f56d07dc7b6c..cf261a102b99fdc30a1337ada1aa681a14690285 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -35,7 +35,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.4.0-pre1' + version = '1.4.0' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'http://www.grpc.io' diff --git a/package.json b/package.json index c78040e9fd4328bacd03f74d565ccc0cf8c09752..4b1b7d7d6acd8d7a05514d00e6706c5d85f5350a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.4.0-pre1", + "version": "1.4.0", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "http://www.grpc.io/", diff --git a/package.xml b/package.xml index 5d6c089f04f2343a6081421b5d0869de27dc7f79..ea1b3001eb1812e4e2a0b52bc5f3eba22d9d4524 100644 --- a/package.xml +++ b/package.xml @@ -13,8 +13,8 @@ <date>2017-05-22</date> <time>16:06:07</time> <version> - <release>1.4.0RC1</release> - <api>1.4.0RC1</api> + <release>1.4.0</release> + <api>1.4.0</api> </version> <stability> <release>beta</release> diff --git a/src/core/lib/surface/version.c b/src/core/lib/surface/version.c index 39dfebb94851778a0312187b9c7647eca8c08635..59c1fd7fe995222457c1b4f2a836eef215d07ec6 100644 --- a/src/core/lib/surface/version.c +++ b/src/core/lib/surface/version.c @@ -36,6 +36,6 @@ #include <grpc/grpc.h> -const char *grpc_version_string(void) { return "4.0.0-pre1"; } +const char *grpc_version_string(void) { return "4.0.0"; } const char *grpc_g_stands_for(void) { return "gregarious"; } diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc index 8359016c0222ce5be0d4769e3ad3c5f685ef100f..4691696a23c8c0cfffcd79699fcc476d1750093d 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-pre1"; } +grpc::string Version() { return "1.4.0"; } } diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 8a15980f0aa2f03d6bc487a4543fa93b2a9f9e02..09fef990c4ba4f292ac523f5786eea6ac150ac1f 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-pre1</GrpcCsharpVersion> + <GrpcCsharpVersion>1.4.0</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 feac0736c37d7948558d0ce14363b65e015bbbbf..541323fb3d02ceeceb40f41756970915ef14f7b0 100644 --- a/src/csharp/Grpc.Core/VersionInfo.cs +++ b/src/csharp/Grpc.Core/VersionInfo.cs @@ -53,6 +53,6 @@ namespace Grpc.Core /// <summary> /// Current version of gRPC C# /// </summary> - public const string CurrentVersion = "1.4.0-pre1"; + public const string CurrentVersion = "1.4.0"; } } diff --git a/src/csharp/build_packages_dotnetcli.bat b/src/csharp/build_packages_dotnetcli.bat index cb4ff60d5548a79d80d11f324d5620a847e69f17..4fcf209c078bdd37fa99c98a769369bea93353a5 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-pre1 +set VERSION=1.4.0 @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 f3dc843567787eaca85347599dd0906cbdd577a1..9f4bf2fa91f97955fbf9e3875902ba8f00865c62 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-pre1" -OutputDirectory ../../artifacts -nuget pack Grpc.Tools.nuspec -Version "1.4.0-pre1" -OutputDirectory ../../artifacts +nuget pack Grpc.nuspec -Version "1.4.0" -OutputDirectory ../../artifacts +nuget pack Grpc.Tools.nuspec -Version "1.4.0" -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 238547c1771800439a16ff1ef4057813a5121b57..f619e3f3e11bb1f54c74c80279c9b0466df7c5c5 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-pre1", + "version": "1.4.0", "author": "Google Inc.", "description": "Health check service for use with gRPC", "repository": { @@ -15,7 +15,7 @@ } ], "dependencies": { - "grpc": "^1.4.0-pre1", + "grpc": "^1.4.0", "lodash": "^3.9.3", "google-protobuf": "^3.0.0" }, diff --git a/src/node/tools/package.json b/src/node/tools/package.json index f4f72a4de5e584ad59faa9c9e61d6e244abf9bcf..777be92f2d116b826c0ef3bb3415cd1d0cdcd1cf 100644 --- a/src/node/tools/package.json +++ b/src/node/tools/package.json @@ -1,6 +1,6 @@ { "name": "grpc-tools", - "version": "1.4.0-pre1", + "version": "1.4.0", "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 09f3303654e2f1575e0f8f9c7b99b0b26c10a551..180b2e9cdef2ba123bc8dd5ab1e626eb9363f69d 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-pre1' + v = '1.4.0' 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 25a232a72227d58183b47b1af8e20d7c5f763e64..7b8da4db6644798f74913b970c876ecaa8f1560b 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-pre1" +#define GRPC_OBJC_VERSION_STRING @"1.4.0" diff --git a/src/php/ext/grpc/version.h b/src/php/ext/grpc/version.h index 0d5d36d9cf431b69caa54ed43d344ad38d872fe7..993ef2de27419e09539d2007f39766b6890ce7aa 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.0RC1" +#define PHP_GRPC_VERSION "1.4.0" #endif /* VERSION_H */ diff --git a/src/python/grpcio/grpc/_grpcio_metadata.py b/src/python/grpcio/grpc/_grpcio_metadata.py index fcfd19763228d79b90f2d94fd5f67b5f35333099..4ef40343142d6b7cae48164ada1856982687b517 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.0rc1""" +__version__ = """1.4.0""" diff --git a/src/python/grpcio/grpc_version.py b/src/python/grpcio/grpc_version.py index 31b85e5aee78be5de82e6c7b105732a96b292e4b..044a9cd9f6ca03ef44398ebe597ce86f405d6b4f 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.0rc1' +VERSION='1.4.0' diff --git a/src/python/grpcio_health_checking/grpc_version.py b/src/python/grpcio_health_checking/grpc_version.py index 53d798f603d84d06eb70cd42f705017f7cb6d61b..15636c7bc0f9aeaf4fcedff725e6ae80ff5c060c 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.0rc1' +VERSION='1.4.0' diff --git a/src/python/grpcio_reflection/grpc_version.py b/src/python/grpcio_reflection/grpc_version.py index 25ee2808c6acb6f6230ef37035c8c55c563baf81..7e699db4f61ba13696656e355700472ffa192c01 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.0rc1' +VERSION='1.4.0' diff --git a/src/python/grpcio_tests/grpc_version.py b/src/python/grpcio_tests/grpc_version.py index ea9d30704a618d159426d0a30d4088bec0dfeb01..00b31bcdb9837706bc0e43ef846f5408923a431a 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.0rc1' +VERSION='1.4.0' diff --git a/src/ruby/lib/grpc/version.rb b/src/ruby/lib/grpc/version.rb index 103e5cbbcdad02b63cfc75b13204ac8c71ffc213..7801316561de736f0359317940c7c1cf94ccc3d0 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.pre1' + VERSION = '1.4.0' end diff --git a/src/ruby/tools/version.rb b/src/ruby/tools/version.rb index 9ce13f3f8273ff3fcc5da6c6f9f99f48ed75a4eb..74c2fd38a45199005193283a2140d962d74af85a 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.pre1' + VERSION = '1.4.0' end end diff --git a/tools/distrib/python/grpcio_tools/grpc_version.py b/tools/distrib/python/grpcio_tools/grpc_version.py index 09738ea9f3050b6d028123afa4360733ecc07d61..1bfc4b79d18c60d8aa928bc5d99c2bb660d058d9 100644 --- a/tools/distrib/python/grpcio_tools/grpc_version.py +++ b/tools/distrib/python/grpcio_tools/grpc_version.py @@ -29,4 +29,4 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION='1.4.0rc1' +VERSION='1.4.0' diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index d3eb740e296f4c89f4572ea67f29fb04dbc0511c..0d4a85cfc3d71e3514c1a991cb78d09e13e7a7ad 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.4.0-pre1 +PROJECT_NUMBER = 1.4.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/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index c87e52df82b76a54f103d0208ef0d5a18a63d5e5..82f1667a7ff749d1df5d17a0e2c621ae628199e3 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.4.0-pre1 +PROJECT_NUMBER = 1.4.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/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 1a8902a4ae039c4e0c396dee03481c889283ed38..6c79093142d9f8b48db506b0cf5521f6c951d0b5 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 = 4.0.0-pre1 +PROJECT_NUMBER = 4.0.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/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 49ebc2a9b7e578093474c271aea84b9e3e14f959..9ec3078bbd04287ce8bf068be93b89d673a0cb52 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 = 4.0.0-pre1 +PROJECT_NUMBER = 4.0.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