fastlane 2.201.0 → 2.203.0

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -2,35 +2,35 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.49.2",
+        "version": "0.49.3",
         "bottle": {
           "rebuild": 0,
           "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
             "arm64_monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:2279db95259ddbc7ad83e47f5bbf8c308db55b74d5464ac79a027bd33138b023",
-              "sha256": "2279db95259ddbc7ad83e47f5bbf8c308db55b74d5464ac79a027bd33138b023"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:3fd0427fdb74e0cc88da322ce2b2cd0b9e021fd286f34978b01b0bb62f9e8529",
+              "sha256": "3fd0427fdb74e0cc88da322ce2b2cd0b9e021fd286f34978b01b0bb62f9e8529"
             },
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:2f6bddbef7d750d6ed546ed5decd4d54d439f16009491bdb4e4999c99d877bcf",
-              "sha256": "2f6bddbef7d750d6ed546ed5decd4d54d439f16009491bdb4e4999c99d877bcf"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:cc99c52385e32a1d2bb42625a535cac9835313e65ba84776cbe2ad49ae41167d",
+              "sha256": "cc99c52385e32a1d2bb42625a535cac9835313e65ba84776cbe2ad49ae41167d"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:190bf822a188ec8e8be754de2fcd34166ffb07bbd40d67385653d898a251b167",
-              "sha256": "190bf822a188ec8e8be754de2fcd34166ffb07bbd40d67385653d898a251b167"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:39877fc1115e6f15d20a76c30ddbb23d45f52fb95eb81382c4f4abe2b98eb03b",
+              "sha256": "39877fc1115e6f15d20a76c30ddbb23d45f52fb95eb81382c4f4abe2b98eb03b"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:fe294ff0fa69548876a70ef7aaf30b7221a43adc9f75f7c157c6f881089da6eb",
-              "sha256": "fe294ff0fa69548876a70ef7aaf30b7221a43adc9f75f7c157c6f881089da6eb"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ead4633c1ec372b7cc6995dba2d3352691b4086f501e0346629072873bccef99",
+              "sha256": "ead4633c1ec372b7cc6995dba2d3352691b4086f501e0346629072873bccef99"
             },
             "catalina": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:2a174bf9c47a070b1fcaa32c066cd7c82604fc428db952f11c9bf1e4448c567a",
-              "sha256": "2a174bf9c47a070b1fcaa32c066cd7c82604fc428db952f11c9bf1e4448c567a"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:359cd4f2c3eea7c28f485db06dc955d8b27eabab340420a0c52931004a3ee3e7",
+              "sha256": "359cd4f2c3eea7c28f485db06dc955d8b27eabab340420a0c52931004a3ee3e7"
             }
           }
         }
@@ -56,10 +56,10 @@
         "macOS": "11.6"
       },
       "monterey": {
-        "HOMEBREW_VERSION": "3.3.11-80-g5ee14b9",
+        "HOMEBREW_VERSION": "3.3.12-34-gc40b2ba",
         "HOMEBREW_PREFIX": "/opt/homebrew",
-        "Homebrew/homebrew-core": "9ca1b8fa2865504f50fcdbe679417daedfa274cc",
-        "CLT": "13.1.0.0.1.1633545042",
+        "Homebrew/homebrew-core": "f896f406dfd6f06ab001c6ce36e7d2087459c77a",
+        "CLT": "13.2.0.0.1.1638488800",
         "Xcode": "13.2.1",
         "macOS": "12.0.1"
       }

data/scan/lib/scan/error_handler.rb

@@ -27,6 +27,15 @@ module Scan
           print("If you are using zshell or another shell, make sure to edit the correct bash file.")
           print("For more information visit this stackoverflow answer:")
           print("https://stackoverflow.com/a/17031697/445598")
+        when /Testing failed on/
+          # This is important because xcbeautify and raw output will print:
+          # Testing failed on 'iPhone 13 Pro Max'
+          # when multiple devices are use.
+          # xcpretty hides this output so its not an issue with xcpretty.
+          # We need to catch "Testing failed on" before "Test failed"
+          # so that an error isn't raised.
+          # Raising an error prevents trainer from processing the xcresult
+          return
         when /Testing failed/
           UI.build_failure!("Error building the application. #{details}")
         when /Executed/, /Failing tests:/

data/scan/lib/scan/options.rb

@@ -328,6 +328,11 @@ module Scan
                                      default_value: false),
 
         # concurrency
