xcodeproj 1.5.9 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb4143562de4dcf43ea17c5b6d5cdbab9f849b3f2969b06ffcb86c9e93216c7
-  data.tar.gz: eec9d4ebbd31001d418fb25364a718dc9b3222eb72faa008ef0056cdbb7356ae
+  metadata.gz: 965a58aaa67ae7f0816637cadffecc3e53d6794b7ebe97d21a562b8ceeefd7dc
+  data.tar.gz: f2331d54681cec7fa80abab0f9d7f8ca21e04dae8d75fd037d6d71b757cf87e7
 SHA512:
-  metadata.gz: 62e49671fbbe8bb7f15cada2df538c835a7ebc517174d6af081c43382c41054a2777878d4fbdfd2e98f9b23c9cc1ecbbff6a3093c48679ae94125cc48be0bc7b
-  data.tar.gz: 2bbdb4c963eafa81274b84e45168b5ca47565108688589c108cf0533e28c3dd3b93e219a532b09480f3dad5fbd3cb25bc44f9d135c0b653ec80a9649f731aa3d
+  metadata.gz: b7ec36d7eeda318e9c8d0eec8755fcbfe5a522abd650f173a86de627072fe200e05efa63125a4d56b4c5a880bf53abf07a649a41cf3c87152730eda0d57f77b5
+  data.tar.gz: 65ccb89e5efea8092af076619a8077f324084fc258132bf9763e7f8b27ce0a7e9827ee1e0d1a79700ec48b79c6f6c0d1c0f40c6f45138386969ff85d7b98e759

data/lib/xcodeproj/config.rb

@@ -27,6 +27,13 @@ module Xcodeproj
       =             # The assignment operator
       (.*)          # The value
     /x
+    private_constant :KEY_VALUE_PATTERN
+
+    INHERITED = %w($(inherited) ${inherited}).freeze
+    private_constant :INHERITED
+
+    INHERITED_REGEXP = Regexp.union(INHERITED)
+    private_constant :INHERITED_REGEXP
 
     # @return [Hash{String => String}] The attributes of the settings file
     #         excluding frameworks, weak_framework and libraries.
@@ -132,8 +139,7 @@ module Xcodeproj
 
       result = attributes.dup
       result['OTHER_LDFLAGS'] = list.join(' ') unless list.empty?
-      inherited = %w($(inherited) ${inherited}).freeze
-      result.reject! { |_, v| inherited.any? { |i| i == v.to_s.strip } }
+      result.reject! { |_, v| INHERITED.any? { |i| i == v.to_s.strip } }
 
       result = @includes.map do |incl|
         path = File.expand_path(incl, @filepath.dirname)
@@ -272,7 +278,9 @@ module Xcodeproj
           @includes.push include
         else
           key, value = extract_key_value(uncommented_line)
-          hash[key] = value if key
+          next unless key
+          value.gsub!(INHERITED_REGEXP) { |m| hash.fetch(key, m) }
+          hash[key] = value
         end
       end
       hash

data/lib/xcodeproj/constants.rb

@@ -29,7 +29,7 @@ module Xcodeproj
 
     # @return [String] The last known object version to Xcodeproj.
     #
-    LAST_KNOWN_OBJECT_VERSION = 50
+    LAST_KNOWN_OBJECT_VERSION = 51
 
     # @return [String] The last known object version to Xcodeproj.
     #
@@ -227,7 +227,8 @@ module Xcodeproj
         'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'DEBUG',
       }.freeze,
       [:release, :swift] => {
-        'SWIFT_OPTIMIZATION_LEVEL'          => '-Owholemodule',
+        'SWIFT_COMPILATION_MODE'            => 'wholemodule',
+        'SWIFT_OPTIMIZATION_LEVEL'          => '-O',
       }.freeze,
       [:debug, :static_library, :swift] => {
       }.freeze,
@@ -371,6 +372,7 @@ module Xcodeproj
         'GCC_WARN_UNINITIALIZED_AUTOS'            => 'YES_AGGRESSIVE',
         'GCC_WARN_UNUSED_FUNCTION'                => 'YES',
         'GCC_WARN_UNUSED_VARIABLE'                => 'YES',
