Commit 6912516c authored by Danielle Tomlinson's avatar Danielle Tomlinson Committed by GitHub

Merge pull request #5645 from pcantrell/macos-lint-code-signing-fix

Fix for lint codesign failure on macOS projects
parents 1db1c555 5ee46cc9
......@@ -30,6 +30,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
* Remove the `const_missing` hack for `Pod::SourcesManager`.
[Samuel Giddins](https://github.com/segiddins)
* Fixed code signing issue causing lint failure on macOS.
[Paul Cantrell](https://github.com/pcantrell)
[#5645](https://github.com/CocoaPods/CocoaPods/issues/5645)
## 1.2.0.beta.1 (2016-10-28)
......
......@@ -766,6 +766,8 @@ module Pod
require 'fourflusher'
command = ['clean', 'build', '-workspace', File.join(validation_dir, 'App.xcworkspace'), '-scheme', 'App', '-configuration', 'Release']
case consumer.platform_name
when :osx, :macos
command += %w(CODE_SIGN_IDENTITY=)
when :ios
command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
......
......@@ -435,7 +435,8 @@ module Pod
Executable.stubs(:capture_command).with('git', ['config', '--get', 'remote.origin.url'], :capture => :out).returns(['https://github.com/CocoaPods/Specs.git'])
Executable.stubs(:which).with(:xcrun)
command = ['clean', 'build', '-workspace', File.join(validator.validation_dir, 'App.xcworkspace'), '-scheme', 'App', '-configuration', 'Release']
Executable.expects(:capture_command).with('xcodebuild', command, :capture => :merge).once.returns(['', stub(:success? => true)])
args = %w(CODE_SIGN_IDENTITY=)
Executable.expects(:capture_command).with('xcodebuild', command + args, :capture => :merge).once.returns(['', stub(:success? => true)])
args = %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator) + Fourflusher::SimControl.new.destination('Apple TV 1080p')
Executable.expects(:capture_command).with('xcodebuild', command + args, :capture => :merge).once.returns(['', stub(:success? => true)])
args = %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator) + Fourflusher::SimControl.new.destination('iPhone 4s')
......
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