Commit f7112a9e authored by Samuel E. Giddins's avatar Samuel E. Giddins

[Resolver] Sometimes multi-letter variable names are nice too

parent 05cbeb25
...@@ -55,7 +55,7 @@ module Pod ...@@ -55,7 +55,7 @@ module Pod
def resolve def resolve
dependencies = podfile.target_definition_list.flat_map do |target| dependencies = podfile.target_definition_list.flat_map do |target|
target.dependencies.each do |dep| target.dependencies.each do |dep|
@platforms_by_dependency[dep].<<(target.platform).uniq! @platforms_by_dependency[dep].push(target.platform).uniq!
end end
end end
@cached_sets = {} @cached_sets = {}
...@@ -418,7 +418,11 @@ module Pod ...@@ -418,7 +418,11 @@ module Pod
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| v.explicit_requirements.empty? }
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? { |pts| spec.available_platforms.select { |p| p.name == pts.name }.all? { |p| pts.supports?(p) } }
platforms_to_satisfy.all? do |platform_to_satisfy|
spec.available_platforms.select { |spec_platform| spec_platform.name == platform_to_satisfy.name }.
all? { |spec_platform| platform_to_satisfy.supports?(spec_platform) }
end
end end
# Returns the target-appropriate nodes that are `successors` of `node`, # Returns the target-appropriate nodes that are `successors` of `node`,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment