diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-09-05 09:49:04 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-05 09:49:04 -0700 |
| commit | dfccd838ea55a3c02d95e7a0282aa17f8c9a084b (patch) | |
| tree | 3a9dfa41c0076f01d14bb5d357e3eddce90b21ff /src | |
| parent | 38b9a4d8cc6ca39b5dfd6e6dd4bfd828e27d5c58 (diff) | |
| parent | f0a6fd83294c854c9ecc38a7b4dd322811810dd5 (diff) | |
Merge pull request #12356 from muxi/port-v160
Aggregate port of PRs related to v1.6.0 release
Diffstat (limited to 'src')
| -rw-r--r-- | src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 | ||||
| -rw-r--r-- | src/objective-c/!ProtoCompiler.podspec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 3a282b0526..7d073c9a84 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.3.0' + s.dependency '!ProtoCompiler', '3.4.0' # For the Protobuf dependency not to complain: s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.9' diff --git a/src/objective-c/!ProtoCompiler.podspec b/src/objective-c/!ProtoCompiler.podspec index c3f95f9f42..25c437911f 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.3.0' + v = '3.4.0' s.version = v s.summary = 'The Protobuf Compiler (protoc) generates Objective-C files from .proto files' s.description = <<-DESC |