+        FastlaneCore::ConfigItem.new(key: :parallel_testing,
+                                     type: Boolean,
+                                     env_name: "SCAN_PARALLEL_TESTING",
+                                     description: "Optionally override the per-target setting in the scheme for running tests in parallel. Equivalent to -parallel-testing-enabled",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :concurrent_workers,
                                      type: Integer,
                                      env_name: "SCAN_CONCURRENT_WORKERS",
@@ -515,7 +520,7 @@ module Scan
                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :number_of_retries,
                                     env_name: 'SCAN_NUMBER_OF_RETRIES',
-                                    description: "The number of times a test can fail before scan should stop retrying",
+                                    description: "The number of times a test can fail",
                                     type: Integer,
                                     default_value: 0)
 

data/scan/lib/scan/runner.rb

@@ -20,7 +20,8 @@ module Scan
     end
 
     def run
-      handle_results(test_app)
+      @xcresults_before_run = find_xcresults_in_derived_data
+      return handle_results(test_app)
     end
 
     def test_app
@@ -106,7 +107,7 @@ module Scan
       tests = retryable_tests(error_output)
 
       if tests.empty?
-        UI.crash!("Failed to find failed tests to retry (could not parse error output)")
+        UI.build_failure!("Failed to find failed tests to retry (could not parse error output)")
       end
 
       Scan.config[:only_testing] = tests
@@ -172,21 +173,44 @@ module Scan
       return find_filename('json-compilation-database')
     end
 
+    def find_xcresults_in_derived_data
+      derived_data_path = Scan.config[:derived_data_path]
+      return [] if derived_data_path.nil? # Swift packages might not have derived data
+
+      xcresults_path = File.join(derived_data_path, "Logs", "Test", "*.xcresult")
+      return Dir[xcresults_path]
+    end
+
     def trainer_test_results
       require "trainer"
 
       results = {
         number_of_tests: 0,
         number_of_failures: 0,
-        number_of_retries: 0
+        number_of_retries: 0,
+        number_of_tests_excluding_retries: 0,
+        number_of_failures_excluding_retries: 0
       }
 
       result_bundle_path = Scan.cache[:result_bundle_path]
 
+      # Looks for xcresult file in derived data if not specifically set
+      if result_bundle_path.nil?
+        xcresults = find_xcresults_in_derived_data
+        new_xcresults = xcresults - @xcresults_before_run
+
+        if new_xcresults.size != 1
+          UI.build_failure!("Cannot find .xcresult in derived data which is needed to determine test results. This is an issue within scan. File an issue on GitHub or try setting option `result_bundle: true`")
+        end
+
+        result_bundle_path = new_xcresults.first
+        Scan.cache[:result_bundle_path] = result_bundle_path
+      end
+
       output_path = Scan.config[:output_directory] || Dir.mktmpdir
       output_path = File.absolute_path(output_path)
 
