Merge pull request #18033 from srini100/master

Bump master to v1.20.x and pick "godric" for that release
6 years ago · f7f6861720
parent 17651ca3cc b0efc103e3
commit f7f6861720
36 changed files with 48 additions and 47 deletions
--- a/6
+++ b/6
@ -79,11 +79,11 @@ LINK_OPTS = select({
 })

 # This should be updated along with build.yaml
-g_stands_for = "gold"
+g_stands_for = "godric"

-core_version = "7.0.0-dev"
+core_version = "7.0.0"

-version = "1.19.0-dev"
+version = "1.20.0-dev"

 GPR_PUBLIC_HDRS = [
    "include/grpc/support/alloc.h",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -24,7 +24,7 @@
 cmake_minimum_required(VERSION 2.8)

 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.19.0-dev")
+set(PACKAGE_VERSION   "1.20.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/6
+++ b/6
@ -437,9 +437,9 @@ E = @echo
 Q = @
 endif

-CORE_VERSION = 7.0.0-dev
-CPP_VERSION = 1.19.0-dev
-CSHARP_VERSION = 1.19.0-dev
+CORE_VERSION = 7.0.0
+CPP_VERSION = 1.20.0-dev
+CSHARP_VERSION = 1.20.0-dev

 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/build.yaml
+++ b/build.yaml
@ -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-dev
-  g_stands_for: gold
-  version: 1.19.0-dev
+  core_version: 7.0.0
+  g_stands_for: godric
+  version: 1.20.0-dev
 filegroups:
 - name: alts_proto
  headers:
--- a/doc/g_stands_for.md
+++ b/doc/g_stands_for.md
@ -18,4 +18,5 @@
 - 1.16 'g' stands for ['gao'](https://github.com/grpc/grpc/tree/v1.16.x)
 - 1.17 'g' stands for ['gizmo'](https://github.com/grpc/grpc/tree/v1.17.x)
 - 1.18 'g' stands for ['goose'](https://github.com/grpc/grpc/tree/v1.18.x)
- 1.19 'g' stands for ['gold'](https://github.com/grpc/grpc/tree/master)
+- 1.19 'g' stands for ['gold'](https://github.com/grpc/grpc/tree/v1.19.x)
+- 1.20 'g' stands for ['godric'](https://github.com/grpc/grpc/tree/master)
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -23,7 +23,7 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-C++'
  # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  # version = '1.19.0-dev'
+  # version = '1.20.0-dev'
  version = '0.0.8-dev'
  s.version  = version
  s.summary  = 'gRPC C++ library'
@ -31,7 +31,7 @@ Pod::Spec.new do |s|
  s.license  = 'Apache License, Version 2.0'
  s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }

-  grpc_version = '1.19.0-dev'
+  grpc_version = '1.20.0-dev'

  s.source = {
    :git => 'https://github.com/grpc/grpc.git',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -22,7 +22,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-Core'
-  version = '1.19.0-dev'
+  version = '1.20.0-dev'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'https://grpc.io'
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -21,7 +21,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.19.0-dev'
+  version = '1.20.0-dev'
  s.version  = version
  s.summary  = 'RPC library for Protocol Buffers, based on gRPC'
  s.homepage = 'https://grpc.io'
--- a/gRPC-RxLibrary.podspec
+++ b/gRPC-RxLibrary.podspec
@ -21,7 +21,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-RxLibrary'
-  version = '1.19.0-dev'
+  version = '1.20.0-dev'
  s.version  = version
  s.summary  = 'Reactive Extensions library for iOS/OSX.'
  s.homepage = 'https://grpc.io'
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -20,7 +20,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC'
-  version = '1.19.0-dev'
+  version = '1.20.0-dev'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'https://grpc.io'
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2018-01-19</date>
 <time>16:06:07</time>
 <version>
-  <release>1.19.0dev</release>
-  <api>1.19.0dev</api>
+  <release>1.20.0dev</release>
+  <api>1.20.0dev</api>
 </version>
 <stability>
  <release>beta</release>
--- a/src/core/lib/surface/version.cc
+++ b/src/core/lib/surface/version.cc
@ -23,6 +23,6 @@

 #include <grpc/grpc.h>

-const char* grpc_version_string(void) { return "7.0.0-dev"; }
+const char* grpc_version_string(void) { return "7.0.0"; }

-const char* grpc_g_stands_for(void) { return "gold"; }
+const char* grpc_g_stands_for(void) { return "godric"; }
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@ -22,5 +22,5 @@
 #include <grpcpp/grpcpp.h>

 namespace grpc {
-grpc::string Version() { return "1.19.0-dev"; }
+grpc::string Version() { return "1.20.0-dev"; }
 }  // namespace grpc
--- a/src/csharp/Grpc.Core/Version.csproj.include
+++ b/src/csharp/Grpc.Core/Version.csproj.include
@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
  <PropertyGroup>
-    <GrpcCsharpVersion>1.19.0-dev</GrpcCsharpVersion>
+    <GrpcCsharpVersion>1.20.0-dev</GrpcCsharpVersion>
    <GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
  </PropertyGroup>
 </Project>
--- a/src/csharp/Grpc.Core/VersionInfo.cs
+++ b/src/csharp/Grpc.Core/VersionInfo.cs
@ -33,11 +33,11 @@ namespace Grpc.Core
        /// <summary>
        /// Current <c>AssemblyFileVersion</c> of gRPC C# assemblies
        /// </summary>
-        public const string CurrentAssemblyFileVersion = "1.19.0.0";
+        public const string CurrentAssemblyFileVersion = "1.20.0.0";

        /// <summary>
        /// Current version of gRPC C#
        /// </summary>
-        public const string CurrentVersion = "1.19.0-dev";
+        public const string CurrentVersion = "1.20.0-dev";
    }
 }
--- a/src/csharp/build_unitypackage.bat
+++ b/src/csharp/build_unitypackage.bat
@ -13,7 +13,7 @@
@rem limitations under the License.

@rem Current package versions
-set VERSION=1.19.0-dev
+set VERSION=1.20.0-dev

@rem Adjust the location of nuget.exe
 set NUGET=C:\nuget\nuget.exe
--- 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.19.0-dev'
+  v = '1.20.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
@ -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.19.0-dev"
+#define GRPC_OBJC_VERSION_STRING @"1.20.0-dev"
--- a/src/objective-c/tests/version.h
+++ b/src/objective-c/tests/version.h
@ -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.19.0-dev"
-#define GRPC_C_VERSION_STRING @"7.0.0-dev"
+#define GRPC_OBJC_VERSION_STRING @"1.20.0-dev"
+#define GRPC_C_VERSION_STRING @"7.0.0"
--- 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": "Apache-2.0",
-  "version": "1.19.0",
+  "version": "1.20.0",
  "require": {
    "php": ">=5.5.0",
    "google/protobuf": "^v3.3.0"
--- a/src/php/ext/grpc/version.h
+++ b/src/php/ext/grpc/version.h
@ -20,6 +20,6 @@
 #ifndef VERSION_H
 #define VERSION_H

-#define PHP_GRPC_VERSION "1.19.0dev"
+#define PHP_GRPC_VERSION "1.20.0dev"

 #endif /* VERSION_H */
--- a/src/python/grpcio/grpc/_grpcio_metadata.py
+++ b/src/python/grpcio/grpc/_grpcio_metadata.py
@ -14,4 +14,4 @@

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

-__version__ = """1.19.0.dev0"""
+__version__ = """1.20.0.dev0"""
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/python/grpcio_channelz/grpc_version.py
+++ b/src/python/grpcio_channelz/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/python/grpcio_reflection/grpc_version.py
+++ b/src/python/grpcio_reflection/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/python/grpcio_status/grpc_version.py
+++ b/src/python/grpcio_status/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/python/grpcio_testing/grpc_version.py
+++ b/src/python/grpcio_testing/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.0.dev0'
--- a/src/ruby/lib/grpc/version.rb
+++ b/src/ruby/lib/grpc/version.rb
@ -14,5 +14,5 @@

 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.19.0.dev'
+  VERSION = '1.20.0.dev'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -14,6 +14,6 @@

 module GRPC
  module Tools
-    VERSION = '1.19.0.dev'
+    VERSION = '1.20.0.dev'
  end
 end
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -14,4 +14,4 @@

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

-VERSION = '1.19.0.dev0'
+VERSION = '1.20.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.19.0-dev
+PROJECT_NUMBER         = 1.20.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.19.0-dev
+PROJECT_NUMBER         = 1.20.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.core
+++ b/tools/doxygen/Doxyfile.core
@ -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-dev
+PROJECT_NUMBER         = 7.0.0

 # 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.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -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-dev
+PROJECT_NUMBER         = 7.0.0

 # 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