Merge pull request #20257 from muxi/v1.24.x

Fix v1.24.0-pre1 objc release
5 years ago · 7e6d990117
parent f703e1c86c 9754150b1f
commit 7e6d990117
38 changed files with 152 additions and 87 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -24,7 +24,7 @@
 cmake_minimum_required(VERSION 3.5.1)

 set(PACKAGE_NAME      "grpc")
-set(PACKAGE_VERSION   "1.24.0-pre1")
+set(PACKAGE_VERSION   "1.24.0-pre2")
 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
@ -461,8 +461,8 @@ Q = @
 endif

 CORE_VERSION = 8.0.0
-CPP_VERSION = 1.24.0-pre1
-CSHARP_VERSION = 2.24.0-pre1
+CPP_VERSION = 1.24.0-pre2
+CSHARP_VERSION = 2.24.0-pre2

 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)
--- a/build.yaml
+++ b/build.yaml
@ -15,7 +15,7 @@ settings:
  core_version: 8.0.0
  csharp_major_version: 2
  g_stands_for: ganges
-  version: 1.24.0-pre1
+  version: 1.24.0-pre2
 filegroups:
 - name: alts_tsi
  headers:
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -23,15 +23,15 @@
 Pod::Spec.new do |s|
  s.name     = 'gRPC-C++'
  # TODO (mxyan): use version that match gRPC version when pod is stabilized
-  # version = '1.24.0-pre1'
-  version = '0.0.9-pre1'
+  # version = '1.24.0-pre2'
+  version = '0.0.9-pre2'
  s.version  = version
  s.summary  = 'gRPC C++ library'
  s.homepage = 'https://grpc.io'
  s.license  = 'Apache License, Version 2.0'
  s.authors  = { 'The gRPC contributors' => 'grpc-packages@google.com' }

-  grpc_version = '1.24.0-pre1'
+  grpc_version = '1.24.0-pre2'

  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.24.0-pre1'
+  version = '1.24.0-pre2'
  s.version  = version
  s.summary  = 'Core cross-platform gRPC library, written in C'
  s.homepage = 'https://grpc.io'
@ -32,6 +32,7 @@ Pod::Spec.new do |s|
  s.source = {
    :git => 'https://github.com/grpc/grpc.git',
    :tag => "v#{version}",
+    :submodules => true,
  }

  # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024,
@ -184,10 +185,9 @@ Pod::Spec.new do |s|
    ss.header_mappings_dir = '.'
    ss.libraries = 'z'
    ss.dependency "#{s.name}/Interface", version
-    ss.dependency 'BoringSSL-GRPC', '0.0.3'
+    ss.dependency 'BoringSSL-GRPC', '0.0.4'
    ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'

-    # To save you from scrolling, this is the last part of the podspec.
    ss.source_files = 'src/core/lib/gpr/alloc.h',
                      'src/core/lib/gpr/arena.h',
                      'src/core/lib/gpr/env.h',
--- a/gRPC-ProtoRPC.podspec
+++ b/gRPC-ProtoRPC.podspec
@ -21,7 +21,7 @@

 Pod::Spec.new do |s|
  s.name     = 'gRPC-ProtoRPC'
-  version = '1.24.0-pre1'
+  version = '1.24.0-pre2'
  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.24.0-pre1'
+  version = '1.24.0-pre2'
  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.24.0-pre1'
+  version = '1.24.0-pre2'
  s.version  = version
  s.summary  = 'gRPC client library for iOS/OSX'
  s.homepage = 'https://grpc.io'
@ -32,11 +32,6 @@ Pod::Spec.new do |s|
    :tag => "v#{version}",
  }

-  s.ios.deployment_target = '7.0'
-  s.osx.deployment_target = '10.9'
-  s.tvos.deployment_target = '10.0'
-  s.watchos.deployment_target = '4.0'
-
  name = 'GRPCClient'
  s.module_name = name
  s.header_dir = name
@ -49,25 +44,35 @@ Pod::Spec.new do |s|
    'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
  }

+  s.ios.deployment_target = '7.0'
+  s.osx.deployment_target = '10.9'
+  s.tvos.deployment_target = '10.0'
+  s.watchos.deployment_target = '4.0'
+
  s.subspec 'Interface-Legacy' do |ss|
    ss.header_mappings_dir = 'src/objective-c/GRPCClient'

