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

Master version bump to 1.7.x

Browse Source
pull/12213/head
David Garcia Quintas 7 years ago
parent f1ab1130c8
commit 713597f1cd
33 changed files with 42 additions and 40 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. 6
      BUILD
  2. 2
      CMakeLists.txt
  3. 4
      Makefile
  4. 4
      build.yaml
  5. 2
      doc/g_stands_for.md
  6. 2
      gRPC-Core.podspec
  7. 2
      gRPC-ProtoRPC.podspec
  8. 2
      gRPC-RxLibrary.podspec
  9. 2
      gRPC.podspec
  10. 2
      package.json
  11. 4
      package.xml
  12. 2
      src/core/lib/surface/version.c
  13. 2
      src/cpp/common/version_cc.cc
  14. 2
      src/csharp/Grpc.Core/Version.csproj.include
  15. 4
      src/csharp/Grpc.Core/VersionInfo.cs
  16. 2
      src/csharp/build_packages_dotnetcli.bat
  17. 4
      src/csharp/build_packages_dotnetcli.sh
  18. 4
      src/node/health_check/package.json
  19. 2
      src/node/tools/package.json
  20. 2
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  21. 2
      src/objective-c/GRPCClient/private/version.h
  22. 2
      src/php/composer.json
  23. 2
      src/php/ext/grpc/version.h
  24. 2
      src/python/grpcio/grpc/_grpcio_metadata.py
  25. 2
      src/python/grpcio/grpc_version.py
  26. 2
      src/python/grpcio_health_checking/grpc_version.py
  27. 2
      src/python/grpcio_reflection/grpc_version.py
  28. 2
      src/python/grpcio_tests/grpc_version.py
  29. 2
      src/ruby/lib/grpc/version.rb
  30. 2
      src/ruby/tools/version.rb
  31. 2
      tools/distrib/python/grpcio_tools/grpc_version.py
  32. 2
      tools/doxygen/Doxyfile.c++
  33. 2
      tools/doxygen/Doxyfile.c++.internal

6
BUILD
Unescape View File

@ -34,11 +34,11 @@ load(
) )
# This should be updated along with build.yaml # This should be updated along with build.yaml
g_stands_for = "gregarious" g_stands_for = "gambit"
core_version = "4.0.0-dev" core_version = "4.0.0-dev"
version = "1.5.0-dev" version = "1.7.0-dev"
GPR_PUBLIC_HDRS = [ GPR_PUBLIC_HDRS = [
"include/grpc/support/alloc.h", "include/grpc/support/alloc.h",
@ -593,9 +593,9 @@ grpc_cc_library(
"src/core/lib/iomgr/ev_windows.c", "src/core/lib/iomgr/ev_windows.c",
"src/core/lib/iomgr/exec_ctx.c", "src/core/lib/iomgr/exec_ctx.c",
"src/core/lib/iomgr/executor.c", "src/core/lib/iomgr/executor.c",
"src/core/lib/iomgr/gethostname_fallback.c",
"src/core/lib/iomgr/gethostname_host_name_max.c", "src/core/lib/iomgr/gethostname_host_name_max.c",
"src/core/lib/iomgr/gethostname_sysconf.c", "src/core/lib/iomgr/gethostname_sysconf.c",
"src/core/lib/iomgr/gethostname_fallback.c",
"src/core/lib/iomgr/iocp_windows.c", "src/core/lib/iomgr/iocp_windows.c",
"src/core/lib/iomgr/iomgr.c", "src/core/lib/iomgr/iomgr.c",
"src/core/lib/iomgr/iomgr_posix.c", "src/core/lib/iomgr/iomgr_posix.c",

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.5.0-dev") set(PACKAGE_VERSION "1.7.0-dev")
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/")

4
Makefile
Unescape View File

@ -411,8 +411,8 @@ Q = @
endif endif
CORE_VERSION = 4.0.0-dev CORE_VERSION = 4.0.0-dev
CPP_VERSION = 1.5.0-dev CPP_VERSION = 1.7.0-dev
CSHARP_VERSION = 1.5.0-dev CSHARP_VERSION = 1.7.0-dev
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

@ -13,8 +13,8 @@ settings:
'#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: 4.0.0-dev core_version: 4.0.0-dev
g_stands_for: gregarious g_stands_for: gambit
version: 1.5.0-dev version: 1.7.0-dev
filegroups: filegroups:
- name: census - name: census
public_headers: public_headers:

2
doc/g_stands_for.md
Unescape View File

@ -9,3 +9,5 @@ future), and the corresponding version numbers that used them:
- 1.2 'g' stands for 'green' - 1.2 'g' stands for 'green'
- 1.3 'g' stands for 'gentle' - 1.3 'g' stands for 'gentle'
- 1.4 'g' stands for 'gregarious' - 1.4 'g' stands for 'gregarious'
- 1.6 'g' stands for 'garcia'
- 1.7 'g' stands for 'gambit'

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.5.0-dev' version = '1.7.0-dev'
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.5.0-dev' version = '1.7.0-dev'
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.5.0-dev' version = '1.7.0-dev'
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.5.0-dev' version = '1.7.0-dev'
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'

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "grpc", "name": "grpc",
"version": "1.5.0-dev", "version": "1.7.0-dev",
"author": "Google Inc.", "author": "Google Inc.",
"description": "gRPC Library for Node", "description": "gRPC Library for Node",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",

4
package.xml
Unescape View File

@ -13,8 +13,8 @@
<date>2017-05-22</date> <date>2017-05-22</date>
<time>16:06:07</time> <time>16:06:07</time>
<version> <version>
<release>1.5.0dev</release> <release>1.7.0dev</release>
<api>1.5.0dev</api> <api>1.7.0dev</api>
</version> </version>
<stability> <stability>
<release>beta</release> <release>beta</release>

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

@ -23,4 +23,4 @@
const char *grpc_version_string(void) { return "4.0.0-dev"; } const char *grpc_version_string(void) { return "4.0.0-dev"; }
const char *grpc_g_stands_for(void) { return "gregarious"; } const char *grpc_g_stands_for(void) { return "gambit"; }

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

@ -22,5 +22,5 @@
#include <grpc++/grpc++.h> #include <grpc++/grpc++.h>
namespace grpc { namespace grpc {
grpc::string Version() { return "1.5.0-dev"; } grpc::string Version() { return "1.7.0-dev"; }
} }

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.5.0-dev</GrpcCsharpVersion> <GrpcCsharpVersion>1.7.0-dev</GrpcCsharpVersion>
<GoogleProtobufVersion>3.3.0</GoogleProtobufVersion> <GoogleProtobufVersion>3.3.0</GoogleProtobufVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -33,11 +33,11 @@ namespace Grpc.Core
/// <summary> /// <summary>
/// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
/// </summary> /// </summary>
public const string CurrentAssemblyFileVersion = "1.5.0.0"; public const string CurrentAssemblyFileVersion = "1.7.0.0";
/// <summary> /// <summary>
/// Current version of gRPC C# /// Current version of gRPC C#
/// </summary> /// </summary>
public const string CurrentVersion = "1.5.0-dev"; public const string CurrentVersion = "1.7.0-dev";
} }
} }

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.5.0-dev set VERSION=1.7.0-dev
@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

