xcodeproj 1.7.0 → 1.19.0

data/lib/xcodeproj/project/project_helper.rb

@@ -224,8 +224,9 @@ module Xcodeproj
         cl.build_configurations << release_conf
         cl.build_configurations << debug_conf
 
+        existing_configurations = cl.build_configurations.map(&:name)
         project.build_configurations.each do |configuration|
-          next if cl.build_configurations.map(&:name).include?(configuration.name)
+          next if existing_configurations.include?(configuration.name)
 
           new_config = project.new(XCBuildConfiguration)
           new_config.name = configuration.name

data/lib/xcodeproj/project/uuid_generator.rb

@@ -3,43 +3,65 @@ module Xcodeproj
     class UUIDGenerator
       require 'digest'
 
-      def initialize(project)
-        @project = project
-        @new_objects_by_uuid = {}
+      def initialize(projects)
+        @projects = Array(projects)
         @paths_by_object = {}
       end
 
       def generate!
-        all_objects = @project.objects
-        generate_paths(@project.root_object)
-        switch_uuids(all_objects)
-        verify_no_duplicates!(all_objects)
-        fixup_uuid_references
-        @project.instance_variable_set(:@generated_uuids, @project.instance_variable_get(:@available_uuids))
-        @project.instance_variable_set(:@objects_by_uuid, @new_objects_by_uuid)
+        generate_all_paths_by_objects(@projects)
+
+        new_objects_by_project = Hash[@projects.map do |project|
+          [project, switch_uuids(project)]
+        end]
+        all_new_objects_by_project = new_objects_by_project.values.flat_map(&:values)
+        all_objects_by_uuid = @projects.map(&:objects_by_uuid).inject(:merge)
+        all_objects = @projects.flat_map(&:objects)
+        verify_no_duplicates!(all_objects, all_new_objects_by_project)
+        @projects.each { |project| fixup_uuid_references(project, all_objects_by_uuid) }
+        new_objects_by_project.each do |project, new_objects_by_uuid|
+          project.instance_variable_set(:@generated_uuids, project.instance_variable_get(:@available_uuids))
+          project.instance_variable_set(:@objects_by_uuid, new_objects_by_uuid)
+        end
       end
 
       private
 
       UUID_ATTRIBUTES = [:remote_global_id_string, :container_portal, :target_proxy].freeze
 
-      def verify_no_duplicates!(all_objects)
-        duplicates = all_objects - @new_objects_by_uuid.values
+      def verify_no_duplicates!(all_objects, all_new_objects)
+        duplicates = all_objects - all_new_objects
         UserInterface.warn "[Xcodeproj] Generated duplicate UUIDs:\n\n" <<
           duplicates.map { |d| "#{d.isa} -- #{@paths_by_object[d]}" }.join("\n") unless duplicates.empty?
       end
 
-      def fixup_uuid_references
+      def fixup_uuid_references(target_project, all_objects_by_uuid)
         fixup = ->(object, attr) do
-          if object.respond_to?(attr) && link = @project.objects_by_uuid[object.send(attr)]
+          if object.respond_to?(attr) && link = all_objects_by_uuid[object.send(attr)]
             object.send(:"#{attr}=", link.uuid)
           end
         end
-        @project.objects.each do |object|
+        target_project.objects.each do |object|
           UUID_ATTRIBUTES.each do |attr|
             fixup[object, attr]
           end
         end
+
+        if (project_attributes = target_project.root_object.attributes) && project_attributes['TargetAttributes']
+          project_attributes['TargetAttributes'] = Hash[project_attributes['TargetAttributes'].map do |target_uuid, attributes|
+            if test_target_id = attributes['TestTargetID']
+              attributes = attributes.merge('TestTargetID' => all_objects_by_uuid[test_target_id].uuid)
+            end
+            if target_object = all_objects_by_uuid[target_uuid]
+              target_uuid = target_object.uuid
+            end
+            [target_uuid, attributes]
+          end]
+        end
+      end
+
+      def generate_all_paths_by_objects(projects)
+        projects.each { |project| generate_paths(project.root_object, project.path.basename.to_s) }
       end
 
       def generate_paths(object, path = '')
@@ -67,13 +89,13 @@ module Xcodeproj
         end
       end
 
