fastlane-plugin-sq_ci 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3101395af566ce6e6aa25d9c0f23ffb2589357f5bdcd008b24aca7c80de2241
-  data.tar.gz: '0958c135c717e5e45b88a516452be46ed9c23ad9c166ecbbf83b364f5e6db161'
+  metadata.gz: d78148f8b4b871b6fb375d6131e4db8719cd32e4f055a8a0ae27d3ce1392e0b7
+  data.tar.gz: 40a69c0951782de0b44c9757e210ba90a2c74442e8c60394a61555fa98fe58a3
 SHA512:
-  metadata.gz: 6a7187492320f11d4f9b8a37d0e778b0132307b778a5422c82b143924f0a4d3622b4d1ceb0ff479ddf79a86e9fecf758cbaa701d7f72942baaab5138b5d4ac18
-  data.tar.gz: 5750312d5128393d4247870342dd5dafbc931ccdfa5b92d430558e4cd433fa4b33ace486d381fdd96fdea54125a20f4680dfc10384e0229dce18175618d0876f
+  metadata.gz: 370eeeb1362e7d52d095ccbf7b88abc293531fab7bd93a68cdc2f8d480ee907b6897305d566e60bf61942343266bbd7946b851f257d3e5729c4e80c122ccac70
+  data.tar.gz: 2b33b80d066c9206d7e3ab785e80cd1f5465b7fff77868d86c9808050a97212bc49d50da1775c0924f8d89b1c1f3b439f3a5633e01e2527e5e5d76d70c9738f7

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

@@ -135,20 +135,58 @@ module Fastlane
 
       def self.get_xcodeproj_build_config(xcodeproj_path, main_target, target_scheme)
         project = Xcodeproj::Project.open(xcodeproj_path)
-        target = project.native_targets.find { |native_target| native_target.name == main_target }
-        target.build_configurations.find { |configuration| configuration.name == target_scheme }
+        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
       end
 
       def self.get_xcodeproj_targets(xcodeproj_path, target_scheme)
         project = Xcodeproj::Project.open(xcodeproj_path)
+
         targets = {}
-        project.native_targets.each do |native_target|
-          build_configuration = native_target.build_configurations.find { |configuration| configuration.name == target_scheme }
-          targets[native_target.name] = build_configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER']
+        project.targets.each do |target|
+          build_configuration = xcbuildconfiguration(target, target_scheme)
+          targets[target.name] = build_configuration.build_settings['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?
+        end
+        configuration
+      end
     end
   end
 end

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

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

metadata

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