Commit b568f82b authored by Fabio Pelosin's avatar Fabio Pelosin

[Specification] Inherith dependencies from the parent.

parent 65221133
...@@ -264,9 +264,17 @@ module Pod ...@@ -264,9 +264,17 @@ module Pod
dep dep
end end
def external_dependencies
result = @dependencies[active_platform] || []
result += parent.external_dependencies if parent
result
end
def dependencies def dependencies
raise Informative, "#{self.inspect}#dependencies not activated for a platform before consumption." unless active_platform raise Informative, "#{self.inspect}#dependencies not activated for a platform before consumption." unless active_platform
@dependencies[active_platform] + subspecs.map { |s| Dependency.new(s.name, version) } result = @dependencies[active_platform] + subspecs.map { |s| Dependency.new(s.name, version) }
result += parent.external_dependencies if parent
result
end end
# TODO: make top level? # TODO: make top level?
...@@ -403,11 +411,11 @@ module Pod ...@@ -403,11 +411,11 @@ module Pod
end end
def dependency_by_top_level_spec_name(name) def dependency_by_top_level_spec_name(name)
@dependencies.each do |_, platform_deps| # dependencies.each do |_, platform_deps|
platform_deps.each do |dep| dependencies.each do |dep|
return dep if dep.top_level_spec_name == name return dep if dep.top_level_spec_name == name
end end
end # end
end end
def to_s def to_s
......
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