+        'MTL_FAST_MATH'                           => 'YES',
         'PRODUCT_NAME'                            => '$(TARGET_NAME)',
       },
       :release => {
@@ -384,7 +386,7 @@ module Xcodeproj
         'GCC_DYNAMIC_NO_PIC'                 => 'NO',
         'GCC_OPTIMIZATION_LEVEL'             => '0',
         'GCC_PREPROCESSOR_DEFINITIONS'       => ['DEBUG=1', '$(inherited)'],
-        'MTL_ENABLE_DEBUG_INFO'              => 'YES',
+        'MTL_ENABLE_DEBUG_INFO'              => 'INCLUDE_SOURCE',
         'ONLY_ACTIVE_ARCH'                   => 'YES',
       }.freeze,
     }.freeze
@@ -414,7 +416,7 @@ module Xcodeproj
 
     # @return [Array] The extensions which are associated with header files.
     #
-    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def .inl).freeze
+    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def .inl .inc).freeze
 
     # @return [Array] The keywords Xcode use to identify a build setting can
     #                 inherit values from a previous precedence level

data/lib/xcodeproj/gem_version.rb

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

data/lib/xcodeproj/project.rb

@@ -46,6 +46,10 @@ module Xcodeproj
     #
     attr_reader :path
 
+    # @return [Pathname] the directory of the project
+    #
+    attr_reader :project_dir
+
     # @param  [Pathname, String] path @see path
     #         The path provided will be expanded to an absolute path.
     # @param  [Bool] skip_initialization
@@ -64,6 +68,7 @@ module Xcodeproj
     #
     def initialize(path, skip_initialization = false, object_version = Constants::DEFAULT_OBJECT_VERSION)
       @path = Pathname.new(path).expand_path
+      @project_dir = @path.dirname
       @objects_by_uuid = {}
       @generated_uuids = []
       @available_uuids = []
@@ -676,6 +681,10 @@ module Xcodeproj
     # @param  [String] deployment_target
     #         the deployment target for the platform.
     #
+    # @param  [PBXGroup] product_group
+    #         the product group, where to add to a file reference of the
+    #         created target.
+    #
     # @param  [Symbol] language
     #         the primary language of the target, can be `:objc` or `:swift`.
     #
@@ -721,10 +730,16 @@ module Xcodeproj
     # @param  [Array<AbstractTarget>] target_dependencies
     #         targets, which should be added as dependencies.
     #
+    # @param  [Symbol] platform
+    #         the platform of the aggregate target. Can be `:ios` or `:osx`.
+    #
+    # @param  [String] deployment_target
+    #         the deployment target for the platform.
+    #
     # @return [PBXNativeTarget] the target.
     #
-    def new_aggregate_target(name, target_dependencies = [])
-      ProjectHelper.new_aggregate_target(self, name).tap do |aggregate_target|
+    def new_aggregate_target(name, target_dependencies = [], platform = nil, deployment_target = nil)
+      ProjectHelper.new_aggregate_target(self, name, platform, deployment_target).tap do |aggregate_target|
         target_dependencies.each do |dep|
           aggregate_target.add_dependency(dep)
         end

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

@@ -250,6 +250,13 @@ module Xcodeproj
         #
         attribute :input_paths, Array, []
 
+        # @return [Array<String>] an array of input file list paths of the script.
+        #
+        # @example
+        #   "$(SRCROOT)/newInputFile.xcfilelist"
+        #
+        attribute :input_file_list_paths, Array, []
+
         # @return [Array<String>] an array of output paths of the script.
         #
         # @example
@@ -257,6 +264,13 @@ module Xcodeproj
         #
         attribute :output_paths, Array, []
 
+        # @return [Array<String>] an array of output file list paths of the script.
+        #
+        # @example
+        #   "$(SRCROOT)/newOutputFile.xcfilelist"
+        #
+        attribute :output_file_list_paths, Array, []
+
         # @return [String] the path to the script interpreter.
         #
         # @note   Defaults to `/bin/sh`.

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

@@ -169,6 +169,13 @@ module Xcodeproj
           GroupableHelper.real_path(self)
         end
 
