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
33451521
Commit
33451521
authored
May 27, 2016
by
Peter Ryszkiewicz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added unit tests and modified code according to comments.
parent
2e32fdc1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+1
-1
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+28
-0
No files found.
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
33451521
...
@@ -284,7 +284,7 @@ module Pod
...
@@ -284,7 +284,7 @@ module Pod
def
self
.
add_language_specific_settings
(
target
,
xcconfig
)
def
self
.
add_language_specific_settings
(
target
,
xcconfig
)
if
target
.
uses_swift?
if
target
.
uses_swift?
other_swift_flags
=
[
'$(inherited)'
,
quote
(
%w(-D COCOAPODS)
)]
other_swift_flags
=
[
'$(inherited)'
,
quote
(
%w(-D COCOAPODS)
)]
other_swift_flags
+=
[
quote
(
%w(-suppress-warnings)
)]
if
target
.
try
(
:inhibit_warnings?
)
other_swift_flags
<<
quote
(
%w(-suppress-warnings)
)
if
target
.
try
(
:inhibit_warnings?
)
build_settings
=
{
'OTHER_SWIFT_FLAGS'
=>
other_swift_flags
.
join
(
' '
)
}
build_settings
=
{
'OTHER_SWIFT_FLAGS'
=>
other_swift_flags
.
join
(
' '
)
}
xcconfig
.
merge!
(
build_settings
)
xcconfig
.
merge!
(
build_settings
)
end
end
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
33451521
...
@@ -194,6 +194,34 @@ module Pod
...
@@ -194,6 +194,34 @@ module Pod
end
end
#---------------------------------------------------------------------#
#---------------------------------------------------------------------#
describe
'::add_language_specific_settings'
do
it
'does not add OTHER_SWIFT_FLAGS to the xcconfig if the target does not use swift'
do
target
=
stub
(
:uses_swift?
=>
false
)
xcconfig
=
Xcodeproj
::
Config
.
new
()
@sut
.
add_language_specific_settings
(
target
,
xcconfig
)
other_swift_flags
=
xcconfig
.
to_hash
[
'OTHER_SWIFT_FLAGS'
]
other_swift_flags
.
should
==
nil
end
it
'does not add the -suppress-warnings flag to the xcconfig if the target uses swift, but does not inhibit warnings'
do
target
=
stub
(
:uses_swift?
=>
true
,
:inhibit_warnings?
=>
false
)
xcconfig
=
Xcodeproj
::
Config
.
new
()
@sut
.
add_language_specific_settings
(
target
,
xcconfig
)
other_swift_flags
=
xcconfig
.
to_hash
[
'OTHER_SWIFT_FLAGS'
]
other_swift_flags
.
should
.
not
.
include?
(
'-suppress-warnings'
)
end
it
'adds the -suppress-warnings flag to the xcconfig if the target uses swift and inhibits warnings'
do
target
=
stub
(
:uses_swift?
=>
true
,
:inhibit_warnings?
=>
true
)
xcconfig
=
Xcodeproj
::
Config
.
new
()
@sut
.
add_language_specific_settings
(
target
,
xcconfig
)
other_swift_flags
=
xcconfig
.
to_hash
[
'OTHER_SWIFT_FLAGS'
]
other_swift_flags
.
should
.
include?
(
'-suppress-warnings'
)
end
end
#---------------------------------------------------------------------#
end
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