Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16188 from srini100/v1.14.x

Browse Source 
Bump version to v1.14.0-pre2
pull/16189/head v1.14.0-pre2
Srini Polavarapu 7 years ago committed by GitHub
parent dd5caf0107 deeb781374
commit d2867e4a24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      BUILD
  2. 2
      CMakeLists.txt
  3. 6
      Makefile
  4. 4
      build.yaml
  5. 4
      gRPC-C++.podspec
  6. 2
      gRPC-Core.podspec
  7. 2
      gRPC-ProtoRPC.podspec
  8. 2
      gRPC-RxLibrary.podspec
  9. 2
      gRPC.podspec
  10. 4
      package.xml
  11. 2
      src/core/lib/surface/version.cc
  12. 2
      src/cpp/common/version_cc.cc
  13. 2
      src/csharp/Grpc.Core/Version.csproj.include
  14. 2
      src/csharp/Grpc.Core/VersionInfo.cs
  15. 2
      src/csharp/build_packages_dotnetcli.bat
  16. 6
      src/csharp/build_packages_dotnetcli.sh
  17. 2
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  18. 2
      src/objective-c/GRPCClient/private/version.h
  19. 4
      src/objective-c/tests/version.h
  20. 2
      src/php/ext/grpc/version.h
  21. 2
      src/python/grpcio/grpc/_grpcio_metadata.py
  22. 2
      src/python/grpcio/grpc_version.py
  23. 2
      src/python/grpcio_health_checking/grpc_version.py
  24. 2
      src/python/grpcio_reflection/grpc_version.py
  25. 2
      src/python/grpcio_testing/grpc_version.py
  26. 2
      src/python/grpcio_tests/grpc_version.py
  27. 2
      src/ruby/lib/grpc/version.rb
  28. 2
      src/ruby/tools/version.rb
  29. 2
      tools/distrib/python/grpcio_tools/grpc_version.py
  30. 2
      tools/doxygen/Doxyfile.c++
  31. 2
      tools/doxygen/Doxyfile.c++.internal
  32. 2
      tools/doxygen/Doxyfile.core
  33. 2
      tools/doxygen/Doxyfile.core.internal

4
BUILD
Unescape View File

