Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
988dbba9
Commit
988dbba9
authored
Mar 09, 2015
by
Kyle Fuller
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3238 from CocoaPods/mr-swift-build-settings
Include Swift-specific build settings on target creation
parents
f3ad3d7e
bccdfe30
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
2 deletions
+22
-2
CHANGELOG.md
CHANGELOG.md
+7
-0
Gemfile.lock
Gemfile.lock
+1
-1
target_installer.rb
lib/cocoapods/installer/target_installer.rb
+2
-1
target_installer_spec.rb
spec/unit/installer/target_installer_spec.rb
+12
-0
No files found.
CHANGELOG.md
View file @
988dbba9
...
@@ -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
)
...
...
Gemfile.lock
View file @
988dbba9
...
@@ -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:
7ff20c5e3637e9c53adca3546ca2715bf694f1c
9
revision:
d164f5531293692cc5304dd4cdcc1ed85c53da6
9
branch: master
branch: master
specs:
specs:
xcodeproj (0.22.0)
xcodeproj (0.22.0)
...
...
lib/cocoapods/installer/target_installer.rb
View file @
988dbba9
...
@@ -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
...
...
spec/unit/installer/target_installer_spec.rb
View file @
988dbba9
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment