Commit 8bc43bd5 authored by Samuel Giddins's avatar Samuel Giddins

[UserProjectIntegrator] Update for Xcodeproj changes in the workspace API

parent 1b0ecabd
...@@ -91,7 +91,7 @@ module Pod ...@@ -91,7 +91,7 @@ module Pod
workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path) workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
new_file_references = file_references - workspace.file_references new_file_references = file_references - workspace.file_references
unless new_file_references.empty? unless new_file_references.empty?
workspace.file_references.concat(new_file_references) new_file_references.each { |fr| workspace << fr }
workspace.save_as(workspace_path) workspace.save_as(workspace_path)
end end
......
...@@ -124,7 +124,7 @@ module Pod ...@@ -124,7 +124,7 @@ module Pod
Xcodeproj::Workspace::FileReference.new('Pods/Pods.xcodeproj', 'group'), Xcodeproj::Workspace::FileReference.new('Pods/Pods.xcodeproj', 'group'),
] ]
workspace = Xcodeproj::Workspace.new(file_references) workspace = Xcodeproj::Workspace.new(*file_references)
workspace_path = @integrator.send(:workspace_path) workspace_path = @integrator.send(:workspace_path)
workspace.save_as(workspace_path) workspace.save_as(workspace_path)
Xcodeproj::Workspace.any_instance.expects(:save_as).never Xcodeproj::Workspace.any_instance.expects(:save_as).never
...@@ -151,7 +151,7 @@ module Pod ...@@ -151,7 +151,7 @@ module Pod
Xcodeproj::Workspace::FileReference.new('SampleProject/SampleProject.xcodeproj', 'group'), Xcodeproj::Workspace::FileReference.new('SampleProject/SampleProject.xcodeproj', 'group'),
] ]
workspace = Xcodeproj::Workspace.new(file_references) workspace = Xcodeproj::Workspace.new(*file_references)
workspace_path = @integrator.send(:workspace_path) workspace_path = @integrator.send(:workspace_path)
workspace.save_as(workspace_path) workspace.save_as(workspace_path)
@integrator.send(:create_workspace) @integrator.send(:create_workspace)
......
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