Commit 988dbba9 authored by Kyle Fuller's avatar Kyle Fuller

Merge pull request #3238 from CocoaPods/mr-swift-build-settings

Include Swift-specific build settings on target creation
parents f3ad3d7e bccdfe30
...@@ -6,6 +6,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -6,6 +6,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
## Master ## Master
[Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.21.2...master)
##### Enhancements ##### Enhancements
* Allows Swift pods to have a deployment target under iOS 8.0 if they use * Allows Swift pods to have a deployment target under iOS 8.0 if they use
...@@ -15,6 +17,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -15,6 +17,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Include Swift-specific build settings on target creation, i.e. disable optimizations
for debug configuration.
[Marius Rackwitz](https://github.com/mrackwitz)
[#3238](https://github.com/CocoaPods/CocoaPods/issues/3238)
* Only copy explicitly specified xcasset files into the bundle of the integrated target. * Only copy explicitly specified xcasset files into the bundle of the integrated target.
[Marius Rackwitz](https://github.com/mrackwitz) [Marius Rackwitz](https://github.com/mrackwitz)
[#3219](https://github.com/CocoaPods/CocoaPods/issues/3219) [#3219](https://github.com/CocoaPods/CocoaPods/issues/3219)
......
...@@ -24,7 +24,7 @@ GIT ...@@ -24,7 +24,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 7ff20c5e3637e9c53adca3546ca2715bf694f1c9 revision: d164f5531293692cc5304dd4cdcc1ed85c53da69
branch: master branch: master
specs: specs:
xcodeproj (0.22.0) xcodeproj (0.22.0)
......
...@@ -40,7 +40,8 @@ module Pod ...@@ -40,7 +40,8 @@ module Pod
name = target.label name = target.label
platform = target.platform.name platform = target.platform.name
deployment_target = target.platform.deployment_target.to_s deployment_target = target.platform.deployment_target.to_s
@native_target = project.new_target(product_type, name, platform, deployment_target) language = target.uses_swift? ? :swift : :objc
@native_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
product_name = target.product_name product_name = target.product_name
product = @native_target.product_reference product = @native_target.product_reference
......
...@@ -44,5 +44,17 @@ module Pod ...@@ -44,5 +44,17 @@ module Pod
@installer.send(:native_target).resolved_build_setting('OTHER_LDFLAGS').values.uniq.should == [''] @installer.send(:native_target).resolved_build_setting('OTHER_LDFLAGS').values.uniq.should == ['']
@installer.send(:native_target).resolved_build_setting('OTHER_LIBTOOLFLAGS').values.uniq.should == [''] @installer.send(:native_target).resolved_build_setting('OTHER_LIBTOOLFLAGS').values.uniq.should == ['']
end end
it 'adds Swift-specific build settings to the build settings' do
@pod_target.stubs(:requires_frameworks?).returns(true)
@pod_target.stubs(:uses_swift?).returns(true)
@installer.send(:add_target)
@installer.send(:native_target).resolved_build_setting('SWIFT_OPTIMIZATION_LEVEL').should == {
'Release' => nil,
'Debug' => '-Onone',
'Test' => nil,
'AppStore' => nil,
}
end
end end
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