fastlane-plugin-sq_ci 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78148f8b4b871b6fb375d6131e4db8719cd32e4f055a8a0ae27d3ce1392e0b7
-  data.tar.gz: 40a69c0951782de0b44c9757e210ba90a2c74442e8c60394a61555fa98fe58a3
+  metadata.gz: 360047a92a80c2359893f50bce21f89bdf09e9816af3803cb190904a1d01d23a
+  data.tar.gz: 45ccbb162071a69764a8e177de6f0a4c2f5eb3a9dc1b03f861f54d6fc5930c30
 SHA512:
-  metadata.gz: 370eeeb1362e7d52d095ccbf7b88abc293531fab7bd93a68cdc2f8d480ee907b6897305d566e60bf61942343266bbd7946b851f257d3e5729c4e80c122ccac70
-  data.tar.gz: 2b33b80d066c9206d7e3ab785e80cd1f5465b7fff77868d86c9808050a97212bc49d50da1775c0924f8d89b1c1f3b439f3a5633e01e2527e5e5d76d70c9738f7
+  metadata.gz: d03fa374e78f4a8fb189a5db71d0e5611e1ce9580d4ffd48e265ce2880cccfa31276b7b46f8cf77a66ef04b6e42b6e14301e0f44132fe5d8b83417425c13e340
+  data.tar.gz: 8889c93fb1cb84e8950de504caa20fd7970df9b0ae35fd24b8d4afc994b69a22932f874322e60ee974947a90928a36b0082b5ed5b335bbc0051771708cd5ffdf

data/lib/fastlane/plugin/sq_ci/actions/sq_ci_get_bundle_identifier_action.rb

@@ -12,7 +12,7 @@ module Fastlane
         end
 
         build_configuration = Helper::SqCiHelper.get_xcodeproj_build_config(project_path, params[:main_target], params[:scheme])
-        build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+        Helper::SqCiHelper.resolve_recursive_build_setting(build_configuration, 'PRODUCT_BUNDLE_IDENTIFIER')
       end
 
       def self.description

data/lib/fastlane/plugin/sq_ci/actions/sq_ci_get_team_identifier_action.rb

@@ -12,7 +12,7 @@ module Fastlane
         end
 
         build_configuration = Helper::SqCiHelper.get_xcodeproj_build_config(project_path, params[:main_target], params[:scheme])
-        build_configuration.build_settings['DEVELOPMENT_TEAM']
+        Helper::SqCiHelper.resolve_recursive_build_setting(build_configuration, 'DEVELOPMENT_TEAM')
       end
 
       def self.description

data/lib/fastlane/plugin/sq_ci/helper/sq_ci_helper.rb

@@ -135,57 +135,59 @@ module Fastlane
 
       def self.get_xcodeproj_build_config(xcodeproj_path, main_target, target_scheme)
         project = Xcodeproj::Project.open(xcodeproj_path)
-        xcscheme = self.xcscheme(xcodeproj_path, target_scheme)
-        target_uuids = xcscheme.build_action.entries.first.buildable_references.map(&:target_uuid)
-
-        targets = project.targets.find_all { |t| target_uuids.include?(t.uuid) }
-        if main_target.nil?
-          build_configuration = xcbuildconfiguration(targets.first, target_scheme)
-        else
-          target = targets.find { |t| t.name == main_target }
-
-          UI.user_error!("Target '#{main_target}' does not exist in the given scheme") if target.nil?
-
-          build_configuration = xcbuildconfiguration(target, target_scheme)
-        end
-
-        build_configuration
+        target = project.native_targets.find { |native_target| native_target.name == main_target }
+        target.build_configurations.find { |configuration| configuration.name == target_scheme }
       end
 
       def self.get_xcodeproj_targets(xcodeproj_path, target_scheme)
         project = Xcodeproj::Project.open(xcodeproj_path)
-
         targets = {}
-        project.targets.each do |target|
-          build_configuration = xcbuildconfiguration(target, target_scheme)
-          targets[target.name] = build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+        project.native_targets.each do |native_target|
+          build_configuration = native_target.build_configurations.find { |configuration| configuration.name == target_scheme }
+          targets[native_target.name] = self.resolve_recursive_build_setting(build_configuration, 'PRODUCT_BUNDLE_IDENTIFIER')
         end
 
         targets
       end
 
-      def self.xcscheme(xcodeproj_path, target_scheme)
-        scheme_paths = Dir.glob("#{xcodeproj_path}/xcshareddata/xcschemes/#{target_scheme}.xcscheme")
-        if scheme_paths.empty?
-          scheme_paths = Dir.glob("#{xcodeproj_path}/xcuserdata/xcschemes/#{target_scheme}.xcscheme")
-        end
-        UI.user_error!("Scheme '#{target_scheme}' does not exist in the given project") if scheme_paths.empty?
-
-        scheme_path = scheme_paths.first
-        Xcodeproj::XCScheme.new(scheme_path)
-      end
-
-      def self.xcbuildconfiguration(target, build_configuration_name)
-        if build_configuration_name.nil?
-          configuration = target.build_configurations.first
-
-          UI.message("No configuration specified, taking first: '#{configuration.name}'")
-        else
-          configuration = target.build_configurations.find { |c| c.name == build_configuration_name }
-
-          UI.user_error!("Build configuration '#{build_configuration_name}' does not exist in target '#{target.name}'") if configuration.nil?
+      def self.resolve_recursive_build_setting(config, setting)
+        resolution = config.resolve_build_setting(setting)
+      
+        # finds values with one of
+        # $VALUE
+        # $(VALLUE)
+        # $(VALUE:modifier)
+        # ${VALUE}
+        # ${VALUE:modifier}
+        resolution.gsub(/\$[\(\{]?.+[\)\}]?/) do |raw_value|
+          # strip $() characters
+          unresolved = raw_value.gsub(/[\$\(\)\{\}]/, '')
+      
+          # Get the modifiers after the ':' characters
+          name, *modifiers = unresolved.split(':')
+      
+          # Expand variable name
+          subresolution = resolve_recursive_build_setting(config, name)
+      
+          # Apply modifiers
+          # NOTE: not all cases accounted for
+          #
+          # See http://codeworkshop.net/posts/xcode-build-setting-transformations
+          # for various modifier options
+          modifiers.each do |modifier|
+            case modifier
+            when 'lower'
+              subresolution.downcase!
+            when 'upper'
+              subresolution.upcase!
+            else
+              # Fastlane message
+              UI.error("Unknown modifier: `#{modifier}` in `#{raw_value}")
+            end
+          end
+      
+          subresolution
         end
-        configuration
       end
     end
   end

data/lib/fastlane/plugin/sq_ci/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module SqCi
-    VERSION = "0.5.1"
+    VERSION = "0.5.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-sq_ci
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Semen Kologrivov