-    ss.public_header_files = "GRPCClient/GRPCCall+ChannelArg.h",
-                             "GRPCClient/GRPCCall+ChannelCredentials.h",
-                             "GRPCClient/GRPCCall+Cronet.h",
-                             "GRPCClient/GRPCCall+OAuth2.h",
-                             "GRPCClient/GRPCCall+Tests.h",
+    ss.public_header_files = "src/objective-c/GRPCClient/GRPCCall+ChannelArg.h",
+                             "src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h",
+                             "src/objective-c/GRPCClient/GRPCCall+Cronet.h",
+                             "src/objective-c/GRPCClient/GRPCCall+OAuth2.h",
+                             "src/objective-c/GRPCClient/GRPCCall+Tests.h",
                             "src/objective-c/GRPCClient/GRPCCallLegacy.h",
                             "src/objective-c/GRPCClient/GRPCTypes.h"

-    ss.source_files = "GRPCClient/GRPCCall+ChannelArg.h",
-                      "GRPCClient/GRPCCall+ChannelCredentials.h",
-                      "GRPCClient/GRPCCall+Cronet.h",
-                      "GRPCClient/GRPCCall+OAuth2.h",
-                      "GRPCClient/GRPCCall+Tests.h",
+    ss.source_files = "src/objective-c/GRPCClient/GRPCCall+ChannelArg.h",
+                      "src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h",
+                      "src/objective-c/GRPCClient/GRPCCall+Cronet.h",
+                      "src/objective-c/GRPCClient/GRPCCall+OAuth2.h",
+                      "src/objective-c/GRPCClient/GRPCCall+Tests.h",
                      "src/objective-c/GRPCClient/GRPCCallLegacy.h",
                      "src/objective-c/GRPCClient/GRPCTypes.h"
    ss.dependency "gRPC-RxLibrary/Interface", version
+
+    ss.ios.deployment_target = '7.0'
+    ss.osx.deployment_target = '10.9'
+    ss.tvos.deployment_target = '10.0'
+    ss.watchos.deployment_target = '4.0'
  end

  s.subspec 'Interface' do |ss|
@ -98,6 +103,11 @@ Pod::Spec.new do |s|
                      'src/objective-c/GRPCClient/version.h'

    ss.dependency "#{s.name}/Interface-Legacy", version
+
+    ss.ios.deployment_target = '7.0'
+    ss.osx.deployment_target = '10.9'
+    ss.tvos.deployment_target = '10.0'
+    ss.watchos.deployment_target = '4.0'
  end

  s.subspec 'GRPCCore' do |ss|
@ -131,6 +141,11 @@ Pod::Spec.new do |s|
    ss.dependency "#{s.name}/Interface", version
    ss.dependency 'gRPC-Core', version
    ss.dependency 'gRPC-RxLibrary', version
+
+    ss.ios.deployment_target = '7.0'
+    ss.osx.deployment_target = '10.9'
+    ss.tvos.deployment_target = '10.0'
+    ss.watchos.deployment_target = '4.0'
  end

  s.subspec 'GRPCCoreCronet' do |ss|
@ -142,10 +157,17 @@ Pod::Spec.new do |s|
    ss.dependency "#{s.name}/GRPCCore", version
    ss.dependency 'gRPC-Core/Cronet-Implementation', version
    ss.dependency 'CronetFramework'
+
+    ss.ios.deployment_target = '8.0'
  end

  # CFStream is now default. Leaving this subspec only for compatibility purpose.
  s.subspec 'CFStream' do |ss|
    ss.dependency "#{s.name}/GRPCCore", version
+
+    ss.ios.deployment_target = '7.0'
+    ss.osx.deployment_target = '10.9'
+    ss.tvos.deployment_target = '10.0'
+    ss.watchos.deployment_target = '4.0'
  end
 end
--- a/package.xml
+++ b/package.xml
@ -13,8 +13,8 @@
 <date>2018-01-19</date>
 <time>16:06:07</time>
 <version>
-  <release>1.24.0RC1</release>
-  <api>1.24.0RC1</api>
+  <release>1.24.0RC2</release>
+  <api>1.24.0RC2</api>
 </version>
 <stability>
  <release>beta</release>
--- 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.24.0-pre1"; }
+grpc::string Version() { return "1.24.0-pre2"; }
 }  // namespace grpc
