xcodeproj 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9ec16130cc4237b7257b542daf86218199f2ac6b03a00cda2d88d0ca317c905
-  data.tar.gz: f820d365aa7a808bdd3d6aec34db9a1aabb3b391ecb6fe41593628888ad31424
+  metadata.gz: bad4a5d9e130051e4ec9f5ba1123c0945646361aa179f50978277f886ac8ae26
+  data.tar.gz: 3dffd3ec7bd653c19005942c6e61e315819b62d29f96ab854ea4e9863b9e87d1
 SHA512:
-  metadata.gz: 12be0ca390e13b6bf56430b686ff1e1e667012b2bba6044b48a860f01d41a3209acd9c831ee304b0c8650dbd4a68abea4b796dcc3a124790a5f6e777ff760309
-  data.tar.gz: 5f6ee8bafbc375fbd78a94857933804bc997a1bc4497b57bda370fc816f7f888939cde6dfd1de18636e909f3da8442333ada8df0c03a19ec2cb24152d6f715cf
+  metadata.gz: ffb0fa8556611d4f0440490fe902e7dbfbbff9155edade6040bb0a5a6490536a01954c93f5784a6cf4da0e40852b1c06844718b2b6645407968b5ba697a47bc6
+  data.tar.gz: e1f4f116e2faab02c2dcd6031a7a37940fbc22cebfbe20a7c6a56628ce0cedf8b83184a3405bf83d3d2f4c390744197a0db8c57f1da5c11d3137a18f24764b01

data/lib/xcodeproj/gem_version.rb

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

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

@@ -113,8 +113,15 @@ module Xcodeproj
           /x
 
         def expand_build_setting(build_setting_value, config_value)
+          if build_setting_value.is_a?(Array) && config_value.is_a?(String)
+            config_value = split_build_setting_array_to_string(config_value)
+          elsif build_setting_value.is_a?(String) && config_value.is_a?(Array)
+            build_setting_value = split_build_setting_array_to_string(build_setting_value)
+          end
+
           default = build_setting_value.is_a?(String) ? '' : []
           inherited = config_value || default
+
           return build_setting_value.gsub(Regexp.union(Constants::INHERITED_KEYWORDS), inherited) if build_setting_value.is_a? String
           build_setting_value.map { |value| Constants::INHERITED_KEYWORDS.include?(value) ? inherited : value }.flatten
         end

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

@@ -268,7 +268,7 @@ module Xcodeproj
               uuid = subproject_reference.uuid if subproject_reference
               dep.target_proxy.remote_global_id_string == target.uuid && dep.target_proxy.container_portal == uuid
             else
-              dep.target == target
+              dep.target.uuid == target.uuid
             end
           end
         end

data/lib/xcodeproj/project/object_attributes.rb

@@ -319,7 +319,7 @@ module Xcodeproj
               if existing.is_a?(Hash) && value.is_a?(Hash)
                 return value if existing.keys == value.keys && existing == value
               elsif existing == value
-                return value if existing == value
+                return value
               end
               mark_project_as_dirty!
               @simple_attributes_hash[attrb.plist_name] = value

data/lib/xcodeproj/scheme/buildable_reference.rb

@@ -10,10 +10,13 @@ module Xcodeproj
       #        Either the Xcode target to reference,
       #        or an existing XML 'BuildableReference' node element to reference
       #
-      def initialize(target_or_node)
+      # @param [Xcodeproj::Project] the root project to reference from
+      #                             (when nil the project of the target is used)
+      #
+      def initialize(target_or_node, root_project = nil)
         create_xml_element_with_fallback(target_or_node, 'BuildableReference') do
           @xml_element.attributes['BuildableIdentifier'] = 'primary'
-          set_reference_target(target_or_node, true) if target_or_node
+          set_reference_target(target_or_node, true, root_project) if target_or_node
         end
       end
 
