Commit 3479d34e authored by Boris Bügling's avatar Boris Bügling

Merge pull request #4130 from toto/bugfix/watchos-validation

[Validator] build watchOS pods against watchossimulator for validation 🌈
parents 34156c09 c0781504
...@@ -4,6 +4,15 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides ...@@ -4,6 +4,15 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
To install release candidates run `[sudo] gem install cocoapods --pre` To install release candidates run `[sudo] gem install cocoapods --pre`
## Master
##### Bug Fixes
* Use watchsimulator when validatng PodSpecs with watchOS compatibility.
[Thomas Kollbach](https://github.com/toto)
[#4130](https://github.com/CocoaPods/CocoaPods/issues/4130)
## 0.39.0.beta.4 (2015-09-02) ## 0.39.0.beta.4 (2015-09-02)
##### Bug Fixes ##### Bug Fixes
......
...@@ -609,7 +609,14 @@ module Pod ...@@ -609,7 +609,14 @@ module Pod
# #
def xcodebuild def xcodebuild
command = 'xcodebuild clean build -target Pods' command = 'xcodebuild clean build -target Pods'
command << ' CODE_SIGN_IDENTITY=- -sdk iphonesimulator' if consumer.platform_name == :ios
case consumer.platform_name
when :ios
command << ' CODE_SIGN_IDENTITY=- -sdk iphonesimulator'
when :watchos
command << ' CODE_SIGN_IDENTITY=- -sdk watchsimulator'
end
output, status = _xcodebuild "#{command} 2>&1" output, status = _xcodebuild "#{command} 2>&1"
unless status.success? unless status.success?
......
...@@ -404,8 +404,9 @@ module Pod ...@@ -404,8 +404,9 @@ module Pod
Executable.stubs(:which).with('git').returns(git) Executable.stubs(:which).with('git').returns(git)
Executable.expects(:which).with('xcodebuild').times(3).returns('/usr/bin/xcodebuild') Executable.expects(:which).with('xcodebuild').times(3).returns('/usr/bin/xcodebuild')
command = 'xcodebuild clean build -target Pods' command = 'xcodebuild clean build -target Pods'
validator.expects(:`).with("#{command} 2>&1").twice.returns('') validator.expects(:`).with("#{command} 2>&1").once.returns('')
validator.expects(:`).with("#{command} CODE_SIGN_IDENTITY=- -sdk iphonesimulator 2>&1").once.returns('') validator.expects(:`).with("#{command} CODE_SIGN_IDENTITY=- -sdk iphonesimulator 2>&1").once.returns('')
validator.expects(:`).with("#{command} CODE_SIGN_IDENTITY=- -sdk watchsimulator 2>&1").once.returns('')
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