-      def switch_uuids(objects)
-        @project.mark_dirty!
-        objects.each do |object|
+      def switch_uuids(project)
+        project.mark_dirty!
+        project.objects.each_with_object({}) do |object, hash|
           next unless path = @paths_by_object[object]
           uuid = uuid_for_path(path)
           object.instance_variable_set(:@uuid, uuid)
-          @new_objects_by_uuid[uuid] = object
+          hash[uuid] = object
         end
       end
 

data/lib/xcodeproj/scheme.rb

@@ -31,7 +31,9 @@ module Xcodeproj
     def initialize(file_path = nil)
       if file_path
         @file_path = file_path
-        @doc = REXML::Document.new(File.new(file_path))
+        @doc = File.open(file_path, 'r') do |f|
+          REXML::Document.new(f)
+        end
         @doc.context[:attribute_quote] = :quote
 
         @scheme = @doc.elements['Scheme']
@@ -193,9 +195,9 @@ module Xcodeproj
 
       entry.build_for_testing   = true
       entry.build_for_running   = build_for_running
-      entry.build_for_profiling = true
-      entry.build_for_archiving = true
-      entry.build_for_analyzing = true
+      entry.build_for_profiling = build_for_running
+      entry.build_for_archiving = build_for_running
+      entry.build_for_analyzing = build_for_running
 
       build_action.add_entry(entry)
     end

data/lib/xcodeproj/scheme/build_action.rb

@@ -59,6 +59,20 @@ module Xcodeproj
         end
       end
 
+      # @param [Array<BuildAction::Entry>] entries
+      #        Sets the list of BuildActionEntry nodes associated with this Build Action.
+      #
+      def entries=(entries)
+        @xml_element.delete_element('BuildActionEntries')
+        unless entries.empty?
+          entries_element = @xml_element.add_element('BuildActionEntries')
+          entries.each do |entry_node|
+            entries_element.add_element(entry_node.xml_element)
+          end
+        end
+        entries
+      end
+
       # @param [BuildAction::Entry] entry
       #        The BuildActionEntry to add to the list of targets to build for the various actions
       #
@@ -185,6 +199,13 @@ module Xcodeproj
         def add_buildable_reference(ref)
           @xml_element.add_element(ref.xml_element)
         end
+
+        # @param [BuildableReference] ref
+        #         The BuildableReference to remove from the list of targets this entry will build
+        #
+        def remove_buildable_reference(ref)
+          @xml_element.delete_element(ref.xml_element)
+        end
       end
     end
   end

data/lib/xcodeproj/scheme/buildable_reference.rb

@@ -59,10 +59,12 @@ module Xcodeproj
       #        If true, buildable_name will also be updated by computing a name from the target
       #
       def set_reference_target(target, override_buildable_name = false, root_project = nil)
+        # note, the order of assignment here is important, it determines the order of serialization in the xml
+        # this matches the order that Xcode generates
         @xml_element.attributes['BlueprintIdentifier'] = target.uuid
+        self.buildable_name = construct_buildable_name(target) if override_buildable_name
         @xml_element.attributes['BlueprintName'] = target.name
         @xml_element.attributes['ReferencedContainer'] = construct_referenced_container_uri(target, root_project)
-        self.buildable_name = construct_buildable_name(target) if override_buildable_name
       end
 
       # @return [String]

data/lib/xcodeproj/scheme/launch_action.rb

@@ -47,6 +47,40 @@ module Xcodeproj
         @xml_element.attributes['allowLocationSimulation'] = bool_to_string(flag)
       end
 
+      # @return [Bool]
+      #         Whether this Build Action should disable detection of UI API misuse
+      #         from background threads
+      #
+      def disable_main_thread_checker?
+        string_to_bool(@xml_element.attributes['disableMainThreadChecker'])
+      end
+
+      # @param [Bool] flag
+      #        Set whether this Build Action should disable detection of UI API misuse
+      #        from background threads
+      #
+      def disable_main_thread_checker=(flag)
+        @xml_element.attributes['disableMainThreadChecker'] = bool_to_string(flag)
+      end
+
+      # @return [Bool]
+      #         Whether UI API misuse from background threads detection should pause execution.
+      #         This flag is ignored when the thread checker disabled
+      #         ([disable_main_thread_checker] flag).
+      #
+      def stop_on_every_main_thread_checker_issue?
+        string_to_bool(@xml_element.attributes['stopOnEveryMainThreadCheckerIssue'])
+      end
+
+      # @param [Bool] flag
+      #         Set whether UI API misuse from background threads detection should pause execution.
+      #         This flag is ignored when the thread checker disabled
+      #         ([disable_main_thread_checker] flag).
+      #
+      def stop_on_every_main_thread_checker_issue=(flag)
+        @xml_element.attributes['stopOnEveryMainThreadCheckerIssue'] = bool_to_string(flag)
+      end
+
       # @return [String]
       #         The launch automatically substyle
       #
