Commit 88203873 authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #5704 from DanToml/dan_watchos_codesign

[Installer] Set codesigning identity for watchos/tvos
parents 793155cb 84899552
......@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Danielle Tomlinson](https://github.com/dantoml)
[#5491](https://github.com/CocoaPods/CocoaPods/issues/5491)
* Fix codesigning identity on watchOS and tvOS targets.
[Danielle Tomlinson](https://github.com/dantoml)
[#5686](https://github.com/CocoaPods/CocoaPods/issues/5686)
## 1.1.0.beta.1 (2016-07-11)
......
......@@ -51,7 +51,9 @@ module Pod
#
def custom_build_settings
settings = {
'CODE_SIGN_IDENTITY[sdk=appletvos*]' => '',
'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => '',
'CODE_SIGN_IDENTITY[sdk=watchos*]' => '',
'MACH_O_TYPE' => 'staticlib',
'OTHER_LDFLAGS' => '',
'OTHER_LIBTOOLFLAGS' => '',
......
......@@ -54,7 +54,11 @@ module Pod
settings['PRIVATE_HEADERS_FOLDER_PATH'] = ''
settings['PUBLIC_HEADERS_FOLDER_PATH'] = ''
end
settings['CODE_SIGN_IDENTITY[sdk=appletvos*]'] = ''
settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = ''
settings['CODE_SIGN_IDENTITY[sdk=watchos*]'] = ''
if target.swift_version
settings['SWIFT_VERSION'] = target.swift_version
end
......
Subproject commit ccba9c9c0e44b54dec59f414c24fea2634a5b757
Subproject commit 63ec1d3a180f130ca7e64660293b8d41dc41cba7
......@@ -90,6 +90,15 @@ module Pod
end
end
it 'sets an empty codesigning identity for iOS/tvOS/watchOS' do
@installer.install!
@project.targets.first.build_configurations.each do |config|
config.build_settings['CODE_SIGN_IDENTITY[sdk=appletvos*]'].should == ''
config.build_settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'].should == ''
config.build_settings['CODE_SIGN_IDENTITY[sdk=watchos*]'].should == ''
end
end
#--------------------------------------#
describe 'headers folder paths' do
......
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