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
6fc159de
Commit
6fc159de
authored
Aug 28, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Resolver] Allow platform detection to work for nested dependencies
parent
d7ca4c95
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+1
-1
resolver.rb
lib/cocoapods/resolver.rb
+2
-2
No files found.
lib/cocoapods/installer/analyzer.rb
View file @
6fc159de
...
@@ -537,7 +537,7 @@ module Pod
...
@@ -537,7 +537,7 @@ module Pod
end
end
specs_by_target
=
nil
specs_by_target
=
nil
UI
.
section
"Resolving dependencies of
#{
UI
.
path
podfile
.
defined_in_file
}
"
do
UI
.
section
"Resolving dependencies of
#{
UI
.
path
(
podfile
.
defined_in_file
)
||
'Podfile'
}
"
do
resolver
=
Resolver
.
new
(
sandbox
,
podfile
,
locked_dependencies
,
sources
)
resolver
=
Resolver
.
new
(
sandbox
,
podfile
,
locked_dependencies
,
sources
)
specs_by_target
=
resolver
.
resolve
specs_by_target
=
resolver
.
resolve
specs_by_target
.
values
.
flatten
(
1
).
each
(
&
:validate_cocoapods_version
)
specs_by_target
.
values
.
flatten
(
1
).
each
(
&
:validate_cocoapods_version
)
...
...
lib/cocoapods/resolver.rb
View file @
6fc159de
...
@@ -409,10 +409,10 @@ module Pod
...
@@ -409,10 +409,10 @@ module Pod
def
spec_is_platform_compatible?
(
dependency_graph
,
dependency
,
spec
)
def
spec_is_platform_compatible?
(
dependency_graph
,
dependency
,
spec
)
all_predecessors
=
->
(
vertex
)
do
all_predecessors
=
->
(
vertex
)
do
pred
=
vertex
.
predecessors
pred
=
vertex
.
predecessors
pred
+
pred
.
map
(
&
all_predecessors
).
reduce
(
Set
.
new
,
&
:
&
)
<<
vertex
pred
+
pred
.
map
(
&
all_predecessors
).
reduce
(
Set
.
new
,
&
:
|
)
<<
vertex
end
end
vertex
=
dependency_graph
.
vertex_named
(
dependency
.
name
)
vertex
=
dependency_graph
.
vertex_named
(
dependency
.
name
)
predecessors
=
all_predecessors
[
vertex
].
reject
{
|
v
|
v
.
explicit_requirements
.
empty?
}
predecessors
=
all_predecessors
[
vertex
].
reject
{
|
v
|
!
dependency_graph
.
root_vertex_named
(
v
.
name
)
}
platforms_to_satisfy
=
predecessors
.
flat_map
(
&
:explicit_requirements
).
flat_map
{
|
r
|
@platforms_by_dependency
[
r
]
}
platforms_to_satisfy
=
predecessors
.
flat_map
(
&
:explicit_requirements
).
flat_map
{
|
r
|
@platforms_by_dependency
[
r
]
}
platforms_to_satisfy
.
all?
do
|
platform_to_satisfy
|
platforms_to_satisfy
.
all?
do
|
platform_to_satisfy
|
...
...
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