@@ -109,6 +143,22 @@ module Xcodeproj
         @xml_element.add_element(arguments.xml_element) if arguments
         arguments
       end
+
+      # @return [Array<MacroExpansion>]
+      #         The list of MacroExpansion bound with this LaunchAction
+      #
+      def macro_expansions
+        @xml_element.get_elements('MacroExpansion').map do |node|
+          MacroExpansion.new(node)
+        end
+      end
+
+      # @param [MacroExpansion] macro_expansion
+      #        Add a MacroExpansion to this LaunchAction
+      #
+      def add_macro_expansion(macro_expansion)
+        @xml_element.add_element(macro_expansion.xml_element)
+      end
     end
   end
 end

data/lib/xcodeproj/scheme/test_action.rb

@@ -35,6 +35,22 @@ module Xcodeproj
         @xml_element.attributes['shouldUseLaunchSchemeArgsEnv'] = bool_to_string(flag)
       end
 
+      # @return [Bool]
+      #         Whether this Test Action should disable detection of UI API misuse
+      #         from background threads
+      #
+      def disable_main_thread_checker?
+        string_to_bool(@xml_element.attributes['disableMainThreadChecker'])
+      end
+
+      # @param [Bool] flag
+      #        Set whether this Test Action should disable detection of UI API misuse
+      #        from background threads
+      #
+      def disable_main_thread_checker=(flag)
+        @xml_element.attributes['disableMainThreadChecker'] = bool_to_string(flag)
+      end
+
       # @return [Bool]
       #         Whether Clang Code Coverage is enabled ('Gather coverage data' turned ON)
       #
@@ -42,7 +58,7 @@ module Xcodeproj
         string_to_bool(@xml_element.attributes['codeCoverageEnabled'])
       end
 
-      # @rparam [Bool] flag
+      # @param [Bool] flag
       #         Set whether Clang Code Coverage is enabled ('Gather coverage data' turned ON)
       #
       def code_coverage_enabled=(flag)
@@ -60,6 +76,18 @@ module Xcodeproj
         end
       end
 
+      # @param [Array<TestableReference>] testables
+      #         Sets the list of TestableReference (test bundles) associated with this Test Action
+      #
+      def testables=(testables)
+        @xml_element.delete_element('Testables')
+        testables_element = @xml_element.add_element('Testables')
+        testables.each do |testable|
+          testables_element.add_element(testable.xml_element)
+        end
+        testables
+      end
+
       # @param [TestableReference] testable
       #        Add a TestableReference (test bundle) to this Test Action
       #
@@ -203,6 +231,13 @@ module Xcodeproj
           @xml_element.add_element(ref.xml_element)
         end
 
+        # @param [BuildableReference] ref
+        #         The BuildableReference to remove from the list of targets this entry will build
+        #
+        def remove_buildable_reference(ref)
+          @xml_element.delete_element(ref.xml_element)
+        end
+
         # @return [Array<Test>]
         #         The list of SkippedTest this action will skip.
         #

data/lib/xcodeproj/workspace.rb

@@ -64,7 +64,7 @@ module Xcodeproj
     #
     def self.new_from_xcworkspace(path)
       from_s(File.read(File.join(path, 'contents.xcworkspacedata')),
-             File.expand_path(File.dirname(path)))
+             File.expand_path(path))
     rescue Errno::ENOENT
       new(nil)
     end
@@ -97,16 +97,19 @@ module Xcodeproj
     #
     def <<(path_or_reference)
       return unless @document && @document.respond_to?(:root)
-      case
-      when path_or_reference.is_a?(String)
+
+      case path_or_reference
+      when String
         project_file_reference = Xcodeproj::Workspace::FileReference.new(path_or_reference)
-      when path_or_reference.is_a?(Xcodeproj::Workspace::FileReference)
+      when Xcodeproj::Workspace::FileReference
         project_file_reference = path_or_reference
         projpath = nil
       else
