Commit ad7f1e6a authored by Fabio Pelosin's avatar Fabio Pelosin

[UserProjectIntegrator] Don't by affected by the order of projects in the workspace.

parent 47a8a68f
...@@ -78,13 +78,13 @@ module Pod ...@@ -78,13 +78,13 @@ module Pod
# @return [void] # @return [void]
# #
def create_workspace def create_workspace
projpaths = [sandbox.project_path, *user_project_paths].map do |path| projpaths = [*user_project_paths, sandbox.project_path].map do |path|
path.relative_path_from(workspace_path.dirname).to_s path.relative_path_from(workspace_path.dirname).to_s
end.uniq end.uniq
if workspace_path.exist? if workspace_path.exist?
current_workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path) current_workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
if current_workspace.projpaths != projpaths if current_workspace.projpaths.sort != projpaths.sort
workspace = Xcodeproj::Workspace.new(*projpaths) workspace = Xcodeproj::Workspace.new(*projpaths)
workspace.save_as(workspace_path) workspace.save_as(workspace_path)
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