diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-02-09 13:57:11 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-02-09 13:57:11 -0800 |
| commit | aac5d4de5712f46f5db8bc3044ff13bf410119e7 (patch) | |
| tree | 821e1f4cfc200a9d31fa8af318dce0edcee19934 | |
| parent | e60d5ff875dfd14d6f34f0ca1ead79c8a8038830 (diff) | |
| parent | 0fccdb83273e3d876dfb5c03f548b9347f13dd83 (diff) | |
Merge pull request #9658 from muxi/port-9488
Resubmit: Port #9488 and part of #9463
| -rw-r--r-- | src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 | ||||
| -rw-r--r-- | src/objective-c/!ProtoCompiler.podspec | 2 | ||||
| -rw-r--r-- | templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 3429e2b29b..1a3b775c60 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -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' diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec index b55f6c93c6..dc4d8e964e 100644 --- a/src/objective-c/!ProtoCompiler.podspec +++ b/src/objective-c/!ProtoCompiler.podspec @@ -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 diff --git a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template index 80420af7db..3a10cfab3c 100644 --- a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template +++ b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template @@ -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' |