Commit a804ff01 authored by Danielle Tomlinson's avatar Danielle Tomlinson

[Installer] Set codesign identity for watchos/tvos

parent 793155cb
...@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Danielle Tomlinson](https://github.com/dantoml) [Danielle Tomlinson](https://github.com/dantoml)
[#5491](https://github.com/CocoaPods/CocoaPods/issues/5491) [#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) ## 1.1.0.beta.1 (2016-07-11)
......
...@@ -51,13 +51,15 @@ module Pod ...@@ -51,13 +51,15 @@ module Pod
# #
def custom_build_settings def custom_build_settings
settings = { settings = {
'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => '', 'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => '',
'MACH_O_TYPE' => 'staticlib', 'CODE_SIGN_IDENTITY[sdk=watchos*]' => '',
'OTHER_LDFLAGS' => '', 'CODE_SIGN_IDENTITY[sdk=appletvos*]' => '',
'OTHER_LIBTOOLFLAGS' => '', 'MACH_O_TYPE' => 'staticlib',
'PODS_ROOT' => '$(SRCROOT)', 'OTHER_LDFLAGS' => '',
'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}', 'OTHER_LIBTOOLFLAGS' => '',
'SKIP_INSTALL' => 'YES', 'PODS_ROOT' => '$(SRCROOT)',
'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
'SKIP_INSTALL' => 'YES',
} }
super.merge(settings) super.merge(settings)
end end
......
...@@ -54,7 +54,11 @@ module Pod ...@@ -54,7 +54,11 @@ module Pod
settings['PRIVATE_HEADERS_FOLDER_PATH'] = '' settings['PRIVATE_HEADERS_FOLDER_PATH'] = ''
settings['PUBLIC_HEADERS_FOLDER_PATH'] = '' settings['PUBLIC_HEADERS_FOLDER_PATH'] = ''
end end
settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = '' settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = ''
settings['CODE_SIGN_IDENTITY[sdk=watchos*]'] = ''
settings['CODE_SIGN_IDENTITY[sdk=appletvos*]'] = ''
if target.swift_version if target.swift_version
settings['SWIFT_VERSION'] = target.swift_version settings['SWIFT_VERSION'] = target.swift_version
end end
......
...@@ -90,6 +90,15 @@ module Pod ...@@ -90,6 +90,15 @@ module Pod
end end
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=iphoneos*]'].should == ''
config.build_settings['CODE_SIGN_IDENTITY[sdk=watchos*]'].should == ''
config.build_settings['CODE_SIGN_IDENTITY[sdk=appletvos*]'].should == ''
end
end
#--------------------------------------# #--------------------------------------#
describe 'headers folder paths' do 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