--- a/src/csharp/Grpc.Core.Api/VersionInfo.cs
+++ b/src/csharp/Grpc.Core.Api/VersionInfo.cs
@ -38,6 +38,6 @@ namespace Grpc.Core
        /// <summary>
        /// Current version of gRPC C#
        /// </summary>
-        public const string CurrentVersion = "2.24.0-pre1";
+        public const string CurrentVersion = "2.24.0-pre2";
    }
 }
--- a/src/csharp/build/dependencies.props
+++ b/src/csharp/build/dependencies.props
@ -1,7 +1,7 @@
 <!-- This file is generated -->
 <Project>
  <PropertyGroup>
-    <GrpcCsharpVersion>2.24.0-pre1</GrpcCsharpVersion>
+    <GrpcCsharpVersion>2.24.0-pre2</GrpcCsharpVersion>
    <GoogleProtobufVersion>3.8.0</GoogleProtobufVersion>
  </PropertyGroup>
 </Project>
--- 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=2.24.0-pre1
+set VERSION=2.24.0-pre2

@rem Adjust the location of nuget.exe
 set NUGET=C:\nuget\nuget.exe
--- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
+++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.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-gRPCCppPlugin'
-  v = '1.24.0-pre1'
+  v = '1.24.0-pre2'
  s.version  = v
  s.summary  = 'The gRPC ProtoC plugin generates C++ files from .proto services.'
  s.description = <<-DESC
--- 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.24.0-pre1'
+  v = '1.24.0-pre2'
  s.version  = v
  s.summary  = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.'
  s.description = <<-DESC
@ -107,7 +107,12 @@ Pod::Spec.new do |s|
  s.ios.deployment_target = '7.0'
  s.osx.deployment_target = '10.9'
  s.tvos.deployment_target = '10.0'
-  s.watchos.deployment_target = '4.0'
+
+  # watchOS is disabled due to #20258.
+  # TODO (mxyan): Enable watchos when !ProtoCompiler.podspec is updated for
+  # support of watchos in the next release
+  # s.watchos.deployment_target = '4.0'
+
  # Restrict the gRPC runtime version to the one supported by this plugin.
  s.dependency 'gRPC-ProtoRPC', v

@ -116,6 +121,8 @@ Pod::Spec.new do |s|
  # present in this pod's directory. We use that knowledge to check for the existence of the file
  # and, if absent, compile the plugin from the local sources.
  s.prepare_command = <<-CMD
-    #{bazel} build //src/compiler:grpc_objective_c_plugin
+    if [ ! -f #{plugin} ]; then
+      #{bazel} build //src/compiler:grpc_objective_c_plugin
+    fi
  CMD
 end
--- a/src/objective-c/!ProtoCompiler.podspec
+++ b/src/objective-c/!ProtoCompiler.podspec
@ -123,6 +123,11 @@ Pod::Spec.new do |s|
  bazel = "#{repo_root}/tools/bazel"
  
  s.prepare_command = <<-CMD
-    #{bazel} build @com_google_protobuf//:protoc
+    if [ ! -f bin/protoc ]; then
+      #{bazel} build @com_google_protobuf//:protoc
+    else
+      mv bin/protoc .
+      mv include/google .
+    fi
  CMD
 end
--- a/src/objective-c/BoringSSL-GRPC.podspec
+++ b/src/objective-c/BoringSSL-GRPC.podspec
@ -39,7 +39,7 @@

 Pod::Spec.new do |s|
  s.name     = 'BoringSSL-GRPC'
-  version = '0.0.3'
+  version = '0.0.4'
  s.version  = version
  s.summary  = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
  # Adapted from the homepage:
--- a/src/objective-c/GRPCClient/version.h
+++ b/src/objective-c/GRPCClient/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.24.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.24.0-pre2"
--- 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.24.0-pre1"
+#define GRPC_OBJC_VERSION_STRING @"1.24.0-pre2"
 #define GRPC_C_VERSION_STRING @"8.0.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.24.0RC1"
+#define PHP_GRPC_VERSION "1.24.0RC2"

 #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.24.0rc1"""
+__version__ = """1.24.0rc2"""
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0.pre1'
+  VERSION = '1.24.0.pre2'
 end
--- a/src/ruby/tools/version.rb
+++ b/src/ruby/tools/version.rb
@ -14,6 +14,6 @@

 module GRPC
  module Tools
-    VERSION = '1.24.0.pre1'
+    VERSION = '1.24.0.pre2'
  end
 end
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@ -85,6 +85,7 @@
    s.source = {
      :git => 'https://github.com/grpc/grpc.git',
      :tag => "v#{version}",
+      :submodules => true,
    }

    # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024,
@ -171,10 +172,9 @@
      ss.header_mappings_dir = '.'
      ss.libraries = 'z'
      ss.dependency "#{s.name}/Interface", version
-      ss.dependency 'BoringSSL-GRPC', '0.0.3'
+      ss.dependency 'BoringSSL-GRPC', '0.0.4'
      ss.compiler_flags = '-DGRPC_SHADOW_BORINGSSL_SYMBOLS'

-      # To save you from scrolling, this is the last part of the podspec.
      ss.source_files = ${ruby_multiline_list(grpc_private_files(libs), 22)}

      ss.private_header_files = ${ruby_multiline_list(grpc_private_headers(libs), 30)}
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@ -34,11 +34,6 @@
      :tag => "v#{version}",
    }