+        # @return [Pathname] the path of the file without resolving the
+        # source tree.
+        #
+        def full_path
+          GroupableHelper.full_path(self)
+        end
+
         # Sets the source tree of the reference.
         #
         # @param  [Symbol, String] source_tree

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

@@ -106,6 +106,31 @@ module Xcodeproj
             end
           end
 
+          # @param  [PBXGroup, PBXFileReference] object
+          #         The object to analyze.
+          #
+          # @return [Pathname] The path of the object without resolving the
+          #         source tree.
+          #
+          def full_path(object)
+            folder =  case object.source_tree
+                      when '<group>'
+                        parent(object).isa != 'PBXProject' ? full_path(parent(object)) : nil
+                      when 'SOURCE_ROOT'
+                        nil
+                      when '<absolute>'
+                        Pathname.new('/')
+                      else
+                        Pathname.new("${#{object.source_tree}}")
+                      end
+            folder ||= Pathname.new('')
+            if object.path
+              folder + object.path
+            else
+              folder
+            end
+          end
+
           # @param  [PBXGroup, PBXFileReference] object
           #         The object to analyze.
           #
@@ -116,12 +141,12 @@ module Xcodeproj
             case object.source_tree
             when '<group>'
               if parent(object).isa == 'PBXProject'
-                object.project.path.dirname
+                object.project.project_dir
               else
                 real_path(parent(object))
               end
             when 'SOURCE_ROOT'
-              object.project.path.dirname
+              object.project.project_dir
             when '<absolute>'
               nil
             else

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

@@ -239,7 +239,7 @@ module Xcodeproj
               container_proxy.container_portal = project.root_object.uuid
             else
               subproject_reference = project.reference_for_path(target.project.path)
-              raise ArgumentError, 'add_dependency got target that belongs to a project is not this project and is not a subproject of this project' unless subproject_reference
+              raise ArgumentError, 'add_dependency received target that belongs to a project that is not this project and is not a subproject of this project' unless subproject_reference
               container_proxy.container_portal = subproject_reference.uuid
             end
             container_proxy.proxy_type = Constants::PROXY_TYPES[:native_target]

data/lib/xcodeproj/project/object_attributes.rb

@@ -354,6 +354,7 @@ module Xcodeproj
             # 1.9.2 fix, see https://github.com/CocoaPods/Xcodeproj/issues/40.
             public(attrb.name)
 
+            variable_name = :"@#{attrb.name}"
             define_method("#{attrb.name}=") do |value|
               attrb.validate_value(value)
 
@@ -361,7 +362,7 @@ module Xcodeproj
               return value if previous_value == value
               mark_project_as_dirty!
               previous_value.remove_referrer(self) if previous_value
-              instance_variable_set("@#{attrb.name}", value)
+              instance_variable_set(variable_name, value)
               value.add_referrer(self) if value
             end
           end
@@ -392,12 +393,13 @@ module Xcodeproj
             attrb.classes = isas
             add_attribute(attrb)
 
+            variable_name = :"@#{attrb.name}"
             define_method(attrb.name) do
               # Here we are in the context of the instance
-              list = instance_variable_get("@#{attrb.name}")
+              list = instance_variable_get(variable_name)
               unless list
                 list = ObjectList.new(attrb, self)
-                instance_variable_set("@#{attrb.name}", list)
+                instance_variable_set(variable_name, list)
               end
               list
             end
@@ -428,12 +430,13 @@ module Xcodeproj
             attrb.classes_by_key = classes_by_key
             add_attribute(attrb)
 
+            variable_name = :"@#{attrb.name}"
             define_method(attrb.name) do
               # Here we are in the context of the instance
-              list = instance_variable_get("@#{attrb.name}")
+              list = instance_variable_get(variable_name)
               unless list
                 list = ObjectList.new(attrb, self)
-                instance_variable_set("@#{attrb.name}", list)
+                instance_variable_set(variable_name, list)
               end
               list
             end

data/lib/xcodeproj/project/project_helper.rb

@@ -55,8 +55,7 @@ module Xcodeproj
         target.product_reference = product
 
         # Build phases
-        target.build_phases << project.new(PBXSourcesBuildPhase)
-        target.build_phases << project.new(PBXFrameworksBuildPhase)
+        build_phases_for_target_type(type).each { |phase| target.build_phases << project.new(phase) }
 
         # Frameworks
         unless type == :static_library
