Skip to content

Commit

Permalink
Bump 1.2.x version to pre-2
Browse files Browse the repository at this point in the history
  • Loading branch information
kpayson64 committed Mar 16, 2017
1 parent 8d69254 commit 12ca7d3
Show file tree
Hide file tree
Showing 31 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
cmake_minimum_required(VERSION 2.8)

set(PACKAGE_NAME "grpc")
set(PACKAGE_VERSION "1.2.0-pre1")
set(PACKAGE_VERSION "1.2.0-pre2")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ Q = @
endif

CORE_VERSION = 3.0.0-dev
CPP_VERSION = 1.2.0-pre1
CSHARP_VERSION = 1.2.0-pre1
CPP_VERSION = 1.2.0-pre2
CSHARP_VERSION = 1.2.0-pre2

CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
Expand Down
2 changes: 1 addition & 1 deletion build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ settings:
'#10': See the expand_version.py for all the quirks here
core_version: 3.0.0-dev
g_stands_for: green
version: 1.2.0-pre1
version: 1.2.0-pre2
filegroups:
- name: census
public_headers:
Expand Down
2 changes: 1 addition & 1 deletion gRPC-Core.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-Core'
version = '1.2.0-pre1'
version = '1.2.0-pre2'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'http://www.grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-ProtoRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
version = '1.2.0-pre1'
version = '1.2.0-pre2'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'http://www.grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-RxLibrary.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary'
version = '1.2.0-pre1'
version = '1.2.0-pre2'
s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'http://www.grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion gRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC'
version = '1.2.0-pre1'
version = '1.2.0-pre2'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grpc",
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"author": "Google Inc.",
"description": "gRPC Library for Node",
"homepage": "http://www.grpc.io/",
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<date>2017-03-01</date>
<time>16:06:07</time>
<version>
<release>1.2.0RC1</release>
<api>1.2.0RC1</api>
<release>1.2.0RC2</release>
<api>1.2.0RC2</api>
</version>
<stability>
<release>beta</release>
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/common/version_cc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@
#include <grpc++/grpc++.h>