-    s.ios.deployment_target = '7.0'
-    s.osx.deployment_target = '10.9'
-    s.tvos.deployment_target = '10.0'
-    s.watchos.deployment_target = '4.0'
-
    name = 'GRPCClient'
    s.module_name = name
    s.header_dir = name
@ -51,25 +46,35 @@
      'CLANG_WARN_STRICT_PROTOTYPES' => 'NO',
    }

+    s.ios.deployment_target = '7.0'
+    s.osx.deployment_target = '10.9'
+    s.tvos.deployment_target = '10.0'
+    s.watchos.deployment_target = '4.0'
+
    s.subspec 'Interface-Legacy' do |ss|
      ss.header_mappings_dir = 'src/objective-c/GRPCClient'

-      ss.public_header_files = "GRPCClient/GRPCCall+ChannelArg.h",
-                               "GRPCClient/GRPCCall+ChannelCredentials.h",
-                               "GRPCClient/GRPCCall+Cronet.h",
-                               "GRPCClient/GRPCCall+OAuth2.h",
-                               "GRPCClient/GRPCCall+Tests.h",
+      ss.public_header_files = "src/objective-c/GRPCClient/GRPCCall+ChannelArg.h",
+                               "src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h",
+                               "src/objective-c/GRPCClient/GRPCCall+Cronet.h",
+                               "src/objective-c/GRPCClient/GRPCCall+OAuth2.h",
+                               "src/objective-c/GRPCClient/GRPCCall+Tests.h",
                               "src/objective-c/GRPCClient/GRPCCallLegacy.h",
                               "src/objective-c/GRPCClient/GRPCTypes.h"

-      ss.source_files = "GRPCClient/GRPCCall+ChannelArg.h",
-                        "GRPCClient/GRPCCall+ChannelCredentials.h",
-                        "GRPCClient/GRPCCall+Cronet.h",
-                        "GRPCClient/GRPCCall+OAuth2.h",
-                        "GRPCClient/GRPCCall+Tests.h",
+      ss.source_files = "src/objective-c/GRPCClient/GRPCCall+ChannelArg.h",
+                        "src/objective-c/GRPCClient/GRPCCall+ChannelCredentials.h",
+                        "src/objective-c/GRPCClient/GRPCCall+Cronet.h",
+                        "src/objective-c/GRPCClient/GRPCCall+OAuth2.h",
+                        "src/objective-c/GRPCClient/GRPCCall+Tests.h",
                        "src/objective-c/GRPCClient/GRPCCallLegacy.h",
                        "src/objective-c/GRPCClient/GRPCTypes.h"
      ss.dependency "gRPC-RxLibrary/Interface", version
+
+      ss.ios.deployment_target = '7.0'
+      ss.osx.deployment_target = '10.9'
+      ss.tvos.deployment_target = '10.0'
+      ss.watchos.deployment_target = '4.0'
    end

    s.subspec 'Interface' do |ss|
@ -100,6 +105,11 @@
                        'src/objective-c/GRPCClient/version.h'

      ss.dependency "#{s.name}/Interface-Legacy", version
+
+      ss.ios.deployment_target = '7.0'
+      ss.osx.deployment_target = '10.9'
+      ss.tvos.deployment_target = '10.0'
+      ss.watchos.deployment_target = '4.0'
    end

    s.subspec 'GRPCCore' do |ss|