@@ -116,9 +115,7 @@ module Xcodeproj
         target.product_reference = product
 
         # Build phases
-        target.build_phases << project.new(PBXSourcesBuildPhase)
-        target.build_phases << project.new(PBXFrameworksBuildPhase)
-        target.build_phases << project.new(PBXResourcesBuildPhase)
+        build_phases_for_target_type(:bundle).each { |phase| target.build_phases << project.new(phase) }
 
         target
       end
@@ -133,13 +130,19 @@ module Xcodeproj
       # @param  [String] name
       #         the name of the aggregate target.
       #
+      # @param  [Symbol] platform
+      #         the platform of the aggregate target. Can be `:ios` or `:osx`.
+      #
+      # @param  [String] deployment_target
+      #         the deployment target for the platform.
+      #
       # @return [PBXAggregateTarget] the target.
       #
-      def self.new_aggregate_target(project, name)
+      def self.new_aggregate_target(project, name, platform, deployment_target)
         target = project.new(PBXAggregateTarget)
         project.targets << target
         target.name = name
-        target.build_configuration_list = configuration_list(project)
+        target.build_configuration_list = configuration_list(project, platform, deployment_target)
         target
       end
 
@@ -293,7 +296,7 @@ module Xcodeproj
       # @param  [Object] object
       #         the object to copy.
       #
-      # @return [Object] The deeply copy of the obejct object.
+      # @return [Object] The deep copy of the object.
       #
       def self.deep_dup(object)
         case object
@@ -310,6 +313,27 @@ module Xcodeproj
         end
       end
 
+      # Returns the build phases, in order, that appear by default
+      # on a target of the given type.
+      #
+      # @param  [Symbol] type
+      #         the name of the target type.
+      #
+      # @return [Array<String>] The list of build phase class names for the target type.
+      #
+      def self.build_phases_for_target_type(type)
+        case type
+        when :static_library, :dynamic_library
+          %w(Headers Sources Frameworks)
+        when :framework
+          %w(Headers Sources Frameworks Resources)
+        when :command_line_tool
+          %w(Sources Frameworks)
+        else
+          %w(Sources Frameworks Resources)
+        end.map { |phase| "PBX#{phase}BuildPhase" }
+      end
+
       #-----------------------------------------------------------------------#
     end
   end

data/lib/xcodeproj/project/uuid_generator.rb

@@ -1,6 +1,8 @@
 module Xcodeproj
   class Project
     class UUIDGenerator
+      require 'digest'
+
       def initialize(project)
         @project = project
         @new_objects_by_uuid = {}
@@ -76,7 +78,6 @@ module Xcodeproj
       end
 
       def uuid_for_path(path)
-        require 'digest'
         Digest::MD5.hexdigest(path).upcase
       end
 

data/lib/xcodeproj/scheme/buildable_reference.rb

@@ -116,7 +116,7 @@ module Xcodeproj
         path = if !root_project_dir_path.to_s.empty?
                  root_project.path + root_project_dir_path
                else
-                 root_project.path.dirname
+                 root_project.project_dir
                end
         relative_path = target_project.path.relative_path_from(path).to_s
         relative_path = target_project.path.basename if relative_path == '.'

data/lib/xcodeproj/scheme/test_action.rb

@@ -151,6 +151,41 @@ module Xcodeproj
           @xml_element.attributes['skipped'] = bool_to_string(flag)
         end
 
+        # @return [Bool]
+        #         Whether or not this TestableReference (test bundle) should be run in parallel or not
+        #
+        def parallelizable?
+          string_to_bool(@xml_element.attributes['parallelizable'])
+        end
+
+        # @param [Bool] flag
+        #         Set whether or not this TestableReference (test bundle) should be run in parallel or not
+        #
+        def parallelizable=(flag)
+          @xml_element.attributes['parallelizable'] = bool_to_string(flag)
+        end
+
+        # @return [String]
+        #         The execution order for this TestableReference (test bundle)
+        #
+        def test_execution_ordering
+          @xml_element.attributes['testExecutionOrdering']
+        end
+
+        # @param [String] order
+        #         Set the execution order for this TestableReference (test bundle)
+        #
+        def test_execution_ordering=(order)
+          @xml_element.attributes['testExecutionOrdering'] = order
+        end
+
+        # @return [Bool]
+        #         Whether or not this TestableReference (test bundle) should be run in randomized order.
+        #
+        def randomized?
+          test_execution_ordering == 'random'
+        end
+
         # @return [Array<BuildableReference>]
         #         The list of BuildableReferences this action will build.
         #         (The list usually contains only one element)
