Commit 1a774d12 authored by Fabio Pelosin's avatar Fabio Pelosin

[Core] Drop support for resources destination

parent bf9402c2
...@@ -91,12 +91,10 @@ module Pod ...@@ -91,12 +91,10 @@ module Pod
def add_resources_references def add_resources_references
UI.message "- Adding resources to Pods project" do UI.message "- Adding resources to Pods project" do
file_accessors.each do |file_accessor| file_accessors.each do |file_accessor|
file_accessor.resources.each do |destination, resources| file_accessor.resources.each do |resources|
next if resources.empty? files = file_accessor.resources
files = file_accessor.resources.values.flatten
spec_name = file_accessor.spec.name spec_name = file_accessor.spec.name
parent_group = pods_project.resources parent_group = pods_project.resources
pods_project.add_file_references(files, spec_name, parent_group) pods_project.add_file_references(files, spec_name, parent_group)
end end
end end
......
...@@ -272,7 +272,7 @@ module Pod ...@@ -272,7 +272,7 @@ module Pod
files = [ files = [
file_accessors.map(&:source_files), file_accessors.map(&:source_files),
file_accessors.map(&:resources).map(&:values).flatten, file_accessors.map(&:resources),
file_accessors.map(&:preserve_paths), file_accessors.map(&:preserve_paths),
file_accessors.map(&:prefix_header), file_accessors.map(&:prefix_header),
file_accessors.map(&:readme), file_accessors.map(&:readme),
......
...@@ -222,7 +222,7 @@ module Pod ...@@ -222,7 +222,7 @@ module Pod
def create_copy_resources_script def create_copy_resources_script
path = library.copy_resources_script_path path = library.copy_resources_script_path
UI.message "- Generating copy resources script at #{UI.path(path)}" do UI.message "- Generating copy resources script at #{UI.path(path)}" do
resources = library.file_accessors.map { |accessor| accessor.resources.values.flatten.map {|res| project.relativize(res)} }.flatten resources = library.file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
resources << bridge_support_file if bridge_support_file resources << bridge_support_file if bridge_support_file
generator = Generator::CopyResourcesScript.new(resources) generator = Generator::CopyResourcesScript.new(resources)
generator.save_as(path) generator.save_as(path)
......
...@@ -83,11 +83,11 @@ module Pod ...@@ -83,11 +83,11 @@ module Pod
# specification grouped by destination. # specification grouped by destination.
# #
def resources def resources
result = {} options = {
spec_consumer.resources.each do |destination, patterns| :exclude_patterns => spec_consumer.exclude_files,
result[destination] = expanded_paths(patterns, {:include_dirs => true}) :include_dirs => true,
end }
result expanded_paths(spec_consumer.resources, options)
end end
# @return [Array<Pathname>] the files of the specification to preserve. # @return [Array<Pathname>] the files of the specification to preserve.
......
...@@ -215,7 +215,7 @@ module Pod ...@@ -215,7 +215,7 @@ module Pod
it "compacts the used files as nil would be converted to the empty string" do it "compacts the used files as nil would be converted to the empty string" do
Sandbox::FileAccessor.any_instance.stubs(:source_files) Sandbox::FileAccessor.any_instance.stubs(:source_files)
Sandbox::FileAccessor.any_instance.stubs(:resources).returns({}) Sandbox::FileAccessor.any_instance.stubs(:resources).returns(nil)
Sandbox::FileAccessor.any_instance.stubs(:preserve_paths) Sandbox::FileAccessor.any_instance.stubs(:preserve_paths)
Sandbox::FileAccessor.any_instance.stubs(:prefix_header) Sandbox::FileAccessor.any_instance.stubs(:prefix_header)
Sandbox::FileAccessor.any_instance.stubs(:readme) Sandbox::FileAccessor.any_instance.stubs(:readme)
......
...@@ -70,7 +70,7 @@ module Pod ...@@ -70,7 +70,7 @@ module Pod
end end
it "returns the resources" do it "returns the resources" do
@accessor.resources[:resources].sort.should == [ @accessor.resources.sort.should == [
@root + "Resources/logo-sidebar.png", @root + "Resources/logo-sidebar.png",
@root + "Resources/sub_dir", @root + "Resources/sub_dir",
] ]
......
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