Commit 03ab3a34 authored by Boris Bügling's avatar Boris Bügling Committed by GitHub

Merge pull request #5529 from CocoaPods/xcode-8-fix-linting

Fix linting with Xcode 8
parents 21d540ef f2d79328
......@@ -55,6 +55,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Samuel Giddins](https://github.com/)
[#5541](https://github.com/CocoaPods/CocoaPods/issues/5541)
* Fix linting with Xcode 8.
[Boris Bügling](https://github.com/neonichu)
[#5529](https://github.com/CocoaPods/CocoaPods/issues/5529)
## 1.0.1 (2016-06-02)
......
......@@ -107,7 +107,7 @@ PATH
cocoapods-try (>= 1.0.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 0.3.0)
fourflusher (~> 1.0.1)
molinillo (~> 0.5.0)
nap (~> 1.0)
xcodeproj (>= 1.1.0, < 2.0)
......@@ -149,7 +149,7 @@ GEM
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.6)
fourflusher (0.3.1)
fourflusher (1.0.1)
fuzzy_match (2.0.4)
git (1.3.0)
i18n (0.7.0)
......
......@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'activesupport', '>= 4.0.2'
s.add_runtime_dependency 'colored', '~> 1.2'
s.add_runtime_dependency 'escape', '~> 0.0.4'
s.add_runtime_dependency 'fourflusher', '~> 0.3.0'
s.add_runtime_dependency 'fourflusher', '~> 1.0.1'
s.add_runtime_dependency 'nap', '~> 1.0'
s.add_development_dependency 'bacon', '~> 1.1'
......
......@@ -722,13 +722,13 @@ module Pod
case consumer.platform_name
when :ios
command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
command += Fourflusher::SimControl.new.destination('iPhone 4s', deployment_target)
command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
when :watchos
command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
command += Fourflusher::SimControl.new.destination('Apple Watch - 38mm', deployment_target)
command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)
when :tvos
command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
command += Fourflusher::SimControl.new.destination('Apple TV 1080p', deployment_target)
command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
end
output, status = Dir.chdir(validation_dir) { _xcodebuild(command) }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment