Merge remote-tracking branch 'upstream/master' into gpr_test_util_to_grpc_test_util

2 files changed, 28 insertions, 1 deletions

diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template
index a3336f50e6..1c03cb3e84 100644
--- a/templates/gRPC-C++.podspec.template
+++ b/templates/gRPC-C++.podspec.template
@@ -127,12 +127,20 @@
 
   def ruby_multiline_list(files, indent):
     return (',\n' + indent*' ').join('\'%s\'' % f for f in files)
+
+  def modify_podspec_version_string(pod_version, grpc_version):
+    # Append -preX when it is a pre-release
+    if len(str(grpc_version).split('-')) > 1:
+      return pod_version + '-' + str(grpc_version).split('-')[-1]
+    else:
+      return pod_version
+
   %>
   Pod::Spec.new do |s|
     s.name     = 'gRPC-C++'
     # TODO (mxyan): use version that match gRPC version when pod is stabilized
     # version = '${settings.version}'
-    version = '0.0.4'
+    version = '${modify_podspec_version_string('0.0.6', settings.version)}'
     s.version  = version
     s.summary  = 'gRPC C++ library'
     s.homepage = 'https://grpc.io'
diff --git a/templates/src/python/grpcio_status/grpc_version.py.template b/templates/src/python/grpcio_status/grpc_version.py.template
new file mode 100644
index 0000000000..727e01edb9
--- /dev/null
+++ b/templates/src/python/grpcio_status/grpc_version.py.template
@@ -0,0 +1,19 @@
+%YAML 1.2
+--- |
+  # Copyright 2018 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+
+  # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_status/grpc_version.py.template`!!!
+
+  VERSION = '${settings.python_version.pep440()}'