-        raise ArgumentError, 'Input to the << operator must be a file path or FileReference'
+        raise ArgumentError, "Input to the << operator must be a file path or FileReference, got #{path_or_reference.inspect}"
+      end
+      unless file_references.any? { |ref| project_file_reference.eql? ref }
+        @document.root.add_element(project_file_reference.to_node)
       end
-      @document.root.add_element(project_file_reference.to_node)
       load_schemes_from_project File.expand_path(projpath || project_file_reference.path)
     end
 
@@ -191,8 +194,14 @@ module Xcodeproj
     # @return [void]
     #
     def load_schemes(workspace_dir_path)
+      # Normalizes path to directory of workspace needed for file_reference.absolute_path
+      workspaces_dir = workspace_dir_path
+      if File.extname(workspace_dir_path) == '.xcworkspace'
+        workspaces_dir = File.expand_path('..', workspaces_dir)
+      end
+
       file_references.each do |file_reference|
-        project_full_path = file_reference.absolute_path(workspace_dir_path)
+        project_full_path = file_reference.absolute_path(workspaces_dir)
         load_schemes_from_project(project_full_path)
       end
 

data/lib/xcodeproj/workspace/file_reference.rb

@@ -1,27 +1,19 @@
+require 'xcodeproj/workspace/reference'
+
 module Xcodeproj
   class Workspace
     # Describes a file reference of a Workspace.
     #
-    class FileReference
+    class FileReference < Reference
       # @return [String] the path to the project
       #
       attr_reader :path
 
-      # @return [String] the type of reference to the project
-      #
-      # This can be of the following values:
-      # - absolute
-      # - group
-      # - container
-      # - developer (unsupported)
-      #
-      attr_reader :type
-
       # @param [#to_s] path @see path
       # @param [#to_s] type @see type
       #
       def initialize(path, type = 'group')
-        @path = path.to_s
+        @path = Pathname.new(path.to_s).cleanpath.to_s
         @type = type.to_s
       end
 
@@ -47,6 +39,9 @@ module Xcodeproj
       #
       def self.from_node(xml_node)
         type, path = xml_node.attribute('location').value.split(':', 2)
+        if type == 'group'
+          path = prepend_parent_path(xml_node, path)
+        end
         new(path, type)
       end
 

data/lib/xcodeproj/workspace/group_reference.rb

@@ -1,41 +1,39 @@
+require 'xcodeproj/workspace/reference'
+
 module Xcodeproj
   class Workspace
     # Describes a group reference of a Workspace.
     #
-    class GroupReference
+    class GroupReference < Reference
       # @return [String] the name of the group
       #
       attr_reader :name
 
-      # @return [String] the type of reference to the project
-      #
-      # This can be of the following values:
-      # - absolute
-      # - group
-      # - container (only supported value)
-      # - developer
+      # @return [String] the location of the group on disk
       #
-      attr_reader :type
+      attr_reader :location
 
       # @param [#to_s] name @see name
       # @param [#to_s] type @see type
+      # @param [#to_s] location @see location
       #
-      def initialize(name, type = 'container')
+      def initialize(name, type = 'container', location = '')
         @name = name.to_s
         @type = type.to_s
+        @location = location.to_s
       end
 
       # @return [Bool] Whether a group reference is equal to another.
       #
       def ==(other)
-        name == other.name && type == other.type
+        name == other.name && type == other.type && location == other.location
       end
       alias_method :eql?, :==
 
       # @return [Fixnum] A hash identical for equals objects.
       #
       def hash
-        [name, type].hash
+        [name, type, location].hash
       end
 
       # Returns a group reference given XML representation.
@@ -46,16 +44,21 @@ module Xcodeproj
       # @return [GroupReference] The new group reference instance.
       #
       def self.from_node(xml_node)
-        type = xml_node.attribute('location').value.split(':', 2).first
+        location_array = xml_node.attribute('location').value.split(':', 2)
+        type = location_array.first
+        location = location_array[1] || ''
+        if type == 'group'
+          location = prepend_parent_path(xml_node, location)
+        end
         name = xml_node.attribute('name').value
-        new(name, type)
+        new(name, type, location)
       end
 
       # @return [REXML::Element] the XML representation of the group reference.
       #
       def to_node
         REXML::Element.new('Group').tap do |element|
-          element.add_attribute('location', "#{type}:")
+          element.add_attribute('location', "#{type}:#{location}")
           element.add_attribute('name', "#{name}")
         end
       end