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
3424bef1
Commit
3424bef1
authored
Aug 10, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AggregateXCConfig] Rename var to represent that values are grouped by consumer
parent
dab2e9f9
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+4
-4
No files found.
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
3424bef1
...
@@ -224,14 +224,14 @@ module Pod
...
@@ -224,14 +224,14 @@ module Pod
#
#
def
merged_user_target_xcconfigs
def
merged_user_target_xcconfigs
settings
=
user_target_xcconfig_values_by_consumer_by_key
settings
=
user_target_xcconfig_values_by_consumer_by_key
settings
.
each_with_object
({})
do
|
(
key
,
values_by_
target
),
xcconfig
|
settings
.
each_with_object
({})
do
|
(
key
,
values_by_
consumer
),
xcconfig
|
uniq_values
=
values_by_
target
.
values
.
uniq
uniq_values
=
values_by_
consumer
.
values
.
uniq
values_are_bools
=
uniq_values
.
all?
{
|
v
|
v
=~
/(yes|no)/i
}
values_are_bools
=
uniq_values
.
all?
{
|
v
|
v
=~
/(yes|no)/i
}
if
values_are_bools
if
values_are_bools
# Boolean build settings
# Boolean build settings
if
uniq_values
.
count
>
1
if
uniq_values
.
count
>
1
UI
.
warn
'Can\'t merge user_target_xcconfig for pod targets: '
\
UI
.
warn
'Can\'t merge user_target_xcconfig for pod targets: '
\
"
#{
values_by_
target
.
keys
.
map
(
&
:name
)
}
. Boolean build "
\
"
#{
values_by_
consumer
.
keys
.
map
(
&
:name
)
}
. Boolean build "
\
"setting
#{
key
}
has different values."
"setting
#{
key
}
has different values."
else
else
xcconfig
[
key
]
=
uniq_values
.
first
xcconfig
[
key
]
=
uniq_values
.
first
...
@@ -243,7 +243,7 @@ module Pod
...
@@ -243,7 +243,7 @@ module Pod
# Singular build settings
# Singular build settings
if
uniq_values
.
count
>
1
if
uniq_values
.
count
>
1
UI
.
warn
'Can\'t merge user_target_xcconfig for pod targets: '
\
UI
.
warn
'Can\'t merge user_target_xcconfig for pod targets: '
\
"
#{
values_by_
target
.
keys
.
map
(
&
:name
)
}
. Singular build "
\
"
#{
values_by_
consumer
.
keys
.
map
(
&
:name
)
}
. Singular build "
\
"setting
#{
key
}
has different values."
"setting
#{
key
}
has different values."
else
else
xcconfig
[
key
]
=
uniq_values
.
first
xcconfig
[
key
]
=
uniq_values
.
first
...
...
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