@@ -49,13 +52,16 @@ module Xcodeproj
       # @param [Xcodeproj::Project::Object::AbstractTarget] target
       #        The target this BuildableReference refers to.
       #
+      # @param [Xcodeproj::Project] the root project to reference from
+      #                             (when nil the project of the target is used)
+      #
       # @param [Bool] override_buildable_name
       #        If true, buildable_name will also be updated by computing a name from the target
       #
-      def set_reference_target(target, override_buildable_name = false)
+      def set_reference_target(target, override_buildable_name = false, root_project = nil)
         @xml_element.attributes['BlueprintIdentifier'] = target.uuid
         @xml_element.attributes['BlueprintName'] = target.name
-        @xml_element.attributes['ReferencedContainer'] = construct_referenced_container_uri(target)
+        @xml_element.attributes['ReferencedContainer'] = construct_referenced_container_uri(target, root_project)
         self.buildable_name = construct_buildable_name(target) if override_buildable_name
       end
 
@@ -96,14 +102,24 @@ module Xcodeproj
 
       # @param [Xcodeproj::Project::Object::AbstractTarget] target
       #
+      # @param [Xcodeproj::Project] the root project to reference from
+      #                             (when nil the project of the target is used)
+      #
       # @return [String] A string in the format "container:[path to the project
       #                  file relative to the project_dir_path, always ending with
       #                  the actual project directory name]"
       #
-      def construct_referenced_container_uri(target)
-        project = target.project
-        relative_path = project.path.relative_path_from(project.path + project.root_object.project_dir_path).to_s
-        relative_path = project.path.basename if relative_path == '.'
+      def construct_referenced_container_uri(target, root_project = nil)
+        target_project = target.project
+        root_project ||= target_project
+        root_project_dir_path = root_project.root_object.project_dir_path
+        path = if !root_project_dir_path.to_s.empty?
+                 root_project.path + root_project_dir_path
+               else
+                 root_project.path.dirname
+               end
+        relative_path = target_project.path.relative_path_from(path).to_s
+        relative_path = target_project.path.basename if relative_path == '.'
         "container:#{relative_path}"
       end
     end

data/lib/xcodeproj/scheme/test_action.rb

@@ -127,10 +127,13 @@ module Xcodeproj
         #        or an existing XML 'TestableReference' node element to reference,
         #        or nil to create an new, empty TestableReference
         #
-        def initialize(target_or_node = nil)
+        # @param [Xcodeproj::Project] the root project to reference from
+        #                             (when nil the project of the target is used)
+        #
+        def initialize(target_or_node = nil, root_project = nil)
           create_xml_element_with_fallback(target_or_node, 'TestableReference') do
             self.skipped = false
-            add_buildable_reference BuildableReference.new(target_or_node) unless target_or_node.nil?
+            add_buildable_reference BuildableReference.new(target_or_node, root_project) unless target_or_node.nil?
           end
         end
 

data/lib/xcodeproj/workspace.rb

@@ -183,7 +183,7 @@ module Xcodeproj
 
     #-------------------------------------------------------------------------#
 
-    # Load all schemes from all projects in workspace
+    # Load all schemes from all projects in workspace or in the workspace container itself
     #
     # @param [String] workspace_dir_path
     #         path of workspaces dir
@@ -195,6 +195,13 @@ module Xcodeproj
         project_full_path = file_reference.absolute_path(workspace_dir_path)
         load_schemes_from_project(project_full_path)
       end
+
+      # Load schemes that are in the workspace container.
+      workspace_abs_path = File.absolute_path(workspace_dir_path)
+      Dir[File.join(workspace_dir_path, 'xcshareddata', 'xcschemes', '*.xcscheme')].each do |scheme|
+        scheme_name = File.basename(scheme, '.xcscheme')
+        @schemes[scheme_name] = workspace_abs_path
+      end
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomos
@@ -28,16 +28,22 @@ dependencies:
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 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).
@@ -174,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 3
 summary: Create and modify Xcode projects from Ruby.