Skip to content

Commit aebcdbd

Browse files
dgquintasdgquintas
committed
master bumped to 1.5.x
1 parent 9baf4b1 commit aebcdbd

31 files changed

+37
-37
lines changed

‎BUILD

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ load(
5151
# This should be updated along with build.yaml
5252
g_stands_for = "gregarious"
5353

54-
core_version = "3.0.0-dev"
54+
core_version = "4.0.0-dev"
5555

56-
version = "1.4.0-dev"
56+
version = "1.5.0-dev"
5757

5858
grpc_cc_library(
5959
name = "gpr",

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
cmake_minimum_required(VERSION 2.8)
4040

4141
set(PACKAGE_NAME "grpc")
42-
set(PACKAGE_VERSION "1.4.0-dev")
42+
set(PACKAGE_VERSION "1.5.0-dev")
4343
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
4444
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
4545
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,8 @@ Q = @
423423
endif
424424

425425
CORE_VERSION = 4.0.0-dev
426-
CPP_VERSION = 1.4.0-dev
427-
CSHARP_VERSION = 1.4.0-dev
426+
CPP_VERSION = 1.5.0-dev
427+
CSHARP_VERSION = 1.5.0-dev
428428

429429
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
430430
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

‎build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ settings:
1414
'#10': See the expand_version.py for all the quirks here
1515
core_version: 4.0.0-dev
1616
g_stands_for: gregarious
17-
version: 1.4.0-dev
17+
version: 1.5.0-dev
1818
filegroups:
1919
- name: census
2020
public_headers:

‎gRPC-Core.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
Pod::Spec.new do |s|
3939
s.name = 'gRPC-Core'
40-
version = '1.4.0-dev'
40+
version = '1.5.0-dev'
4141
s.version = version
4242
s.summary = 'Core cross-platform gRPC library, written in C'
4343
s.homepage = 'http://www.grpc.io'

‎gRPC-ProtoRPC.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
Pod::Spec.new do |s|
3838
s.name = 'gRPC-ProtoRPC'
39-
version = '1.4.0-dev'
39+
version = '1.5.0-dev'
4040
s.version = version
4141
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
4242
s.homepage = 'http://www.grpc.io'

‎gRPC-RxLibrary.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
Pod::Spec.new do |s|
3838
s.name = 'gRPC-RxLibrary'
39-
version = '1.4.0-dev'
39+
version = '1.5.0-dev'
4040
s.version = version
4141
s.summary = 'Reactive Extensions library for iOS/OSX.'
4242
s.homepage = 'http://www.grpc.io'

‎gRPC.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
Pod::Spec.new do |s|
3737
s.name = 'gRPC'
38-
version = '1.4.0-dev'
38+
version = '1.5.0-dev'
3939
s.version = version
4040
s.summary = 'gRPC client library for iOS/OSX'
4141
s.homepage = 'http://www.grpc.io'

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grpc",
3-
"version": "1.4.0-dev",
3+
"version": "1.5.0-dev",
44
"author": "Google Inc.",
55
"description": "gRPC Library for Node",
66
"homepage": "http://www.grpc.io/",

‎package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<date>2017-05-22</date>
1414
<time>16:06:07</time>
1515
<version>
16-
<release>1.4.0dev</release>
17-
<api>1.4.0dev</api>
16+
<release>1.5.0dev</release>
17+
<api>1.5.0dev</api>
1818
</version>
1919
<stability>
2020
<release>beta</release>

‎src/cpp/common/version_cc.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
#include <grpc++/grpc++.h>
3838

3939
namespace grpc {
40-
grpc::string Version() { return "1.4.0-dev"; }
40+
grpc::string Version() { return "1.5.0-dev"; }
4141
}

‎src/csharp/Grpc.Core/Version.csproj.include

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- This file is generated -->
22
<Project>
33
<PropertyGroup>
4-
<GrpcCsharpVersion>1.4.0-dev</GrpcCsharpVersion>
4+
<GrpcCsharpVersion>1.5.0-dev</GrpcCsharpVersion>
55
<GoogleProtobufVersion>3.3.0</GoogleProtobufVersion>
66
</PropertyGroup>
77
</Project>

‎src/csharp/Grpc.Core/VersionInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public static class VersionInfo
4848
/// <summary>
4949
/// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
5050
/// </summary>
51-
public const string CurrentAssemblyFileVersion = "1.4.0.0";
51+
public const string CurrentAssemblyFileVersion = "1.5.0.0";
5252

5353
/// <summary>
5454
/// Current version of gRPC C#
5555
/// </summary>
56-
public const string CurrentVersion = "1.4.0-dev";
56+
public const string CurrentVersion = "1.5.0-dev";
5757
}
5858
}

‎src/csharp/build_packages_dotnetcli.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929

3030
@rem Current package versions
31-
set VERSION=1.4.0-dev
31+
set VERSION=1.5.0-dev
3232