4
src/csharp/build_packages_dotnetcli.sh
Unescape View File

@ -39,7 +39,7 @@ 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.5.0-dev" -OutputDirectory ../../artifacts nuget pack Grpc.nuspec -Version "1.7.0-dev" -OutputDirectory ../../artifacts
nuget pack Grpc.Tools.nuspec -Version "1.5.0-dev" -OutputDirectory ../../artifacts nuget pack Grpc.Tools.nuspec -Version "1.7.0-dev" -OutputDirectory ../../artifacts
(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

4
src/node/health_check/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "grpc-health-check", "name": "grpc-health-check",
"version": "1.5.0-dev", "version": "1.7.0-dev",
"author": "Google Inc.", "author": "Google Inc.",
"description": "Health check service for use with gRPC", "description": "Health check service for use with gRPC",
"repository": { "repository": {
@ -15,7 +15,7 @@
} }
], ],
"dependencies": { "dependencies": {
"grpc": "^1.5.0-dev", "grpc": "^1.7.0-dev",
"lodash": "^3.9.3", "lodash": "^3.9.3",
"google-protobuf": "^3.0.0" "google-protobuf": "^3.0.0"
}, },

2
src/node/tools/package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "grpc-tools", "name": "grpc-tools",
"version": "1.5.0-dev", "version": "1.7.0-dev",
"author": "Google Inc.", "author": "Google Inc.",
"description": "Tools for developing with gRPC on Node.js", "description": "Tools for developing with gRPC on Node.js",
"homepage": "https://grpc.io/", "homepage": "https://grpc.io/",

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.5.0-dev' v = '1.7.0-dev'
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

@ -23,4 +23,4 @@
// `tools/buildgen/generate_projects.sh`. // `tools/buildgen/generate_projects.sh`.
#define GRPC_OBJC_VERSION_STRING @"1.5.0-dev" #define GRPC_OBJC_VERSION_STRING @"1.7.0-dev"

2
src/php/composer.json
Unescape View File

@ -2,7 +2,7 @@
"name": "grpc/grpc-dev", "name": "grpc/grpc-dev",
"description": "gRPC library for PHP - for Developement use only", "description": "gRPC library for PHP - for Developement use only",
"license": "Apache-2.0", "license": "Apache-2.0",
"version": "1.5.0", "version": "1.7.0",
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"google/protobuf": "^v3.3.0" "google/protobuf": "^v3.3.0"

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.5.0dev" #define PHP_GRPC_VERSION "1.7.0dev"
#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.5.0.dev0""" __version__ = """1.7.0.dev0"""

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.5.0.dev0' VERSION='1.7.0.dev0'

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.5.0.dev0' VERSION='1.7.0.dev0'

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.5.0.dev0' VERSION='1.7.0.dev0'

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.5.0.dev0' VERSION='1.7.0.dev0'

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.5.0.dev' VERSION = '1.7.0.dev'
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.5.0.dev' VERSION = '1.7.0.dev'
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.5.0.dev0' VERSION='1.7.0.dev0'

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.5.0-dev PROJECT_NUMBER = 1.7.0-dev
# 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.5.0-dev PROJECT_NUMBER = 1.7.0-dev
# 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