@@ -168,21 +203,21 @@ module Xcodeproj
           @xml_element.add_element(ref.xml_element)
         end
 
-        # @return [Array<SkippedTest>]
+        # @return [Array<Test>]
         #         The list of SkippedTest this action will skip.
         #
         def skipped_tests
           return [] if @xml_element.elements['SkippedTests'].nil?
           @xml_element.elements['SkippedTests'].get_elements('Test').map do |node|
-            TestableReference::SkippedTest.new(node)
+            Test.new(node)
           end
         end
 
-        # @param [Array<SkippedTest>] tests
+        # @param [Array<Test>] tests
         #         Set the list of SkippedTest this action will skip.
         #
         def skipped_tests=(tests)
-          @xml_element.delete_element('SkippedTests') unless @xml_element.elements['SkippedTests'].nil?
+          @xml_element.delete_element('SkippedTests')
           if tests.nil?
             return
           end
@@ -192,7 +227,7 @@ module Xcodeproj
           end
         end
 
-        # @param [SkippedTest] skipped_test
+        # @param [Test] skipped_test
         #         The SkippedTest to add to the list of tests this action will skip
         #
         def add_skipped_test(skipped_test)
@@ -200,7 +235,51 @@ module Xcodeproj
           entries.add_element(skipped_test.xml_element)
         end
 
-        class SkippedTest < XMLElementWrapper
+        # @return [Bool]
+        #         Whether or not this TestableReference (test bundle) should use a whitelist or not
+        #
+        def use_test_selection_whitelist?
+          string_to_bool(@xml_element.attributes['useTestSelectionWhitelist'])
+        end
+
+        # @param [Bool] flag
+        #        Set whether or not this TestableReference (test bundle) should use a whitelist or not
+        #
+        def use_test_selection_whitelist=(flag)
+          @xml_element.attributes['useTestSelectionWhitelist'] = bool_to_string(flag)
+        end
+
+        # @return [Array<Test>]
+        #         The list of SelectedTest this action will run.
+        #
+        def selected_tests
+          return [] if @xml_element.elements['SelectedTests'].nil?
+          @xml_element.elements['SelectedTests'].get_elements('Test').map do |node|
+            Test.new(node)
+          end
+        end
+
+        # @param [Array<Test>] tests
+        #         Set the list of SelectedTest this action will run.
+        #
+        def selected_tests=(tests)
+          @xml_element.delete_element('SelectedTests')
+          return if tests.nil?
+          entries = @xml_element.add_element('SelectedTests')
+          tests.each do |selected|
+            entries.add_element(selected.xml_element)
+          end
+        end
+
+        # @param [Test] selected_test
+        #         The SelectedTest to add to the list of tests this action will run.
+        #
+        def add_selected_test(selected_test)
+          entries = @xml_element.elements['SelectedTests'] || @xml_element.add_element('SelectedTests')
+          entries.add_element(selected_test.xml_element)
+        end
+
+        class Test < XMLElementWrapper
           # @param [REXML::Element] node
           #        The 'Test' XML node that this object will wrap.
           #        If nil, will create a default XML node to use.
@@ -226,6 +305,11 @@ module Xcodeproj
           end
         end
 
+        # Aliased to`Test` for compatibility
+        # @todo Remove in Xcodeproj 2
+        #
+        SkippedTest = Test
+
         # @todo handle 'AdditionalOptions' tag
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.6.0
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.6
 description: Xcodeproj lets you create and modify Xcode projects from Ruby. Script
   boring management tasks or build Xcode-friendly libraries. Also includes support
   for Xcode workspaces (.xcworkspace) and configuration files (.xcconfig).
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.