Merge pull request #10895 from dgquintas/v1.3.x-post-tag-bump

1.3.0 -> 1.3.1-pre1
pull/10912/head
David G. Quintas 8 years ago committed by GitHub
commit ee9f210401
  1. 2
      BUILD
  2. 2
      CMakeLists.txt
  3. 4
      Makefile
  4. 2
      build.yaml
  5. 2
      gRPC-Core.podspec
  6. 2
      gRPC-ProtoRPC.podspec
  7. 2
      gRPC-RxLibrary.podspec
  8. 2
      gRPC.podspec
  9. 2
      package.json
  10. 4
      package.xml
  11. 2
      src/cpp/common/version_cc.cc
  12. 2
      src/csharp/Grpc.Core/Version.csproj.include
  13. 4
      src/csharp/Grpc.Core/VersionInfo.cs
  14. 2
      src/csharp/build_packages_dotnetcli.bat
  15. 4
      src/csharp/build_packages_dotnetcli.sh
  16. 4
      src/node/health_check/package.json
  17. 2
      src/node/tools/package.json
  18. 2
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  19. 2
      src/objective-c/GRPCClient/private/version.h
  20. 2
      src/php/composer.json
  21. 2
      src/python/grpcio/grpc_version.py
  22. 2
      src/python/grpcio_health_checking/grpc_version.py
  23. 2
      src/python/grpcio_reflection/grpc_version.py
  24. 2
      src/python/grpcio_tests/grpc_version.py
  25. 2
      src/ruby/lib/grpc/version.rb
  26. 2
      src/ruby/tools/version.rb
  27. 2
      tools/distrib/python/grpcio_tools/grpc_version.py
  28. 2
      tools/doxygen/Doxyfile.c++
  29. 2
      tools/doxygen/Doxyfile.c++.internal

@ -42,7 +42,7 @@ g_stands_for = "gentle"
core_version = "3.0.0" core_version = "3.0.0"
version = "1.3.0" version = "1.3.1-pre1"
grpc_cc_library( grpc_cc_library(
name = "gpr", name = "gpr",

@ -39,7 +39,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.3.0") set(PACKAGE_VERSION "1.3.1-pre1")
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/")

@ -420,8 +420,8 @@ Q = @
endif endif
CORE_VERSION = 3.0.0 CORE_VERSION = 3.0.0
CPP_VERSION = 1.3.0 CPP_VERSION = 1.3.1-pre1
CSHARP_VERSION = 1.3.0 CSHARP_VERSION = 1.3.1-pre1
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)

@ -14,7 +14,7 @@ settings:
'#10': See the expand_version.py for all the quirks here '#10': See the expand_version.py for all the quirks here
core_version: 3.0.0 core_version: 3.0.0
g_stands_for: gentle g_stands_for: gentle
version: 1.3.0 version: 1.3.1-pre1
filegroups: filegroups:
- name: census - name: census
public_headers: public_headers:

@ -37,7 +37,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-Core' s.name = 'gRPC-Core'
version = '1.3.0' version = '1.3.1-pre1'
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 = 'http://www.grpc.io' s.homepage = 'http://www.grpc.io'

@ -36,7 +36,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-ProtoRPC' s.name = 'gRPC-ProtoRPC'
version = '1.3.0' version = '1.3.1-pre1'
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 = 'http://www.grpc.io' s.homepage = 'http://www.grpc.io'

@ -36,7 +36,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC-RxLibrary' s.name = 'gRPC-RxLibrary'
version = '1.3.0' version = '1.3.1-pre1'
s.version = version s.version = version
s.summary = 'Reactive Extensions library for iOS/OSX.' s.summary = 'Reactive Extensions library for iOS/OSX.'
s.homepage = 'http://www.grpc.io' s.homepage = 'http://www.grpc.io'

@ -35,7 +35,7 @@
Pod::Spec.new do |s| Pod::Spec.new do |s|
s.name = 'gRPC' s.name = 'gRPC'
version = '1.3.0' version = '1.3.1-pre1'
s.version = version s.version = version
s.summary = 'gRPC client library for iOS/OSX' s.summary = 'gRPC client library for iOS/OSX'
s.homepage = 'http://www.grpc.io' s.homepage = 'http://www.grpc.io'

@ -1,6 +1,6 @@
{ {
"name": "grpc", "name": "grpc",
"version": "1.3.0", "version": "1.3.1-pre1",
"author": "Google Inc.", "author": "Google Inc.",
"description": "gRPC Library for Node", "description": "gRPC Library for Node",
"homepage": "http://www.grpc.io/", "homepage": "http://www.grpc.io/",

@ -13,8 +13,8 @@
<date>2017-03-01</date> <date>2017-03-01</date>
<time>16:06:07</time> <time>16:06:07</time>
<version> <version>
<release>1.3.0</release> <release>1.3.1RC1</release>
<api>1.3.0</api> <api>1.3.1RC1</api>
</version> </version>
<stability> <stability>
<release>beta</release> <release>beta</release>

@ -37,5 +37,5 @@
#include <grpc++/grpc++.h> #include <grpc++/grpc++.h>
namespace grpc { namespace grpc {
grpc::string Version() { return "1.3.0"; } grpc::string Version() { return "1.3.1-pre1"; }
} }

@ -1,7 +1,7 @@
<!-- This file is generated --> <!-- This file is generated -->
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<GrpcCsharpVersion>1.3.0</GrpcCsharpVersion> <GrpcCsharpVersion>1.3.1-pre1</GrpcCsharpVersion>
<GoogleProtobufVersion>3.2.0</GoogleProtobufVersion> <GoogleProtobufVersion>3.2.0</GoogleProtobufVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

@ -48,11 +48,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.3.0.0"; public const string CurrentAssemblyFileVersion = "1.3.1.0";
/// <summary> /// <summary>
/// Current version of gRPC C# /// Current version of gRPC C#
/// </summary> /// </summary>
public const string CurrentVersion = "1.3.0"; public const string CurrentVersion = "1.3.1-pre1";
} }
} }

