Merge pull request #10078 from dgquintas/master_to_1.3.0

Bumped version to 1.3.0-dev
8 years ago · 169c553e0d
parent 9ac776c752 74cec10619
commit 169c553e0d
32 changed files with 41 additions and 41 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -42,7 +42,7 @@
 cmake_minimum_required(VERSION 2.8)
 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.2.0-dev")
+set(PACKAGE_VERSION   "1.3.0-dev")
 set(PACKAGE_STRING    "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME   "${PACKAGE_NAME}-${PACKAGE_VERSION}")
 set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/")
--- a/4
+++ b/4
@ -412,8 +412,8 @@ Q = @
 endif
 CORE_VERSION = 3.0.0-dev
-CPP_VERSION = 1.2.0-dev
+CPP_VERSION = 1.3.0-dev
-CSHARP_VERSION = 1.2.0-dev
+CSHARP_VERSION = 1.3.0-dev
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/build.yaml
+++ b/build.yaml
@ -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-dev
+  version: 1.3.0-dev
 filegroups:
 - name: census
  public_headers:
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -37,7 +37,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-Core'
-  version = '1.2.0-dev'
+  version = '1.3.0-dev'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -36,7 +36,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.2.0-dev'
+  version = '1.3.0-dev'
  s.version  = version
  s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@ -36,7 +36,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-RxLibrary'
-  version = '1.2.0-dev'
+  version = '1.3.0-dev'
  s.version  = version
  s.summary  = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'http://www.grpc.io'
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -35,7 +35,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC'
-  version = '1.2.0-dev'
+  version = '1.3.0-dev'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'http://www.grpc.io'
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc",
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "author": "Google Inc.",
  "description": "gRPC Library for Node",
  "homepage": "http://www.grpc.io/",
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2017-03-01</date>
 <time>16:06:07</time>
 <version>
-  <release>1.2.0dev</release>
+  <release>1.3.0dev</release>
-  <api>1.2.0dev</api>
+  <api>1.3.0dev</api>
 </version>
 <stability>
  <release>beta</release>
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@ -37,5 +37,5 @@
 #include <grpc++/grpc++.h>
 namespace grpc {
-grpc::string Version() { return "1.2.0-dev"; }
+grpc::string Version() { return "1.3.0-dev"; }
 }
--- a/src/csharp/Grpc.Auth/project.json
+++ b/src/csharp/Grpc.Auth/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "title": "gRPC C# Auth",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.2.0-dev",
+    "Grpc.Core": "1.3.0-dev",
    "Google.Apis.Auth": "1.21.0"
  },
  "frameworks": {
--- a/src/csharp/Grpc.Core.Testing/project.json
+++ b/src/csharp/Grpc.Core.Testing/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "title": "gRPC C# Core Testing",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2017, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.2.0-dev"
+    "Grpc.Core": "1.3.0-dev"
  },
  "frameworks": {
    "net45": {
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@ -48,11 +48,11 @@ namespace Grpc.Core
        /// <summary>
        /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
        /// </summary>
-        public const string CurrentAssemblyFileVersion = "1.2.0.0";
+        public const string CurrentAssemblyFileVersion = "1.3.0.0";
        /// <summary>
        /// Current version of gRPC C#
        /// </summary>
-        public const string CurrentVersion = "1.2.0-dev";
+        public const string CurrentVersion = "1.3.0-dev";
    }
 }