3333
@rem Adjust the location of nuget.exe
3434
set NUGET=C:\nuget\nuget.exe

‎src/csharp/build_packages_dotnetcli.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts
5454
dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts
5555
dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
5656

57-
nuget pack Grpc.nuspec -Version "1.4.0-dev" -OutputDirectory ../../artifacts
58-
nuget pack Grpc.Tools.nuspec -Version "1.4.0-dev" -OutputDirectory ../../artifacts
57+
nuget pack Grpc.nuspec -Version "1.5.0-dev" -OutputDirectory ../../artifacts
58+
nuget pack Grpc.Tools.nuspec -Version "1.5.0-dev" -OutputDirectory ../../artifacts
5959

6060
(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

‎src/node/health_check/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grpc-health-check",
3-
"version": "1.4.0-dev",
3+
"version": "1.5.0-dev",
44
"author": "Google Inc.",
55
"description": "Health check service for use with gRPC",
66
"repository": {
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"dependencies": {
18-
"grpc": "^1.4.0-dev",
18+
"grpc": "^1.5.0-dev",
1919
"lodash": "^3.9.3",
2020
"google-protobuf": "^3.0.0"
2121
},

‎src/node/tools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grpc-tools",
3-
"version": "1.4.0-dev",
3+
"version": "1.5.0-dev",
44
"author": "Google Inc.",
55
"description": "Tools for developing with gRPC on Node.js",
66
"homepage": "http://www.grpc.io/",

‎src/objective-c/!ProtoCompiler-gRPCPlugin.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Pod::Spec.new do |s|
4242
# exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
4343
# before them.
4444
s.name = '!ProtoCompiler-gRPCPlugin'
45-
v = '1.4.0-dev'
45+
v = '1.5.0-dev'
4646
s.version = v
4747
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
4848
s.description = <<-DESC

‎src/objective-c/GRPCClient/private/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
// `tools/buildgen/generate_projects.sh`.
3939

4040

41-
#define GRPC_OBJC_VERSION_STRING @"1.4.0-dev"
41+
#define GRPC_OBJC_VERSION_STRING @"1.5.0-dev"

‎src/php/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "grpc/grpc-dev",
33
"description": "gRPC library for PHP - for Developement use only",
44
"license": "BSD-3-Clause",
5-
"version": "1.4.0",
5+
"version": "1.5.0",
66
"require": {
77
"php": ">=5.5.0",
88
"google/protobuf": "^v3.3.0"

‎src/php/ext/grpc/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@
3535
#ifndef VERSION_H
3636
#define VERSION_H
3737

38-
#define PHP_GRPC_VERSION "1.4.0"
38+
#define PHP_GRPC_VERSION "1.5.0"
3939

4040
#endif /* VERSION_H */

‎src/python/grpcio/grpc/_grpcio_metadata.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
3131

32-
__version__ = """1.4.0.dev0"""
32+
__version__ = """1.5.0.dev0"""

‎src/python/grpcio/grpc_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
3131

32-
VERSION='1.4.0.dev0'
32+
VERSION='1.5.0.dev0'

‎src/python/grpcio_health_checking/grpc_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
3131

32-
VERSION='1.4.0.dev0'
32+
VERSION='1.5.0.dev0'

‎src/python/grpcio_reflection/grpc_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
3131

32-
VERSION='1.4.0.dev0'
32+
VERSION='1.5.0.dev0'

‎src/python/grpcio_tests/grpc_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
3131

32-
VERSION='1.4.0.dev0'
32+
VERSION='1.5.0.dev0'

‎src/ruby/lib/grpc/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929

3030
# GRPC contains the General RPC module.
3131
module GRPC
32-
VERSION = '1.4.0.dev'
32+
VERSION = '1.5.0.dev'
3333
end

‎src/ruby/tools/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929

3030
module GRPC
3131
module Tools
32-
VERSION = '1.4.0.dev'
32+
VERSION = '1.5.0.dev'
3333
end
3434
end

‎tools/distrib/python/grpcio_tools/grpc_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
3131

32-
VERSION='1.4.0.dev0'
32+
VERSION='1.5.0.dev0'

‎tools/doxygen/Doxyfile.c++

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
4040
# could be handy for archiving the generated documentation or if some version
4141
# control system is used.
4242
43-
PROJECT_NUMBER = 1.4.0-dev
43+
PROJECT_NUMBER = 1.5.0-dev
4444
4545
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4646
# for a project that appears at the top of each page and should give viewer a

‎tools/doxygen/Doxyfile.c++.internal

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
4040
# could be handy for archiving the generated documentation or if some version
4141
# control system is used.
4242

43-
PROJECT_NUMBER = 1.4.0-dev
43+
PROJECT_NUMBER = 1.5.0-dev
4444

4545
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4646
# for a project that appears at the top of each page and should give viewer a

0 commit comments

Comments
 (0)