@ -133,6 +143,11 @@
      ss.dependency "#{s.name}/Interface", version
      ss.dependency 'gRPC-Core', version
      ss.dependency 'gRPC-RxLibrary', version
+
+      ss.ios.deployment_target = '7.0'
+      ss.osx.deployment_target = '10.9'
+      ss.tvos.deployment_target = '10.0'
+      ss.watchos.deployment_target = '4.0'
    end

    s.subspec 'GRPCCoreCronet' do |ss|
@ -144,10 +159,17 @@
      ss.dependency "#{s.name}/GRPCCore", version
      ss.dependency 'gRPC-Core/Cronet-Implementation', version
      ss.dependency 'CronetFramework'
+
+      ss.ios.deployment_target = '8.0'
    end

    # CFStream is now default. Leaving this subspec only for compatibility purpose.
    s.subspec 'CFStream' do |ss|
      ss.dependency "#{s.name}/GRPCCore", version
+
+      ss.ios.deployment_target = '7.0'
+      ss.osx.deployment_target = '10.9'
+      ss.tvos.deployment_target = '10.0'
+      ss.watchos.deployment_target = '4.0'
    end
  end
--- a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
+++ b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
@ -109,7 +109,12 @@
    s.ios.deployment_target = '7.0'
    s.osx.deployment_target = '10.9'
    s.tvos.deployment_target = '10.0'
-    s.watchos.deployment_target = '4.0'
+
+    # watchOS is disabled due to #20258.
+    # TODO (mxyan): Enable watchos when !ProtoCompiler.podspec is updated for
+    # support of watchos in the next release
+    # s.watchos.deployment_target = '4.0'
+
    # Restrict the gRPC runtime version to the one supported by this plugin.
    s.dependency 'gRPC-ProtoRPC', v

@ -118,6 +123,8 @@
    # present in this pod's directory. We use that knowledge to check for the existence of the file
    # and, if absent, compile the plugin from the local sources.
    s.prepare_command = <<-CMD
-      #{bazel} build //src/compiler:grpc_objective_c_plugin
+      if [ ! -f #{plugin} ]; then
+        #{bazel} build //src/compiler:grpc_objective_c_plugin
+      fi
    CMD
  end
--- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template
+++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template
@ -44,7 +44,7 @@

  Pod::Spec.new do |s|
    s.name     = 'BoringSSL-GRPC'
-    version = '0.0.3'
+    version = '0.0.4'
    s.version  = version
    s.summary  = 'BoringSSL is a fork of OpenSSL that is designed to meet Google\'s needs.'
    # Adapted from the homepage:
--- 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.24.0rc1'
+VERSION = '1.24.0rc2'
--- 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.24.0-pre1
+PROJECT_NUMBER         = 1.24.0-pre2

 # 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.24.0-pre1
+PROJECT_NUMBER         = 1.24.0-pre2

 # 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/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@ -1102,17 +1102,19 @@ class ObjCLanguage(object):
                    'EXAMPLE_PATH': 'src/objective-c/examples/tvOS-sample',
                    'FRAMEWORKS': 'NO'
                }))
-        out.append(
-            self.config.job_spec(
-                ['src/objective-c/tests/build_one_example_bazel.sh'],
-                timeout_seconds=20 * 60,
-                shortname='ios-buildtest-example-watchOS-sample',
-                cpu_cost=1e6,
-                environ={
-                    'SCHEME': 'watchOS-sample-WatchKit-App',
-                    'EXAMPLE_PATH': 'src/objective-c/examples/watchOS-sample',
-                    'FRAMEWORKS': 'NO'
-                }))
+        # Disabled due to #20258
+        # TODO (mxyan): Reenable this test when #20258 is resolved.
+        # out.append(
+        #     self.config.job_spec(
+        #         ['src/objective-c/tests/build_one_example_bazel.sh'],
+        #         timeout_seconds=20 * 60,
+        #         shortname='ios-buildtest-example-watchOS-sample',
+        #         cpu_cost=1e6,
+        #         environ={
+        #             'SCHEME': 'watchOS-sample-WatchKit-App',
+        #             'EXAMPLE_PATH': 'src/objective-c/examples/watchOS-sample',
+        #             'FRAMEWORKS': 'NO'
+        #         }))
        out.append(
            self.config.job_spec(
                ['src/objective-c/tests/run_plugin_tests.sh'],