Commit 54b68130 authored by Boris Bügling's avatar Boris Bügling Committed by Samuel Giddins

Fix lint in Xcode 7.2, it requires `-destination`

While `watchos` and `tvos` are fairly straightforward, I chose iPhone 4s
as destination for `ios` since it is seems like the most likely to
work with any version of Xcode at this point.
parent 13b78034
...@@ -699,11 +699,11 @@ module Pod ...@@ -699,11 +699,11 @@ module Pod
command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release) command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
case consumer.platform_name case consumer.platform_name
when :ios when :ios
command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator) command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator) + ['-destination', 'name=iPhone 4s']
when :watchos when :watchos
command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator) command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator) + ['-destination', 'name=Apple Watch - 38mm']
when :tvos when :tvos
command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator) command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator) + ['-destination', 'name=Apple TV 1080p']
end end
output, status = Dir.chdir(validation_dir) { _xcodebuild(command) } output, status = Dir.chdir(validation_dir) { _xcodebuild(command) }
......
...@@ -418,9 +418,9 @@ module Pod ...@@ -418,9 +418,9 @@ module Pod
Executable.expects(:which).with('xcodebuild').times(4).returns('/usr/bin/xcodebuild') Executable.expects(:which).with('xcodebuild').times(4).returns('/usr/bin/xcodebuild')
command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release) command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
Executable.expects(:capture_command).with('xcodebuild', command, :capture => :merge).once.returns(['', stub(:success? => true)]) Executable.expects(:capture_command).with('xcodebuild', command, :capture => :merge).once.returns(['', stub(:success? => true)])
Executable.expects(:capture_command).with('xcodebuild', command + %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator), :capture => :merge).once.returns(['', stub(:success? => true)]) Executable.expects(:capture_command).with('xcodebuild', command + %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator) + ['-destination', 'name=Apple TV 1080p'], :capture => :merge).once.returns(['', stub(:success? => true)])
Executable.expects(:capture_command).with('xcodebuild', command + %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator), :capture => :merge).once.returns(['', stub(:success? => true)]) Executable.expects(:capture_command).with('xcodebuild', command + %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator) + ['-destination', 'name=iPhone 4s'], :capture => :merge).once.returns(['', stub(:success? => true)])
Executable.expects(:capture_command).with('xcodebuild', command + %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator), :capture => :merge).once.returns(['', stub(:success? => true)]) Executable.expects(:capture_command).with('xcodebuild', command + %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator) + ['-destination', 'name=Apple Watch - 38mm'], :capture => :merge).once.returns(['', stub(:success? => true)])
validator.validate validator.validate
end end
......
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