xcodeproj 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d90a203dc3522c9997eb87aae3f6f1a29b4bebdf
-  data.tar.gz: e62db789786883b44ec174e910b4f1ba97bdd384
+  metadata.gz: 0b1d369116a7d3da45d626c4b997b9d61fd9ccf8
+  data.tar.gz: 35c1dd673e635eebbaa636dcfa6db0e9e33bb6c3
 SHA512:
-  metadata.gz: d41cd07ebcd1168337125625243e283371b346def515a290af19cbc2b5c8e360c4612b5f0021f8dabe45bd9f8190537a0a55bb4bdeb9abbdab56ec2a0fe1ec27
-  data.tar.gz: d40a0254fdb0b7bbef8e63ed5189f8eaa04b93a0e3f51c3e597db5f59577e7dbe158af2910e6fc379a0d279e9a2b90fbad9fe872a3c28eadf1a9c7e8fc879a0c
+  metadata.gz: 8f80155cd3b837c429f91a8efcbfe232eb6a27650d77945ccd461be6c957aa22a4fb1e2a8fa21703aeba76aa3ddfc130ca64dc1666ffb6822d83f2fbfc49e40e
+  data.tar.gz: fc8000ee50ffb1eb3a1b2b6a1cc05367fbb468cb12e02f838adb32baf788dc9c9901dc62b3011d4c39afc399cdf1437de38de1cbfe120e9c3718965e85df91e1

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Xcodeproj)
 [![Coverage](https://img.shields.io/codeclimate/coverage/github/CocoaPods/Xcodeproj.svg?style=flat)](https://codeclimate.com/github/CocoaPods/Xcodeproj)
-[![Code Climate](https://img.shields.io/codeclimate/github/CocoaPods/Xcodeproj.svg?style=flat)](https://codeclimate.com/github/CocoaPods/Xcodeproj)
+[![Code Climate](https://img.shields.io/codeclimate/maintainability/CocoaPods/Xcodeproj.svg?style=flat&label=code%20climate)](https://codeclimate.com/github/CocoaPods/Xcodeproj)
 
 Xcodeproj lets you create and modify Xcode projects from [Ruby][ruby].
 Script boring management tasks or build Xcode-friendly libraries. Also includes

data/lib/xcodeproj/constants.rb

@@ -408,7 +408,7 @@ module Xcodeproj
 
     # @return [Array] The extensions which are associated with header files.
     #
-    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def).freeze
+    HEADER_FILES_EXTENSIONS = %w(.h .hh .hpp .ipp .tpp .hxx .def .inl).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.3'.freeze unless defined? Xcodeproj::VERSION
+  VERSION = '1.5.4'.freeze unless defined? Xcodeproj::VERSION
 end

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

@@ -84,9 +84,9 @@ module Xcodeproj
         #
         def resolve_build_setting(key, root_target = nil)
           setting = build_settings[key]
-          setting = resolve_variable_substitution(setting, root_target) if setting.is_a?(String)
+          setting = resolve_variable_substitution(key, setting, root_target) if setting.is_a?(String)
           config_setting = base_configuration_reference && config[key]
-          config_setting = resolve_variable_substitution(config_setting, root_target) if config_setting.is_a?(String)
+          config_setting = resolve_variable_substitution(key, config_setting, root_target) if config_setting.is_a?(String)
 
           project_setting = project.build_configuration_list[name]
           project_setting = nil if project_setting == self
@@ -118,17 +118,18 @@ module Xcodeproj
           build_setting_value.map { |value| Constants::INHERITED_KEYWORDS.include?(value) ? inherited : value }.flatten
         end
 
-        def resolve_variable_substitution(config_setting, root_target)
-          variable = match_variable(config_setting)
+        def resolve_variable_substitution(key, value, root_target)
+          variable = match_variable(value)
+          return nil if key.eql?(variable)
           if variable.nil?
-            return name if config_setting.eql?('CONFIGURATION')
+            return name if value.eql?('CONFIGURATION')
             if root_target
-              return root_target.build_configuration_list[name].resolve_build_setting(config_setting, root_target) || config_setting
+              return root_target.build_configuration_list[name].resolve_build_setting(value, root_target) || value
             else
-              return resolve_build_setting(config_setting, root_target) || config_setting
+              return resolve_build_setting(value, root_target) || value
             end
           end
-          resolve_variable_substitution(config_setting.sub(CAPTURE_VARIABLE_IN_BUILD_CONFIG, resolve_variable_substitution(variable, root_target)), root_target)
+          resolve_variable_substitution(key, value.sub(CAPTURE_VARIABLE_IN_BUILD_CONFIG, resolve_variable_substitution(key, variable, root_target)), root_target)
         end
 
         def match_variable(config_setting)

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

@@ -264,7 +264,9 @@ module Xcodeproj
         def dependency_for_target(target)
           dependencies.find do |dep|
             if dep.target_proxy.remote?
-              dep.target_proxy.remote_global_id_string == target.uuid
+              subproject_reference = project.reference_for_path(target.project.path)
+              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
             end

data/lib/xcodeproj/scheme.rb

@@ -10,6 +10,7 @@ require 'xcodeproj/scheme/archive_action'
 require 'xcodeproj/scheme/buildable_product_runnable'
 require 'xcodeproj/scheme/buildable_reference'
 require 'xcodeproj/scheme/macro_expansion'
+require 'xcodeproj/scheme/remote_runnable'
 
 module Xcodeproj
   # This class represents a Scheme document represented by a ".xcscheme" file
@@ -307,6 +308,7 @@ module Xcodeproj
                            end
       scheme_folder_path.mkpath
       scheme_path = scheme_folder_path + "#{name}.xcscheme"
+      @file_path = scheme_path
       File.open(scheme_path, 'w') do |f|
         f.write(to_s)
       end

data/lib/xcodeproj/scheme/launch_action.rb

@@ -47,6 +47,20 @@ module Xcodeproj
         @xml_element.attributes['allowLocationSimulation'] = bool_to_string(flag)
       end
 
+      # @return [String]
+      #         The launch automatically substyle
+      #
+      def launch_automatically_substyle
+        @xml_element.attributes['launchAutomaticallySubstyle']
+      end
+
+      # @param [String] flag
+      #        Set the launch automatically substyle ('2' for extensions)
+      #
+      def launch_automatically_substyle=(value)
+        @xml_element.attributes['launchAutomaticallySubstyle'] = value.to_s
+      end
+
       # @return [BuildableProductRunnable]
       #         The BuildReference to launch when executing the Launch Action
       #

data/lib/xcodeproj/scheme/remote_runnable.rb

@@ -0,0 +1,92 @@
+module Xcodeproj
+  class XCScheme
+    # This class wraps the RemoteRunnable node of a .xcscheme XML file
+    #
+    # A RemoteRunnable is a product that is both buildable
+    # (it contains a BuildableReference) and
+    # runnable remotely (it can be launched and debugged on a remote device, i.e. an Apple Watch)
+    #
+    class RemoteRunnable < XMLElementWrapper
+      # @param [Xcodeproj::Project::Object::AbstractTarget, REXML::Element] target_or_node
+      #        Either the Xcode target to reference,
+      #        or an existing XML 'RemoteRunnable' node element to reference
+      #        or nil to create an new, empty RemoteRunnable
+      #
+      # @param [#to_s] runnable_debugging_mode
+      #        The debugging mode (usually '2')
+      #
+      # @param [#to_s] bundle_identifier
+      #        The bundle identifier (usually 'com.apple.Carousel')
+      #
+      # @param [#to_s] remote_path
+      #        The remote path (not required, unknown usage)
+      #
+      def initialize(target_or_node = nil, runnable_debugging_mode = nil, bundle_identifier = nil, remote_path = nil)
+        create_xml_element_with_fallback(target_or_node, 'RemoteRunnable') do
+          self.buildable_reference = BuildableReference.new(target_or_node) if target_or_node
+          @xml_element.attributes['runnableDebuggingMode'] = runnable_debugging_mode.to_s if runnable_debugging_mode
+          @xml_element.attributes['BundleIdentifier'] = bundle_identifier.to_s if bundle_identifier
+          @xml_element.attributes['RemotePath'] = remote_path.to_s if remote_path
+        end
+      end
+
+      # @return [String]
+      #         The runnable debugging mode (usually '2')
+      #
+      def runnable_debugging_mode
+        @xml_element.attributes['runnableDebuggingMode']
+      end
+
+      # @param [String] value
+      #        Set the runnable debugging mode
+      #
+      def runnable_debugging_mode=(value)
+        @xml_element.attributes['runnableDebuggingMode'] = value.to_s
+      end
+
+      # @return [String]
+      #         The runnable bundle identifier (usually 'com.apple.Carousel')
+      #
+      def bundle_identifier
+        @xml_element.attributes['BundleIdentifier']
+      end
+
+      # @param [String] value
+      #        Set the runnable bundle identifier
+      #
+      def bundle_identifier=(value)
+        @xml_element.attributes['BundleIdentifier'] = value.to_s
+      end
+
+      # @return [String]
+      #         The runnable remote path (not required, unknown usage)
+      #
+      def remote_path
+        @xml_element.attributes['RemotePath']
+      end
+
+      # @param [String] value
+      #        Set the runnable remote path
+      #
+      def remote_path=(value)
+        @xml_element.attributes['RemotePath'] = value.to_s
+      end
+
+      # @return [BuildableReference]
+      #         The buildable reference this remote runnable is gonna build and run
+      #
+      def buildable_reference
+        @buildable_reference ||= BuildableReference.new @xml_element.elements['BuildableReference']
+      end
+
+      # @param [BuildableReference] ref
+      #        Set the buildable reference this remote runnable is gonna build and run
+      #
+      def buildable_reference=(ref)
+        @xml_element.delete_element('BuildableReference')
+        @xml_element.add_element(ref.xml_element)
+        @buildable_reference = ref
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xcodeproj
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Eloy Duran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -132,6 +132,7 @@ files:
 - lib/xcodeproj/scheme/launch_action.rb
 - lib/xcodeproj/scheme/macro_expansion.rb
 - lib/xcodeproj/scheme/profile_action.rb
+- lib/xcodeproj/scheme/remote_runnable.rb
 - lib/xcodeproj/scheme/test_action.rb
 - lib/xcodeproj/scheme/xml_element_wrapper.rb
 - lib/xcodeproj/user_interface.rb