--- a/src/csharp/Grpc.Core/project.json
+++ b/src/csharp/Grpc.Core/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "title": "gRPC C# Core",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
--- a/src/csharp/Grpc.HealthCheck/project.json
+++ b/src/csharp/Grpc.HealthCheck/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "title": "gRPC C# Healthchecking",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2015, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.2.0-dev",
+    "Grpc.Core": "1.3.0-dev",
    "Google.Protobuf": "3.2.0"
  },
  "frameworks": {
--- a/src/csharp/Grpc.Reflection/project.json
+++ b/src/csharp/Grpc.Reflection/project.json
@ -1,5 +1,5 @@
 {
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "title": "gRPC C# Reflection",
  "authors": [ "Google Inc." ],
  "copyright": "Copyright 2016, Google Inc.",
@ -21,7 +21,7 @@
    }
  },
  "dependencies": {
-    "Grpc.Core": "1.2.0-dev",
+    "Grpc.Core": "1.3.0-dev",
    "Google.Protobuf": "3.2.0"
  },
  "frameworks": {
--- a/src/csharp/build_packages_dotnetcli.bat
+++ b/src/csharp/build_packages_dotnetcli.bat
@ -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-dev
+set VERSION=1.3.0-dev
 set PROTOBUF_VERSION=3.0.0
@rem Adjust the location of nuget.exe
--- a/src/csharp/build_packages_dotnetcli.sh
+++ b/src/csharp/build_packages_dotnetcli.sh
@ -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-dev" -OutputDirectory ../../artifacts
+nuget pack Grpc.nuspec -Version "1.3.0-dev" -OutputDirectory ../../artifacts
-nuget pack Grpc.Tools.nuspec -Version "1.2.0-dev" -OutputDirectory ../../artifacts
+nuget pack Grpc.Tools.nuspec -Version "1.3.0-dev" -OutputDirectory ../../artifacts
 (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)
--- a/src/node/health_check/package.json
+++ b/src/node/health_check/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-health-check",
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "author": "Google Inc.",
  "description": "Health check service for use with gRPC",
  "repository": {
@ -15,7 +15,7 @@
    }
  ],
  "dependencies": {
-    "grpc": "^1.2.0-dev",
+    "grpc": "^1.3.0-dev",
    "lodash": "^3.9.3",
    "google-protobuf": "^3.0.0"
  },
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc-tools",
-  "version": "1.2.0-dev",
+  "version": "1.3.0-dev",
  "author": "Google Inc.",
  "description": "Tools for developing with gRPC on Node.js",
  "homepage": "http://www.grpc.io/",
--- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
@ -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-dev'
+  v = '1.3.0-dev'
  s.version  = v
  s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
  s.description = <<-DESC
--- a/src/objective-c/GRPCClient/private/version.h
+++ b/src/objective-c/GRPCClient/private/version.h
@ -38,4 +38,4 @@
 // `tools/buildgen/generate_projects.sh`.
-#define GRPC_OBJC_VERSION_STRING @"1.2.0-dev"
+#define GRPC_OBJC_VERSION_STRING @"1.3.0-dev"
--- a/src/php/composer.json
+++ b/src/php/composer.json
@ -2,7 +2,7 @@
  "name": "grpc/grpc-dev",
  "description": "gRPC library for PHP - for Developement use only",
  "license": "BSD-3-Clause",
-  "version": "1.2.0",
+  "version": "1.3.0",
  "require": {
    "php": ">=5.5.0",
    "google/protobuf": "^v3.1.0"
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -29,4 +29,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!
-VERSION='1.2.0.dev0'
+VERSION='1.3.0.dev0'
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@ -29,4 +29,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!
-VERSION='1.2.0.dev0'
+VERSION='1.3.0.dev0'
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@ -29,4 +29,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_reflection/grpc_version.py.template`!!!
-VERSION='1.2.0.dev0'
+VERSION='1.3.0.dev0'
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@ -29,4 +29,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!
-VERSION='1.2.0.dev0'
+VERSION='1.3.0.dev0'
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@ -29,5 +29,5 @@
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.2.0.dev'
+  VERSION = '1.3.0.dev'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -29,6 +29,6 @@
 module GRPC
  module Tools
-    VERSION = '1.2.0.dev'
+    VERSION = '1.3.0.dev'
  end
 end
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -29,4 +29,4 @@
 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!
-VERSION='1.2.0.dev0'
+VERSION='1.3.0.dev0'
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@ -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-dev
+PROJECT_NUMBER         = 1.3.0-dev
 # 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
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -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-dev
+PROJECT_NUMBER         = 1.3.0-dev
 # 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
`@ -38,4 +38,4 @@`
	// `tools/buildgen/generate_projects.sh`.	// `tools/buildgen/generate_projects.sh`.


	`#define GRPC_OBJC_VERSION_STRING @"1.2.0-dev"`	`#define GRPC_OBJC_VERSION_STRING @"1.3.0-dev"`
`@ -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.2.0.dev0'`	`VERSION='1.3.0.dev0'`