xcodeproj 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a926103d6bbeeea7900326a53221df41a158228484f36dce922c54eadfa741b1
-  data.tar.gz: d15b7d1db2f2ad119b4660a5cad26476930866dd1bee818e770ce8d2c1b8ee4e
+SHA1:
+  metadata.gz: dd5a8807aed9829a9a1e355790100434f4df1fd7
+  data.tar.gz: 15e7c38281fb55f32e2a473e1badf6d806d9063e
 SHA512:
-  metadata.gz: 4886ecf3b87f33ab29072b8ae56b22bfc7810cd0feb9a460449c612d9c947befb7a101e56ffd3dadc03bda4268057f4a48d46cb2ad2dade6a645aa0a65ab5dff
-  data.tar.gz: 85e155a16497eab7dafc72b1c4732cf32ed1ecf90cb10d08d144eea810dd79b99193782c5031609cb5be17e2f961526b4b087eb1196ae971e067083e2f81ab94
+  metadata.gz: ae80f793ecc1635660a7802304547540c9a1e3eb2e8b54a0572acfa8eb3c3069edd3c0302360393041da28026eb77bbf3a5f3e263f72c040ce0c149fb621c2c4
+  data.tar.gz: 531fa9d52e9be2918b113f6603f7d5382ff00eb707de7cc34b70ed956c65f759420292cb4552611d839ad8bb6031d028c4bc91fc1ac3894ee46e40bf6b3a86fb

data/lib/xcodeproj/gem_version.rb

@@ -1,5 +1,5 @@
 module Xcodeproj
   # The version of the xcodeproj gem.
   #
-  VERSION = '1.7.0'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.8.0'.freeze unless defined? Xcodeproj::VERSION
 end

data/lib/xcodeproj/project.rb

@@ -388,7 +388,24 @@ module Xcodeproj
     # @return [void]
     #
     def predictabilize_uuids
-      UUIDGenerator.new(self).generate!
+      UUIDGenerator.new([self]).generate!
+    end
+
+    # Replaces all the UUIDs in the list of provided projects with deterministic MD5 checksums.
+    #
+    # @param  [Array<Project>] projects
+    #
+    # @note The current sorting of the project is taken into account when
+    #       generating the new UUIDs.
+    #
+    # @note This method should only be used for entirely machine-generated
+    #       projects, as true UUIDs are useful for tracking changes in the
+    #       project.
+    #
+    # @return [void]
+    #
+    def self.predictabilize_uuids(projects)
+      UUIDGenerator.new(projects).generate!
     end
 
     public

data/lib/xcodeproj/project/object/build_phase.rb

@@ -279,16 +279,14 @@ module Xcodeproj
 
         # @return [String] the actual script to perform.
         #
-        # @note   Defaults to the empty string.
+        # @note   Defaults to a comment string.
         #
-        attribute :shell_script, String, ''
+        attribute :shell_script, String, "# Type a script or drag a script file from your workspace to insert its path.\n"
 
         # @return [String] whether or not the ENV variables should be shown in
         #         the build log.
         #
-        # @note   Defaults to true (`1`).
-        #
-        attribute :show_env_vars_in_log, String, '1'
+        attribute :show_env_vars_in_log, String
       end
 
       #-----------------------------------------------------------------------#

data/lib/xcodeproj/project/object/helpers/file_references_factory.rb

@@ -177,9 +177,7 @@ module Xcodeproj
             ref = new_file_reference(group, path, source_tree)
             ref.include_in_index = nil
 
-            product_group_ref = group.project.new(PBXGroup)
-            product_group_ref.name = 'Products'
-            product_group_ref.source_tree = '<group>'
+            product_group_ref = find_products_group_ref(group, true)
 
             subproj = Project.open(path)
             subproj.products_group.files.each do |product_reference|
@@ -230,6 +228,12 @@ module Xcodeproj
             end
           end
 
+          def find_products_group_ref(group, should_create = false)
+            product_group_ref =
+              (group.project.root_object.product_ref_group ||= group.project.main_group.find_subpath('Products', should_create))
+            product_group_ref
+          end
+
           #-------------------------------------------------------------------#
         end
       end

data/lib/xcodeproj/project/object/native_target.rb

@@ -356,7 +356,7 @@ module Xcodeproj
         end
         alias_method :add_system_frameworks, :add_system_framework
 
-        # Adds a file reference for one or more system libraries to the project
+        # Adds a file reference for one or more system dylib libraries to the project
         # if needed and adds them to the Frameworks build phases.
         #
         # @param  [Array<String>, String] name
@@ -365,8 +365,13 @@ module Xcodeproj
         # @return [void]
         #
         def add_system_library(names)
+          add_system_library_extension(names, 'dylib')
+        end
+        alias_method :add_system_libraries, :add_system_library
+
+        def add_system_library_extension(names, extension)
           Array(names).each do |name|
-            path = "usr/lib/lib#{name}.dylib"
+            path = "usr/lib/lib#{name}.#{extension}"
             files = project.frameworks_group.files
             unless reference = files.find { |ref| ref.path == path }
               reference = project.frameworks_group.new_file(path, :sdk_root)
@@ -375,7 +380,20 @@ module Xcodeproj
             reference
           end
         end
-        alias_method :add_system_libraries, :add_system_library
+        private :add_system_library_extension
+
+        # Adds a file reference for one or more system tbd libraries to the project
+        # if needed and adds them to the Frameworks build phases.
+        #
+        # @param  [Array<String>, String] name
+        #         The name or the list of the names of the libraries.
+        #
+        # @return [void]
+        #
+        def add_system_library_tbd(names)
+          add_system_library_extension(names, 'tbd')
+        end
+        alias_method :add_system_libraries_tbd, :add_system_library_tbd
 
         public
 

data/lib/xcodeproj/project/uuid_generator.rb

@@ -3,45 +3,55 @@ 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
       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 = '')
         existing = @paths_by_object[object] || path
         return existing if @paths_by_object.key?(object)
@@ -67,13 +77,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

@@ -193,9 +193,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/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
       #

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)
       #

data/lib/xcodeproj/workspace/file_reference.rb

@@ -47,9 +47,22 @@ module Xcodeproj
       #
       def self.from_node(xml_node)
         type, path = xml_node.attribute('location').value.split(':', 2)
+        path = prepend_parent_path(xml_node, path)
         new(path, type)
       end
 
+      def self.prepend_parent_path(xml_node, path)
+        if !xml_node.parent.nil? && (xml_node.parent.name == 'Group')
+          group = GroupReference.from_node(xml_node.parent)
+          if !group.location.nil? && !group.location.empty?
+            path = '' if path.nil?
+            path = File.join(group.location, path)
+          end
+        end
+
+        path
+      end
+
       # @return [REXML::Element] the XML representation of the file reference.
       #
       def to_node

data/lib/xcodeproj/workspace/group_reference.rb

@@ -17,25 +17,31 @@ module Xcodeproj
       #
       attr_reader :type
 
+      # @return [String] the location of the group on disk
+      #
+      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 +52,18 @@ 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] || ''
         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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.