-      UI.crash!("A -resultBundlePath is needed to parse the test results. This should not have happened. Please file an issue.") unless result_bundle_path
+      UI.build_failure!("A -resultBundlePath is needed to parse the test results. This should not have happened. Please file an issue.") unless result_bundle_path
 
       params = {
         path: result_bundle_path,
@@ -222,8 +246,10 @@ module Scan
 
       resulting_paths = Trainer::TestParser.auto_convert(params)
       resulting_paths.each do |path, data|
-        results[:number_of_tests] += data[:number_of_tests_excluding_retries]
-        results[:number_of_failures] += data[:number_of_failures_excluding_retries]
+        results[:number_of_tests] += data[:number_of_tests]
+        results[:number_of_failures] += data[:number_of_failures]
+        results[:number_of_tests_excluding_retries] += data[:number_of_tests_excluding_retries]
+        results[:number_of_failures_excluding_retries] += data[:number_of_failures_excluding_retries]
         results[:number_of_retries] += data[:number_of_retries]
       end
 
@@ -231,13 +257,13 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
-      return if Scan.config[:build_for_testing]
+      return nil if Scan.config[:build_for_testing]
 
       results = trainer_test_results
 
       number_of_retries = results[:number_of_retries]
-      number_of_tests = results[:number_of_tests]
-      number_of_failures = results[:number_of_failures]
+      number_of_tests = results[:number_of_tests_excluding_retries]
+      number_of_failures = results[:number_of_failures_excluding_retries]
 
       SlackPoster.new.run({
         tests: number_of_tests,
@@ -283,6 +309,7 @@ module Scan
       end
 
       open_report
+      return results
     end
 
     def open_report

data/scan/lib/scan/test_command_generator.rb

@@ -53,8 +53,9 @@ module Scan
       if config[:use_system_scm] && !options.include?("-scmProvider system")
         options << "-scmProvider system"
       end
-      options << "-resultBundlePath '#{result_bundle_path(config[:result_bundle])}'"
+      options << "-resultBundlePath '#{result_bundle_path(true)}'" if config[:result_bundle]
       if FastlaneCore::Helper.xcode_at_least?(10)
+        options << "-parallel-testing-enabled #{config[:parallel_testing] ? 'YES' : 'NO'}" unless config[:parallel_testing].nil?
         options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
         options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
         options << "-disable-concurrent-testing" if config[:disable_concurrent_testing]
@@ -72,9 +73,13 @@ module Scan
       end
       options << "-xctestrun '#{config[:xctestrun]}'" if config[:xctestrun]
       options << config[:xcargs] if config[:xcargs]
-      if config[:number_of_retries] >= 1 && FastlaneCore::Helper.xcode_at_least?(13)
+
+      # Number of retries does not equal xcodebuild's -test-iterations number
+      # It needs include 1 iteration by default
+      number_of_retries = config[:number_of_retries] + 1
+      if number_of_retries > 1 && FastlaneCore::Helper.xcode_at_least?(13)
         options << "-retry-tests-on-failure"
-        options << "-test-iterations #{config[:number_of_retries]}"
+        options << "-test-iterations #{number_of_retries}"
       end
 
       # detect_values will ensure that these values are present as Arrays if

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -435,7 +435,8 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         filter = {
           state: [
-            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW,
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::IN_REVIEW
           ].join(","),
           platform: platform
         }

data/trainer/lib/trainer/options.rb

@@ -33,6 +33,12 @@ module Trainer
                                      default_value: nil,
                                      optional: true,
                                      description: "Directoy in which the xml files should be written to. Same directory as source by default"),
+        FastlaneCore::ConfigItem.new(key: :output_filename,
+                                     short_option: "-f",
+                                     env_name: "TRAINER_OUTPUT_FILENAME",
+                                     default_value: nil,
+                                     optional: true,
+                                     description: "Filename the xml file should be written to. Defaults to name of input file. (Only works if one input file is used)"),
         FastlaneCore::ConfigItem.new(key: :fail_build,
                                      env_name: "TRAINER_FAIL_BUILD",
                                      description: "Should this step stop the build if the tests fail? Set this to false if you're handling this with a test reporter",
@@ -48,6 +54,11 @@ module Trainer
                                      env_name: "TRAINER_SILENT",
                                      description: "Silences all output",
                                      is_string: false,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :output_remove_retry_attempts,
+                                     env_name: "TRAINER_OUTPUT_REMOVE_RETRY_ATTEMPTS",
+                                     description: "Doesn't include retry attempts in the output",
+                                     is_string: false,
                                      default_value: false)
       ]
     end

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.201.0
+  version: 2.203.0
 platform: ruby
 authors:
-- Jan Piotrowski
-- Jorge Revuelta H
-- Łukasz Grabowski
-- Max Ott
-- Joshua Liebowitz
-- Stefan Natchev
-- Andrew McBurney
+- Jimmy Dee
+- Felix Krause
+- Maksym Grebenets
+- Fumiya Nakamura
+- Matthew Ellis
 - Jérôme Lacoste
+- Iulian Onofrei
 - Kohki Miki
-- Helmut Januschka
-- Jimmy Dee
 - Olivier Halligon
-- Danielle Tomlinson
-- Maksym Grebenets
+- Roger Oba
+- Helmut Januschka
+- Łukasz Grabowski
+- Andrew McBurney
+- Manu Wallner
+- Stefan Natchev
+- Joshua Liebowitz
 - Manish Rathi
-- Matthew Ellis
-- Daniel Jankowski
-- Luka Mirosevic
 - Satoshi Namai
-- Roger Oba
-- Felix Krause
-- Fumiya Nakamura
-- Aaron Brager
-- Iulian Onofrei
 - Josh Holtz
-- Manu Wallner
+- Jorge Revuelta H
+- Max Ott
+- Aaron Brager
+- Daniel Jankowski
+- Danielle Tomlinson
+- Luka Mirosevic
+- Jan Piotrowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -1395,6 +1395,7 @@ files:
 - fastlane_core/README.md
 - fastlane_core/lib/assets/XMLTemplate.xml.erb
 - fastlane_core/lib/fastlane_core.rb
+- fastlane_core/lib/fastlane_core/.helper.rb.swp
 - fastlane_core/lib/fastlane_core/analytics/action_completion_context.rb
 - fastlane_core/lib/fastlane_core/analytics/action_launch_context.rb
 - fastlane_core/lib/fastlane_core/analytics/analytics_event_builder.rb
@@ -1577,6 +1578,8 @@ files:
 - scan/lib/assets/ScanfileTemplate
 - scan/lib/assets/ScanfileTemplate.swift
 - scan/lib/scan.rb
+- scan/lib/scan/.detect_values.rb.swp
+- scan/lib/scan/.runner.rb.swp
 - scan/lib/scan/commands_generator.rb
 - scan/lib/scan/detect_values.rb
 - scan/lib/scan/error_handler.rb