Skip to content

Commit

Permalink
Merge pull request grpc#17319 from stanley-cheung/bump-to-pre3
Browse files Browse the repository at this point in the history
Bump to v1.17.0-pre3
  • Loading branch information
muxi authored Nov 28, 2018
2 parents 3337a34 + 698cf22 commit ff85fca
Show file tree
Hide file tree
Showing 33 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ config_setting(
# This should be updated along with build.yaml
g_stands_for = "gizmo"

core_version = "7.0.0-pre2"
core_version = "7.0.0-pre3"

version = "1.17.0-pre2"
version = "1.17.0-pre3"

GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h",
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
cmake_minimum_required(VERSION 2.8)

set(PACKAGE_NAME "grpc")
set(PACKAGE_VERSION "1.17.0-pre2")
set(PACKAGE_VERSION "1.17.0-pre3")
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,9 @@ E = @echo
Q = @
endif

CORE_VERSION = 7.0.0-pre2
CPP_VERSION = 1.17.0-pre2
CSHARP_VERSION = 1.17.0-pre2
CORE_VERSION = 7.0.0-pre3
CPP_VERSION = 1.17.0-pre3
CSHARP_VERSION = 1.17.0-pre3

CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
Expand Down
4 changes: 2 additions & 2 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 7.0.0-pre2
core_version: 7.0.0-pre3
g_stands_for: gizmo
version: 1.17.0-pre2
version: 1.17.0-pre3
filegroups:
- name: alts_proto
headers:
Expand Down
6 changes: 3 additions & 3 deletions gRPC-C++.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
Pod::Spec.new do |s|
s.name = 'gRPC-C++'
# TODO (mxyan): use version that match gRPC version when pod is stabilized
# version = '1.17.0-pre2'
version = '0.0.6-pre2'
# version = '1.17.0-pre3'
version = '0.0.6-pre3'
s.version = version
s.summary = 'gRPC C++ library'
s.homepage = 'https://grpc.io'
s.license = 'Apache License, Version 2.0'
s.authors = { 'The gRPC contributors' => '[email protected]' }

grpc_version = '1.17.0-pre2'
grpc_version = '1.17.0-pre3'

s.source = {
:git => 'https://github.com/grpc/grpc.git',
Expand Down
2 changes: 1 addition & 1 deletion gRPC-Core.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-Core'
version = '1.17.0-pre2'
version = '1.17.0-pre3'
s.version = version
s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://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 @@ -21,7 +21,7 @@

Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC'
version = '1.17.0-pre2'
version = '1.17.0-pre3'
s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://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 @@ -21,7 +21,7 @@

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

Pod::Spec.new do |s|
s.name = 'gRPC'
version = '1.17.0-pre2'
version = '1.17.0-pre3'
s.version = version
s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://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>2018-01-19</date>
<time>16:06:07</time>
<version>
<release>1.17.0RC2</release>
<api>1.17.0RC2</api>
<release>1.17.0RC3</release>
<api>1.17.0RC3</api>
</version>
<stability>
<release>beta</release>
Expand Down
2 changes: 1 addition & 1 deletion src/core/lib/surface/version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@

#include <grpc/grpc.h>

const char* grpc_version_string(void) { return "7.0.0-pre2"; }
const char* grpc_version_string(void) { return "7.0.0-pre3"; }

const char* grpc_g_stands_for(void) { return "gizmo"; }
2 changes: 1 addition & 1 deletion src/cpp/common/version_cc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
#include <grpcpp/grpcpp.h>

namespace grpc {
grpc::string Version() { return "1.17.0-pre2"; }
grpc::string Version() { return "1.17.0-pre3"; }
} // namespace grpc
2 changes: 1 addition & 1 deletion src/csharp/Grpc.Core/Version.csproj.include
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- This file is generated -->
<Project>
<PropertyGroup>
<GrpcCsharpVersion>1.17.0-pre2</GrpcCsharpVersion>
<GrpcCsharpVersion>1.17.0-pre3</GrpcCsharpVersion>
<GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion src/csharp/Grpc.Core/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ public static class VersionInfo
/// <summary>
/// Current version of gRPC C#
/// </summary>
public const string CurrentVersion = "1.17.0-pre2";
public const string CurrentVersion = "1.17.0-pre3";
}
}
2 changes: 1 addition & 1 deletion src/csharp/build_packages_dotnetcli.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@rem limitations under the License.

@rem Current package versions
set VERSION=1.17.0-pre2
set VERSION=1.17.0-pre3

@rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe
Expand Down
2 changes: 1 addition & 1 deletion src/csharp/build_unitypackage.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@rem limitations under the License.

@rem Current package versions
set VERSION=1.17.0-pre2
set VERSION=1.17.0-pre3

@rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe
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.17.0-pre2'
v = '1.17.0-pre3'
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 @@ -22,4 +22,4 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.

#define GRPC_OBJC_VERSION_STRING @"1.17.0-pre2"
#define GRPC_OBJC_VERSION_STRING @"1.17.0-pre3"
4 changes: 2 additions & 2 deletions src/objective-c/tests/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
// instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`.

#define GRPC_OBJC_VERSION_STRING @"1.17.0-pre2"
#define GRPC_C_VERSION_STRING @"7.0.0-pre2"
#define GRPC_OBJC_VERSION_STRING @"1.17.0-pre3"
#define GRPC_C_VERSION_STRING @"7.0.0-pre3"
2 changes: 1 addition & 1 deletion src/php/ext/grpc/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
#ifndef VERSION_H
#define VERSION_H

#define PHP_GRPC_VERSION "1.17.0RC2"
#define PHP_GRPC_VERSION "1.17.0RC3"

#endif /* VERSION_H */
2 changes: 1 addition & 1 deletion src/python/grpcio/grpc/_grpcio_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

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

__version__ = """1.17.0rc2"""
__version__ = """1.17.0rc3"""
2 changes: 1 addition & 1 deletion src/python/grpcio/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

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

VERSION = '1.17.0rc2'
VERSION = '1.17.0rc3'
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 @@ -14,4 +14,4 @@

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

VERSION = '1.17.0rc2'
VERSION = '1.17.0rc3'
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 @@ -14,4 +14,4 @@

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

VERSION = '1.17.0rc2'
VERSION = '1.17.0rc3'
2 changes: 1 addition & 1 deletion src/python/grpcio_testing/grpc_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

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

VERSION = '1.17.0rc2'
VERSION = '1.17.0rc3'
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 @@ -14,4 +14,4 @@

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

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

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

module GRPC
module Tools
VERSION = '1.17.0.pre2'
VERSION = '1.17.0.pre3'
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 @@ -14,4 +14,4 @@

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

VERSION = '1.17.0rc2'
VERSION = '1.17.0rc3'
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.17.0-pre2
PROJECT_NUMBER = 1.17.0-pre3

# 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.17.0-pre2
PROJECT_NUMBER = 1.17.0-pre3

# 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.core
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 7.0.0-pre2
PROJECT_NUMBER = 7.0.0-pre3

# 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.core.internal
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 7.0.0-pre2
PROJECT_NUMBER = 7.0.0-pre3

# 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 ff85fca

Please sign in to comment.