namespace grpc {
grpc::string Version() { return "1.2.0-pre1"; }
grpc::string Version() { return "1.2.0-pre2"; }
}
4 changes: 2 additions & 2 deletions src/csharp/Grpc.Auth/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"title": "gRPC C# Auth",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",
Expand All @@ -21,7 +21,7 @@
}
},
"dependencies": {
"Grpc.Core": "1.2.0-pre1",
"Grpc.Core": "1.2.0-pre2",
"Google.Apis.Auth": "1.21.0"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/Grpc.Core.Testing/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"title": "gRPC C# Core Testing",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2017, Google Inc.",
Expand All @@ -21,7 +21,7 @@
}
},
"dependencies": {
"Grpc.Core": "1.2.0-pre1"
"Grpc.Core": "1.2.0-pre2"
},
"frameworks": {
"net45": {
Expand Down
2 changes: 1 addition & 1 deletion src/csharp/Grpc.Core/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ public static class VersionInfo
/// <summary>
/// Current version of gRPC C#
/// </summary>
public const string CurrentVersion = "1.2.0-pre1";
public const string CurrentVersion = "1.2.0-pre2";
}
}
2 changes: 1 addition & 1 deletion src/csharp/Grpc.Core/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"title": "gRPC C# Core",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/Grpc.HealthCheck/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"title": "gRPC C# Healthchecking",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2015, Google Inc.",
Expand All @@ -21,7 +21,7 @@
}
},
"dependencies": {
"Grpc.Core": "1.2.0-pre1",
"Grpc.Core": "1.2.0-pre2",
"Google.Protobuf": "3.2.0"
},
"frameworks": {
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/Grpc.Reflection/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"title": "gRPC C# Reflection",
"authors": [ "Google Inc." ],
"copyright": "Copyright 2016, Google Inc.",
Expand All @@ -21,7 +21,7 @@
}
},
"dependencies": {
"Grpc.Core": "1.2.0-pre1",
"Grpc.Core": "1.2.0-pre2",
"Google.Protobuf": "3.2.0"
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion src/csharp/build_packages_dotnetcli.bat
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@rem Current package versions
set VERSION=1.2.0-pre1
set VERSION=1.2.0-pre2
set PROTOBUF_VERSION=3.0.0

@rem Adjust the location of nuget.exe
Expand Down
4 changes: 2 additions & 2 deletions src/csharp/build_packages_dotnetcli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dotnet pack --configuration Release Grpc.Auth/project.json --output ../../artifa
dotnet pack --configuration Release Grpc.HealthCheck/project.json --output ../../artifacts
dotnet pack --configuration Release Grpc.Reflection/project.json --output ../../artifacts

nuget pack Grpc.nuspec -Version "1.2.0-pre1" -OutputDirectory ../../artifacts
nuget pack Grpc.Tools.nuspec -Version "1.2.0-pre1" -OutputDirectory ../../artifacts
nuget pack Grpc.nuspec -Version "1.2.0-pre2" -OutputDirectory ../../artifacts
nuget pack Grpc.Tools.nuspec -Version "1.2.0-pre2" -OutputDirectory ../../artifacts

(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)
4 changes: 2 additions & 2 deletions src/node/health_check/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grpc-health-check",
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"author": "Google Inc.",
"description": "Health check service for use with gRPC",
"repository": {
Expand All @@ -15,7 +15,7 @@
}
],
"dependencies": {
"grpc": "^1.2.0-pre1",
"grpc": "^1.2.0-pre2",
"lodash": "^3.9.3",
"google-protobuf": "^3.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/node/tools/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grpc-tools",
"version": "1.2.0-pre1",
"version": "1.2.0-pre2",
"author": "Google Inc.",
"description": "Tools for developing with gRPC on Node.js",
"homepage": "http://www.grpc.io/",
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0-pre1'
v = '1.2.0-pre2'
s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/GRPCClient/private/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
// `tools/buildgen/generate_projects.sh`.


#define GRPC_OBJC_VERSION_STRING @"1.2.0-pre1"
#define GRPC_OBJC_VERSION_STRING @"1.2.0-pre2"
2 changes: 1 addition & 1 deletion src/python/grpcio/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

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

VERSION='1.2.0rc1'
VERSION='1.2.0rc2'
2 changes: 1 addition & 1 deletion src/python/grpcio_health_checking/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

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

VERSION='1.2.0rc1'
VERSION='1.2.0rc2'
2 changes: 1 addition & 1 deletion src/python/grpcio_reflection/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

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

VERSION='1.2.0rc1'
VERSION='1.2.0rc2'
2 changes: 1 addition & 1 deletion src/python/grpcio_tests/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

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

VERSION='1.2.0rc1'
VERSION='1.2.0rc2'
2 changes: 1 addition & 1 deletion src/ruby/lib/grpc/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@

# GRPC contains the General RPC module.
module GRPC
VERSION = '1.2.0.pre1'
VERSION = '1.2.0.pre2'
end
2 changes: 1 addition & 1 deletion src/ruby/tools/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@

module GRPC
module Tools
VERSION = '1.2.0.pre1'
VERSION = '1.2.0.pre2'
end
end
2 changes: 1 addition & 1 deletion tools/distrib/python/grpcio_tools/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

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

VERSION='1.2.0rc1'
VERSION='1.2.0rc2'
2 changes: 1 addition & 1 deletion tools/doxygen/Doxyfile.c++
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0-pre1
PROJECT_NUMBER = 1.2.0-pre2
# 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
Expand Down
2 changes: 1 addition & 1 deletion tools/doxygen/Doxyfile.c++.internal
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0-pre1
PROJECT_NUMBER = 1.2.0-pre2

# 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
Expand Down

0 comments on commit 12ca7d3

Please sign in to comment.