Merge pull request #9658 from muxi/port-9488

Resubmit: Port #9488 and part of #9463
reviewable/pr9660/r1
Muxi Yan 8 years ago committed by GitHub
commit aac5d4de57
  1. 2
      src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
  2. 2
      src/objective-c/!ProtoCompiler.podspec
  3. 2
      templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template

@ -101,7 +101,7 @@ Pod::Spec.new do |s|
s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.0.2'
s.dependency '!ProtoCompiler', '3.1.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9'

@ -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.0.2'
v = '3.1.0'
s.version = v
s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files'
s.description = <<-DESC

@ -103,7 +103,7 @@
s.preserve_paths = plugin
# Restrict the protoc version to the one supported by this plugin.
s.dependency '!ProtoCompiler', '3.0.2'
s.dependency '!ProtoCompiler', '3.1.0'
# For the Protobuf dependency not to complain:
s.ios.deployment_target = '7.1'
s.osx.deployment_target = '10.9'

Loading…
Cancel
Save