Temporarily disable watchOS support for !ProtoCompiler-gRPCPlugin

pull/20280/head
Muxi Yan 5 years ago
parent 88cfae00be
commit 951f3d9603
  1. 9
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  2. 7
      src/objective-c/!ProtoCompiler.podspec
  3. 9
      templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template
  4. 24
      tools/run_tests/run_tests.py

@ -102,12 +102,17 @@ Pod::Spec.new do |s|
s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.8.1'
s.dependency '!ProtoCompiler', '3.8.0'
# For the Protobuf dependency not to complain:
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

@ -36,7 +36,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'
v = '3.8.1'
v = '3.8.0'
s.version = v
s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
s.description = <<-DESC
@ -99,10 +99,7 @@ Pod::Spec.new do |s|
repo = 'google/protobuf'
file = "protoc-#{v}-osx-x86_64.zip"
s.source = {
# TODO (mxyan): Restore the next line upon next minor version update
# :http => "https://github.com/#{repo}/releases/download/v#{v}/#{file}",
:http => "https://github.com/#{repo}/releases/download/v3.8.0/protoc-3.8.0-osx-x86_64.zip",
:http => "https://github.com/#{repo}/releases/download/v#{v}/#{file}",
# TODO(jcanizales): Add sha1 or sha256
# :sha1 => '??',
}

@ -104,12 +104,17 @@
s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.8.1'
s.dependency '!ProtoCompiler', '3.8.0'
# For the Protobuf dependency not to complain:
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

@ -1132,17 +1132,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'],

Loading…
Cancel
Save