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
142b23c3
Commit
142b23c3
authored
May 09, 2015
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] AggregateTargets can share the same PodTargets
parent
8062c2ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
installer.rb
lib/cocoapods/installer.rb
+7
-5
No files found.
lib/cocoapods/installer.rb
View file @
142b23c3
...
@@ -179,7 +179,7 @@ module Pod
...
@@ -179,7 +179,7 @@ module Pod
# generated as result of the analyzer.
# generated as result of the analyzer.
#
#
def
pod_targets
def
pod_targets
aggregate_targets
.
map
(
&
:pod_targets
).
flatten
aggregate_targets
.
map
(
&
:pod_targets
).
flatten
.
uniq
end
end
# @return [Array<Specification>] The specifications that where installed.
# @return [Array<Specification>] The specifications that where installed.
...
@@ -212,9 +212,11 @@ module Pod
...
@@ -212,9 +212,11 @@ module Pod
# @raise If an unknown user configuration is found.
# @raise If an unknown user configuration is found.
#
#
def
validate_build_configurations
def
validate_build_configurations
whitelisted_configs
=
pod_targets
.
map
do
|
target
|
whitelisted_configs
=
pod_targets
.
target
.
target_definition
.
all_whitelisted_configurations
.
map
(
&
:downcase
)
flat_map
(
&
:target_definitions
).
end
.
flatten
.
uniq
flat_map
(
&
:all_whitelisted_configurations
).
map
(
&
:downcase
).
uniq
all_user_configurations
=
analysis_result
.
all_user_build_configurations
.
keys
.
map
(
&
:downcase
)
all_user_configurations
=
analysis_result
.
all_user_build_configurations
.
keys
.
map
(
&
:downcase
)
remainder
=
whitelisted_configs
-
all_user_configurations
remainder
=
whitelisted_configs
-
all_user_configurations
...
@@ -537,7 +539,7 @@ module Pod
...
@@ -537,7 +539,7 @@ module Pod
def
install_libraries
def
install_libraries
UI
.
message
'- Installing targets'
do
UI
.
message
'- Installing targets'
do
pod_targets
.
sort_by
(
&
:name
).
each
do
|
pod_target
|
pod_targets
.
sort_by
(
&
:name
).
each
do
|
pod_target
|
next
if
pod_target
.
target_definition
.
dependencies
.
empty?
next
if
pod_target
.
target_definition
s
.
flat_map
(
&
:dependencies
)
.
empty?
target_installer
=
PodTargetInstaller
.
new
(
sandbox
,
pod_target
)
target_installer
=
PodTargetInstaller
.
new
(
sandbox
,
pod_target
)
target_installer
.
install!
target_installer
.
install!
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