Commit 04a17d3e authored by Samuel Giddins's avatar Samuel Giddins

Address PR comments

parent 8e366436
...@@ -66,8 +66,8 @@ module Pod ...@@ -66,8 +66,8 @@ module Pod
# @param [Lockfile] lockfile @see #lockfile # @param [Lockfile] lockfile @see #lockfile
# #
def initialize(sandbox, podfile, lockfile = nil) def initialize(sandbox, podfile, lockfile = nil)
@sandbox = sandbox || raise(ArgumentError, 'need a sandbox') @sandbox = sandbox || raise(ArgumentError, 'Missing required argument `sandbox`')
@podfile = podfile || raise(ArgumentError, 'need a podfile') @podfile = podfile || raise(ArgumentError, 'Missing required argument `podfile`')
@lockfile = lockfile @lockfile = lockfile
@use_default_plugins = true @use_default_plugins = true
......
...@@ -139,7 +139,7 @@ module Pod ...@@ -139,7 +139,7 @@ module Pod
resolver_specs_by_target[target] = vertices. resolver_specs_by_target[target] = vertices.
map do |vertex| map do |vertex|
payload = vertex.payload payload = vertex.payload
test_only = vertex.recursive_predecessors.all? { |v| !v.root? || v.payload.test_specification? } && (!vertex.root? || payload.test_specification?) test_only = (!vertex.root? || payload.test_specification?) && vertex.recursive_predecessors.all? { |v| !v.root? || v.payload.test_specification? }
spec_source = payload.respond_to?(:spec_source) && payload.spec_source spec_source = payload.respond_to?(:spec_source) && payload.spec_source
ResolverSpecification.new(payload, test_only, spec_source) ResolverSpecification.new(payload, test_only, spec_source)
end. end.
...@@ -535,7 +535,9 @@ module Pod ...@@ -535,7 +535,9 @@ module Pod
# #
# @return [Bool] # @return [Bool]
def spec_is_platform_compatible?(dependency_graph, dependency, spec) def spec_is_platform_compatible?(dependency_graph, dependency, spec)
return true if locked_dependencies.vertex_named(spec.name) # HACK: this probably isn't safe? # This is safe since a pod will only be in locked dependencies if we're
# using the same exact version
return true if locked_dependencies.vertex_named(spec.name)
vertex = dependency_graph.vertex_named(dependency.name) vertex = dependency_graph.vertex_named(dependency.name)
predecessors = vertex.recursive_predecessors.select(&:root?) predecessors = vertex.recursive_predecessors.select(&:root?)
......
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