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
c5907978
Commit
c5907978
authored
Oct 08, 2014
by
Eloy Durán
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[UserProjectIntegrator] Config values are returned as arrays.
Fix for
52c2f915
.
parent
359e0aa9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
user_project_integrator.rb
lib/cocoapods/installer/user_project_integrator.rb
+1
-1
user_project_integrator_spec.rb
spec/unit/installer/user_project_integrator_spec.rb
+3
-3
No files found.
lib/cocoapods/installer/user_project_integrator.rb
View file @
c5907978
...
...
@@ -144,7 +144,7 @@ module Pod
if
xcconfig
xcconfig
.
to_hash
.
keys
.
each
do
|
key
|
target_value
=
config
.
build_settings
[
key
]
if
target_value
&&
target_value
!~
/\$[({]inherited[})]/
if
target_value
&&
target_value
.
grep
(
/\$[({]inherited[})]/
).
empty?
print_override_warning
(
aggregate_target
,
user_target
,
config
,
key
)
end
end
...
...
spec/unit/installer/user_project_integrator_spec.rb
View file @
c5907978
...
...
@@ -57,7 +57,7 @@ module Pod
it
'check that the integrated target does not override the CocoaPods build settings'
do
UI
.
warnings
=
''
target_config
=
stub
(
:name
=>
'Release'
,
:build_settings
=>
{
'GCC_PREPROCESSOR_DEFINITIONS'
=>
'FLAG=1'
})
target_config
=
stub
(
:name
=>
'Release'
,
:build_settings
=>
{
'GCC_PREPROCESSOR_DEFINITIONS'
=>
[
'FLAG=1'
]
})
user_target
=
stub
(
:name
=>
'SampleProject'
,
:build_configurations
=>
[
target_config
])
@library
.
stubs
(
:user_targets
).
returns
([
user_target
])
...
...
@@ -72,7 +72,7 @@ module Pod
it
'allows the use of the alternate form of the inherited flag'
do
UI
.
warnings
=
''
target_config
=
stub
(
:name
=>
'Release'
,
:build_settings
=>
{
'GCC_PREPROCESSOR_DEFINITIONS'
=>
'FLAG=1 ${inherited}'
})
target_config
=
stub
(
:name
=>
'Release'
,
:build_settings
=>
{
'GCC_PREPROCESSOR_DEFINITIONS'
=>
[
'FLAG=1'
,
'${inherited}'
]
})
user_target
=
stub
(
:name
=>
'SampleProject'
,
:build_configurations
=>
[
target_config
])
@library
.
stubs
(
:user_targets
).
returns
([
user_target
])
...
...
@@ -86,7 +86,7 @@ module Pod
it
'allows build settings which inherit the settings form the CocoaPods xcconfig'
do
UI
.
warnings
=
''
target_config
=
stub
(
:name
=>
'Release'
,
:build_settings
=>
{
'GCC_PREPROCESSOR_DEFINITIONS'
=>
'FLAG=1 $(inherited)'
})
target_config
=
stub
(
:name
=>
'Release'
,
:build_settings
=>
{
'GCC_PREPROCESSOR_DEFINITIONS'
=>
[
'FLAG=1'
,
'$(inherited)'
]
})
user_target
=
stub
(
:name
=>
'SampleProject'
,
:build_configurations
=>
[
target_config
])
@library
.
stubs
(
:user_targets
).
returns
([
user_target
])
...
...
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