@ -28,7 +28,7 @@
@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@rem Current package versions @rem Current package versions
set VERSION=1.3.0 set VERSION=1.3.1-pre1
@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

@ -70,7 +70,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.3.0" -OutputDirectory ../../artifacts nuget pack Grpc.nuspec -Version "1.3.1-pre1" -OutputDirectory ../../artifacts
nuget pack Grpc.Tools.nuspec -Version "1.3.0" -OutputDirectory ../../artifacts nuget pack Grpc.Tools.nuspec -Version "1.3.1-pre1" -OutputDirectory ../../artifacts
(cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg) (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)

@ -1,6 +1,6 @@
{ {
"name": "grpc-health-check", "name": "grpc-health-check",
"version": "1.3.0", "version": "1.3.1-pre1",
"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.3.0", "grpc": "^1.3.1-pre1",
"lodash": "^3.9.3", "lodash": "^3.9.3",
"google-protobuf": "^3.0.0" "google-protobuf": "^3.0.0"
}, },

@ -1,6 +1,6 @@
{ {
"name": "grpc-tools", "name": "grpc-tools",
"version": "1.3.0", "version": "1.3.1-pre1",
"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": "http://www.grpc.io/", "homepage": "http://www.grpc.io/",

@ -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.3.0' v = '1.3.1-pre1'
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

@ -38,4 +38,4 @@
// `tools/buildgen/generate_projects.sh`. // `tools/buildgen/generate_projects.sh`.
#define GRPC_OBJC_VERSION_STRING @"1.3.0" #define GRPC_OBJC_VERSION_STRING @"1.3.1-pre1"

@ -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": "BSD-3-Clause", "license": "BSD-3-Clause",
"version": "1.3.0", "version": "1.3.1",
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.5.0",
"google/protobuf": "^v3.1.0" "google/protobuf": "^v3.1.0"

@ -29,4 +29,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.3.0' VERSION='1.3.1rc1'

@ -29,4 +29,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.3.0' VERSION='1.3.1rc1'

@ -29,4 +29,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.3.0' VERSION='1.3.1rc1'

@ -29,4 +29,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.3.0' VERSION='1.3.1rc1'

@ -29,5 +29,5 @@
# GRPC contains the General RPC module. # GRPC contains the General RPC module.
module GRPC module GRPC
VERSION = '1.3.0' VERSION = '1.3.1.pre1'
end end

@ -29,6 +29,6 @@
module GRPC module GRPC
module Tools module Tools
VERSION = '1.3.0' VERSION = '1.3.1.pre1'
end end
end end

@ -29,4 +29,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.3.0' VERSION='1.3.1rc1'

@ -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.3.0 PROJECT_NUMBER = 1.3.1-pre1
# 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

@ -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.3.0 PROJECT_NUMBER = 1.3.1-pre1
# 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

Loading…
Cancel
Save