From 3d2081b09aa9a11a35ddc602ebf675b5c0f96443 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Tue, 31 Oct 2017 10:27:46 -0700 Subject: [PATCH] Require min Cocoapods version to be v1.2.0 --- gRPC-Core.podspec | 4 ++++ gRPC-ProtoRPC.podspec | 4 ++++ gRPC-RxLibrary.podspec | 4 ++++ gRPC.podspec | 4 ++++ src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 4 ++++ templates/gRPC-Core.podspec.template | 4 ++++ templates/gRPC-ProtoRPC.podspec.template | 4 ++++ templates/gRPC-RxLibrary.podspec.template | 4 ++++ templates/gRPC.podspec.template | 4 ++++ .../objective-c/!ProtoCompiler-gRPCPlugin.podspec.template | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 1c5864de64c..1479720a4bf 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -34,6 +34,10 @@ Pod::Spec.new do |s| :tag => "v#{version}", } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.9' s.requires_arc = false diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index db1e8db06c0..dcf9cceb0b0 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -28,6 +28,10 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index 36897790395..aad383ad193 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -28,6 +28,10 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/gRPC.podspec b/gRPC.podspec index 4c6cd3535f6..a9340e769e2 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -27,6 +27,10 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index 9065ab9f73e..cd83e866961 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -95,6 +95,10 @@ Pod::Spec.new do |s| # :sha1 => '??', } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + repo_root = '../..' plugin = 'grpc_objective_c_plugin' diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index c329d2dedc2..758ccc7da36 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -61,6 +61,10 @@ :tag => "v#{version}", } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.ios.deployment_target = '7.0' s.osx.deployment_target = '10.9' s.requires_arc = false diff --git a/templates/gRPC-ProtoRPC.podspec.template b/templates/gRPC-ProtoRPC.podspec.template index 4d99f6e19fc..bb6d7445e1b 100644 --- a/templates/gRPC-ProtoRPC.podspec.template +++ b/templates/gRPC-ProtoRPC.podspec.template @@ -30,6 +30,10 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/gRPC-RxLibrary.podspec.template b/templates/gRPC-RxLibrary.podspec.template index de4ee1e4385..42c50e5e632 100644 --- a/templates/gRPC-RxLibrary.podspec.template +++ b/templates/gRPC-RxLibrary.podspec.template @@ -30,6 +30,10 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template index 4b360cfb4c4..9d47aa95627 100644 --- a/templates/gRPC.podspec.template +++ b/templates/gRPC.podspec.template @@ -29,6 +29,10 @@ s.license = 'Apache License, Version 2.0' s.authors = { 'The gRPC contributors' => 'grpc-packages@google.com' } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + s.source = { :git => 'https://github.com/grpc/grpc.git', :tag => "v#{version}", diff --git a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template index 196c4054686..4af9dc5a8cc 100644 --- a/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template +++ b/templates/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec.template @@ -97,6 +97,10 @@ # :sha1 => '??', } + # gRPC podspecs depend on fix for https://github.com/CocoaPods/CocoaPods/issues/6024, + # which was released in Cocoapods v1.2.0. + s.cocoapods_version = '>= 1.2.0' + repo_root = '../..' plugin = 'grpc_objective_c_plugin'