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
8f12b207
Commit
8f12b207
authored
Jul 27, 2016
by
arida
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for
https://github.com/CocoaPods/CocoaPods/pull/5578
parent
8135b8c1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
15 deletions
+11
-15
resolver.rb
lib/cocoapods/resolver.rb
+11
-15
No files found.
lib/cocoapods/resolver.rb
View file @
8f12b207
...
@@ -473,24 +473,20 @@ module Pod
...
@@ -473,24 +473,20 @@ module Pod
# dependencies for `target`.
# dependencies for `target`.
#
#
def
valid_dependencies_for_target_from_node
(
target
,
dependencies
,
node
)
def
valid_dependencies_for_target_from_node
(
target
,
dependencies
,
node
)
cache_dependency
=
dependencies
[
node
.
name
]
dependencies
[
node
.
name
]
||=
begin
validate_platform
(
node
.
payload
,
target
)
dependency_nodes
=
node
.
outgoing_edges
.
select
do
|
edge
|
edge_is_valid_for_target?
(
edge
,
target
)
end
.
map
(
&
:destination
)
if
cache_dependency
dependency_nodes
+
dependency_nodes
.
flat_map
do
|
item
|
return
cache_dependency
node_result
=
valid_dependencies_for_target_from_node
(
target
,
dependencies
,
item
)
end
validate_platform
(
node
.
payload
,
target
)
dependency_nodes
=
node
.
outgoing_edges
.
select
do
|
edge
|
edge_is_valid_for_target?
(
edge
,
target
)
end
.
map
(
&
:destination
)
dependency_nodes
+
dependency_nodes
.
flat_map
do
|
item
|
node_result
=
valid_dependencies_for_target_from_node
(
target
,
dependencies
,
item
)
dependencies
[
item
.
name
]
=
node_result
node_result
end
node_result
end
end
dependencies
[
node
.
name
]
end
end
# Whether the given `edge` should be followed to find dependencies for the
# Whether the given `edge` should be followed to find dependencies for the
...
...
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