Commit 7ee5b4b1 authored by Eloy Duran's avatar Eloy Duran

Combine dependencies of all targets, regardless of platform.

parent 89265242
* The user *has* to specify the platform of the project in the Podfile. * Resolve all dependencies together and write out all dependencies to Podfile.lock together.
* Add integration spec with multiple platforms.
* Validate platforms for each target definition.
* Validate that there are dependencies in a Podfile.
* Validate that the dependencies in the targets don't conflict. E.g. two different versions of the same pod.
...@@ -305,7 +305,7 @@ module Pod ...@@ -305,7 +305,7 @@ module Pod
attr_reader :target_definitions attr_reader :target_definitions
def dependencies def dependencies
@target_definitions.values.map(&:target_dependencies).flatten @target_definitions.values.map(&:target_dependencies).flatten.uniq
end end
def dependency_by_top_level_spec_name(name) def dependency_by_top_level_spec_name(name)
......
...@@ -97,7 +97,7 @@ describe "Pod::Podfile" do ...@@ -97,7 +97,7 @@ describe "Pod::Podfile" do
end end
end end
xit "returns all dependencies of all targets combined, which is used during resolving to ensure compatible dependencies" do it "returns all dependencies of all targets combined, which is used during resolving to ensure compatible dependencies" do
@podfile.dependencies.map(&:name).sort.should == %w{ ASIHTTPRequest JSONKit Reachability SSZipArchive } @podfile.dependencies.map(&:name).sort.should == %w{ ASIHTTPRequest JSONKit Reachability SSZipArchive }
end end
......
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