@ -66,9 +66,9 @@ config_setting(
# This should be updated along with build.yaml # This should be updated along with build.yaml
g_stands_for = "gladiolus" g_stands_for = "gladiolus"
core_version = "6.0.0-pre1" core_version = "6.0.0-pre2"
version = "1.14.0-pre1" version = "1.14.0-pre2"
GPR_PUBLIC_HDRS = [ GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h", "include/grpc/support/alloc.h",

2
CMakeLists.txt
Unescape View File

@ -24,7 +24,7 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(PACKAGE_NAME "grpc") set(PACKAGE_NAME "grpc")
set(PACKAGE_VERSION "1.14.0-pre1") set(PACKAGE_VERSION "1.14.0-pre2")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")

6
Makefile
Unescape View File

@ -436,9 +436,9 @@ E = @echo
Q = @ Q = @
endif endif
CORE_VERSION = 6.0.0-pre1 CORE_VERSION = 6.0.0-pre2
CPP_VERSION = 1.14.0-pre1 CPP_VERSION = 1.14.0-pre2
CSHARP_VERSION = 1.14.0-pre1 CSHARP_VERSION = 1.14.0-pre2
CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

4
build.yaml
Unescape View File

@ -12,9 +12,9 @@ settings:
'#08': Use "-preN" suffixes to identify pre-release versions '#08': Use "-preN" suffixes to identify pre-release versions
'#09': Per-language overrides are possible with (eg) ruby_version tag here '#09': Per-language overrides are possible with (eg) ruby_version tag here
'#10': See the expand_version.py for all the quirks here '#10': See the expand_version.py for all the quirks here
core_version: 6.0.0-pre1 core_version: 6.0.0-pre2
g_stands_for: gladiolus g_stands_for: gladiolus
version: 1.14.0-pre1 version: 1.14.0-pre2
filegroups: filegroups:
- name: alts_proto - name: alts_proto
headers: headers:

4
gRPC-C++.podspec
Unescape View File

@ -23,7 +23,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-C++' s.name = 'gRPC-C++'
# TODO (mxyan): use version that match gRPC version when pod is stabilized # TODO (mxyan): use version that match gRPC version when pod is stabilized
# version = '1.14.0-pre1' # version = '1.14.0-pre2'
version = '0.0.3' version = '0.0.3'
s.version = version s.version = version
s.summary = 'gRPC C++ library' s.summary = 'gRPC C++ library'
@ -31,7 +31,7 @@ Pod::Spec.new do |s|
s.license = 'Apache License, Version 2.0' s.license = 'Apache License, Version 2.0'
s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' }
grpc_version = '1.14.0-pre1' grpc_version = '1.14.0-pre2'
s.source = { s.source = {
:git => 'https://github.com/grpc/grpc.git', :git => 'https://github.com/grpc/grpc.git',

2
gRPC-Core.podspec
Unescape View File

@ -22,7 +22,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-Core' s.name = 'gRPC-Core'
version = '1.14.0-pre1' version = '1.14.0-pre2'
s.version = version s.version = version
s.summary = 'Core cross-platform gRPC library, written in C' s.summary = 'Core cross-platform gRPC library, written in C'
s.homepage = 'https://grpc.io' s.homepage = 'https://grpc.io'

2
gRPC-ProtoRPC.podspec
Unescape View File

@ -21,7 +21,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC' s.name = 'gRPC-ProtoRPC'
version = '1.14.0-pre1' version = '1.14.0-pre2'
s.version = version s.version = version
s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.summary = 'RPC library for Protocol Buffers, based on gRPC'
s.homepage = 'https://grpc.io' s.homepage = 'https://grpc.io'

2
gRPC-RxLibrary.podspec
Unescape View File

@ -21,7 +21,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary' s.name = 'gRPC-RxLibrary'
version = '1.14.0-pre1' version = '1.14.0-pre2'
s.version = version s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.' s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'https://grpc.io' s.homepage = 'https://grpc.io'

2
gRPC.podspec
Unescape View File

@ -20,7 +20,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC' s.name = 'gRPC'
version = '1.14.0-pre1' version = '1.14.0-pre2'
s.version = version s.version = version
s.summary = 'gRPC client library for iOS/OSX' s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'https://grpc.io' s.homepage = 'https://grpc.io'

4
package.xml
Unescape View File

@ -13,8 +13,8 @@
<date>2018-01-19</date> <date>2018-01-19</date>
<time>16:06:07</time> <time>16:06:07</time>
<version> <version>
<release>1.14.0RC1</release> <release>1.14.0RC2</release>
<api>1.14.0RC1</api> <api>1.14.0RC2</api>
</version> </version>
<stability> <stability>
<release>beta</release> <release>beta</release>

2
src/core/lib/surface/version.cc
Unescape View File

@ -23,6 +23,6 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
const char* grpc_version_string(void) { return "6.0.0-pre1"; } const char* grpc_version_string(void) { return "6.0.0-pre2"; }
const char* grpc_g_stands_for(void) { return "gladiolus"; } const char* grpc_g_stands_for(void) { return "gladiolus"; }

2
src/cpp/common/version_cc.cc
Unescape View File

@ -22,5 +22,5 @@
#include <grpcpp/grpcpp.h> #include <grpcpp/grpcpp.h>
namespace grpc { namespace grpc {
grpc::string Version() { return "1.14.0-pre1"; } grpc::string Version() { return "1.14.0-pre2"; }
} // namespace grpc } // namespace grpc

2
src/csharp/Grpc.Core/Version.csproj.include
Unescape View File

@ -1,7 +1,7 @@
<!-- This file is generated --> <!-- This file is generated -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<GrpcCsharpVersion>1.14.0-pre1</GrpcCsharpVersion> <GrpcCsharpVersion>1.14.0-pre2</GrpcCsharpVersion>
<GoogleProtobufVersion>3.5.1</GoogleProtobufVersion> <GoogleProtobufVersion>3.5.1</GoogleProtobufVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
src/csharp/Grpc.Core/VersionInfo.cs
Unescape View File

@ -38,6 +38,6 @@ namespace Grpc.Core
/// <summary> /// <summary>
/// Current version of gRPC C# /// Current version of gRPC C#
/// </summary> /// </summary>
public const string CurrentVersion = "1.14.0-pre1"; public const string CurrentVersion = "1.14.0-pre2";
} }
} }

2
src/csharp/build_packages_dotnetcli.bat
Unescape View File

@ -13,7 +13,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem Current package versions @rem Current package versions
set VERSION=1.14.0-pre1 set VERSION=1.14.0-pre2
@rem Adjust the location of nuget.exe @rem Adjust the location of nuget.exe
set NUGET=C:\nuget\nuget.exe set NUGET=C:\nuget\nuget.exe

6
src/csharp/build_packages_dotnetcli.sh
Unescape View File

@ -45,8 +45,8 @@ dotnet pack --configuration Release Grpc.Auth --output ../../../artifacts
dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts dotnet pack --configuration Release Grpc.HealthCheck --output ../../../artifacts
dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
nuget pack Grpc.nuspec -Version "1.14.0-pre1" -OutputDirectory ../../artifacts nuget pack Grpc.nuspec -Version "1.14.0-pre2" -OutputDirectory ../../artifacts
nuget pack Grpc.Core.NativeDebug.nuspec -Version "1.14.0-pre1" -OutputDirectory ../../artifacts nuget pack Grpc.Core.NativeDebug.nuspec -Version "1.14.0-pre2" -OutputDirectory ../../artifacts
nuget pack Grpc.Tools.nuspec -Version "1.14.0-pre1" -OutputDirectory ../../artifacts nuget pack Grpc.Tools.nuspec -Version "1.14.0-pre2" -OutputDirectory ../../artifacts
(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

2
src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Unescape View File

@ -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 # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed
# before them. # before them.
s.name = '!ProtoCompiler-gRPCPlugin' s.name = '!ProtoCompiler-gRPCPlugin'
v = '1.14.0-pre1' v = '1.14.0-pre2'
s.version = v s.version = v
s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
s.description = <<-DESC s.description = <<-DESC

2
src/objective-c/GRPCClient/private/version.h
Unescape View File

@ -22,4 +22,4 @@
// instead. This file can be regenerated from the template by running // instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`. // `tools/buildgen/generate_projects.sh`.
#define GRPC_OBJC_VERSION_STRING @"1.14.0-pre1" #define GRPC_OBJC_VERSION_STRING @"1.14.0-pre2"

4
src/objective-c/tests/version.h
Unescape View File

@ -22,5 +22,5 @@
// instead. This file can be regenerated from the template by running // instead. This file can be regenerated from the template by running
// `tools/buildgen/generate_projects.sh`. // `tools/buildgen/generate_projects.sh`.
#define GRPC_OBJC_VERSION_STRING @"1.14.0-pre1" #define GRPC_OBJC_VERSION_STRING @"1.14.0-pre2"
#define GRPC_C_VERSION_STRING @"6.0.0-pre1" #define GRPC_C_VERSION_STRING @"6.0.0-pre2"

2
src/php/ext/grpc/version.h
Unescape View File

@ -20,6 +20,6 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
#define PHP_GRPC_VERSION "1.14.0RC1" #define PHP_GRPC_VERSION "1.14.0RC2"
#endif /* VERSION_H */ #endif /* VERSION_H */

2
src/python/grpcio/grpc/_grpcio_metadata.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc/_grpcio_metadata.py.template`!!!
__version__ = """1.14.0rc1""" __version__ = """1.14.0rc2"""

2
src/python/grpcio/grpc_version.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
VERSION = '1.14.0rc1' VERSION = '1.14.0rc2'

2
src/python/grpcio_health_checking/grpc_version.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
VERSION = '1.14.0rc1' VERSION = '1.14.0rc2'

2
src/python/grpcio_reflection/grpc_version.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
VERSION = '1.14.0rc1' VERSION = '1.14.0rc2'

2
src/python/grpcio_testing/grpc_version.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_testing/grpc_version.py.template`!!!
VERSION = '1.14.0rc1' VERSION = '1.14.0rc2'

2
src/python/grpcio_tests/grpc_version.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
VERSION = '1.14.0rc1' VERSION = '1.14.0rc2'

2
src/ruby/lib/grpc/version.rb
Unescape View File

@ -14,5 +14,5 @@
# GRPC contains the General RPC module. # GRPC contains the General RPC module.
module GRPC module GRPC
VERSION = '1.14.0.pre1' VERSION = '1.14.0.pre2'
end end

2
src/ruby/tools/version.rb
Unescape View File

@ -14,6 +14,6 @@
module GRPC module GRPC
module Tools module Tools
VERSION = '1.14.0.pre1' VERSION = '1.14.0.pre2'
end end
end end

2
tools/distrib/python/grpcio_tools/grpc_version.py
Unescape View File

@ -14,4 +14,4 @@
# AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
VERSION = '1.14.0rc1' VERSION = '1.14.0rc2'

2
tools/doxygen/Doxyfile.c++
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 1.14.0-pre1 PROJECT_NUMBER = 1.14.0-pre2
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

2
tools/doxygen/Doxyfile.c++.internal
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC C++"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 1.14.0-pre1 PROJECT_NUMBER = 1.14.0-pre2
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

2
tools/doxygen/Doxyfile.core
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 6.0.0-pre1 PROJECT_NUMBER = 6.0.0-pre2
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

2
tools/doxygen/Doxyfile.core.internal
Unescape View File

@ -40,7 +40,7 @@ PROJECT_NAME = "GRPC Core"
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
# control system is used. # control system is used.
PROJECT_NUMBER = 6.0.0-pre1 PROJECT_NUMBER = 6.0.0-pre2
# Using the PROJECT_BRIEF tag one can provide an optional one line description # 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 # for a project that appears at the top of each page and should give viewer a

Write Preview
Loading…
Cancel
Save