fastlane 2.198.0 → 2.201.0.rc1

data/fastlane/swift/RunnerArgument.swift

@@ -1,5 +1,5 @@
 // RunnerArgument.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/Scanfile.swift

@@ -1,5 +1,5 @@
 // Scanfile.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 // This class is automatically included in FastlaneRunner during build
 
@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.198.0
+// Generated with fastlane 2.200.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -1,5 +1,5 @@
 // ScanfileProtocol.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 public protocol ScanfileProtocol: class {
     /// Path to the workspace file
@@ -14,10 +14,10 @@ public protocol ScanfileProtocol: class {
     /// The project's scheme. Make sure it's marked as `Shared`
     var scheme: String? { get }
 
-    /// The name of the simulator type you want to run tests on (e.g. 'iPhone 6')
+    /// The name of the simulator type you want to run tests on (e.g. 'iPhone 6' or 'iPhone SE (2nd generation) (14.5)')
     var device: String? { get }
 
-    /// Array of devices to run the tests on (e.g. ['iPhone 6', 'iPad Air'])
+    /// Array of devices to run the tests on (e.g. ['iPhone 6', 'iPad Air', 'iPhone SE (2nd generation) (14.5)'])
     var devices: [String]? { get }
 
     /// Should skip auto detecting of devices if none were specified
@@ -296,4 +296,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.95]
+// FastlaneRunnerAPIVersion [0.9.98]

data/fastlane/swift/Screengrabfile.swift

@@ -1,5 +1,5 @@
 // Screengrabfile.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 // This class is automatically included in FastlaneRunner during build
 
@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.198.0
+// Generated with fastlane 2.200.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -1,5 +1,5 @@
 // ScreengrabfileProtocol.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 public protocol ScreengrabfileProtocol: class {
     /// Path to the root of your Android SDK installation, e.g. ~/tools/android-sdk-macosx
@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.85]
+// FastlaneRunnerAPIVersion [0.9.88]

data/fastlane/swift/Snapshotfile.swift

@@ -1,5 +1,5 @@
 // Snapshotfile.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 // This class is automatically included in FastlaneRunner during build
 
@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.198.0
+// Generated with fastlane 2.200.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -1,5 +1,5 @@
 // SnapshotfileProtocol.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 public protocol SnapshotfileProtocol: class {
     /// Path the workspace file
@@ -200,4 +200,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.79]
+// FastlaneRunnerAPIVersion [0.9.82]

data/fastlane/swift/SocketClient.swift

@@ -1,5 +1,5 @@
 // SocketClient.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/SocketClientDelegateProtocol.swift

@@ -1,5 +1,5 @@
 // SocketClientDelegateProtocol.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane/swift/SocketResponse.swift

@@ -1,5 +1,5 @@
 // SocketResponse.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 //
 //  ** NOTE **

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

@@ -2,35 +2,35 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.48.18",
+        "version": "0.49.1",
         "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:adbb11cdda0596a1f40e920f826a2e1ffe6aeb1643c43ddb108f25f30755be39",
-              "sha256": "adbb11cdda0596a1f40e920f826a2e1ffe6aeb1643c43ddb108f25f30755be39"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:c43caffb4d2cf9546b0a8fa732ffe5d95b1b1fd7ab03f1c5da39c8e7a0e8ecb4",
+              "sha256": "c43caffb4d2cf9546b0a8fa732ffe5d95b1b1fd7ab03f1c5da39c8e7a0e8ecb4"
             },
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:74691b21c40d34459c5825306828039bdbdfdd02c80d1cea5c449c3f59760ab1",
-              "sha256": "74691b21c40d34459c5825306828039bdbdfdd02c80d1cea5c449c3f59760ab1"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ad0ce5fc15fe1d339d366ece18694fdc1d14021684462a126ed20b537a1a9bf5",
+              "sha256": "ad0ce5fc15fe1d339d366ece18694fdc1d14021684462a126ed20b537a1a9bf5"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:14e4b90f29b55b06c92f90b6e81e8dd55c54ff258ee8b0bab2bb479ce0cc8daf",
-              "sha256": "14e4b90f29b55b06c92f90b6e81e8dd55c54ff258ee8b0bab2bb479ce0cc8daf"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:33652b8015d31dbe45e00bdc598f1b228cb63c7083b90137fdec66318a88010f",
+              "sha256": "33652b8015d31dbe45e00bdc598f1b228cb63c7083b90137fdec66318a88010f"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:73f0497b504f87159bc2d133371014e0372799d89f62bc78068b3b5427ae614f",
-              "sha256": "73f0497b504f87159bc2d133371014e0372799d89f62bc78068b3b5427ae614f"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:f0ad88e5594a6a3e5a35834a9a22473a05511375942dbb046d1085cc537d60b8",
+              "sha256": "f0ad88e5594a6a3e5a35834a9a22473a05511375942dbb046d1085cc537d60b8"
             },
             "catalina": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:11543d157b589acdf9de93133a68fa32aa00372b574a64c40292aead20f6f6cb",
-              "sha256": "11543d157b589acdf9de93133a68fa32aa00372b574a64c40292aead20f6f6cb"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:564f5daf9cd82407843aed590bd4190f3e5aaa73a30b3bc8ae07135f1319ac97",
+              "sha256": "564f5daf9cd82407843aed590bd4190f3e5aaa73a30b3bc8ae07135f1319ac97"
             }
           }
         }
@@ -56,11 +56,11 @@
         "macOS": "11.6"
       },
       "monterey": {
-        "HOMEBREW_VERSION": "3.3.4",
+        "HOMEBREW_VERSION": "3.3.10-21-g3ba6afb",
         "HOMEBREW_PREFIX": "/opt/homebrew",
-        "Homebrew/homebrew-core": "446005a8fbbc1a51d0bd8efd8e03bf82f1f78fab",
+        "Homebrew/homebrew-core": "54f307bcd04cec374c7fd3f22fe7e6b13f1ad783",
         "CLT": "13.1.0.0.1.1633545042",
-        "Xcode": "13.1",
+        "Xcode": "13.2.1",
         "macOS": "12.0.1"
       }
     }

data/fastlane/swift/main.swift

@@ -1,5 +1,5 @@
 // main.swift
-// Copyright (c) 2021 FastlaneTools
+// Copyright (c) 2022 FastlaneTools
 
 //
 //  ** NOTE **

data/fastlane_core/lib/fastlane_core/ipa_file_analyser.rb

@@ -73,12 +73,17 @@ module FastlaneCore
     end
 
     def self.fetch_info_plist_with_unzip(path)
-      list, error, = Open3.capture3("unzip", "-Z", "-1", path)
+      entry, error, = Open3.capture3("unzip", "-Z", "-1", path, "*Payload/*.app/Info.plist")
+
+      # unzip can return multiple Info.plist files if is an embedded app bundle (a WatchKit app)
+      #   - ContainsWatchApp/Payload/Sample.app/Watch/Sample WatchKit App.app/Info.plist
+      #   - ContainsWatchApp/Payload/Sample.app/Info.plist
+      #
+      # we can determine the main Info.plist by the shortest path
+      entry = entry.lines.map(&:chomp).min_by(&:size)
+
       UI.command_output(error) unless error.empty?
-      return nil if list.empty?
-      entry = list.chomp.split("\n").find do |e|
-        File.fnmatch("**/Payload/*.app/Info.plist", e, File::FNM_PATHNAME)
-      end
+      return nil if entry.nil? || entry.empty?
       data, error, = Open3.capture3("unzip", "-p", path, entry)
       UI.command_output(error) unless error.empty?
       return nil if data.empty?

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -2,6 +2,7 @@ require 'shellwords'
 require 'tmpdir'
 require 'fileutils'
 require 'credentials_manager/account_manager'
+require 'securerandom'
 
 require_relative 'features'
 require_relative 'helper'
@@ -150,10 +151,13 @@ module FastlaneCore
     end
 
     def file_upload_option(source)
-      if File.extname(source) == ".itmsp"
-        return "-f #{source.shellescape}"
-      else
+      ext = File.extname(source).downcase
+      is_asset_file_type = !File.directory?(source) && [".ipa", ".pkg", ".dmg", ".zip"].include?(ext)
+
+      if is_asset_file_type
         return "-assetFile #{source.shellescape}"
+      else
+        return "-f #{source.shellescape}"
       end
     end
 
@@ -492,9 +496,15 @@ module FastlaneCore
       # However, -assetFile requires -assetDescription if Linux or Windows
       # This will give the asset directly if macOS and asset_path exists
       # otherwise it will use the .itmsp package
-      actual_dir = if Helper.is_mac? && asset_path
+
+      force_itmsp = FastlaneCore::Env.truthy?("ITMSTRANSPORTER_FORCE_ITMS_PACKAGE_UPLOAD")
+      can_use_asset_path = Helper.is_mac? && asset_path
+
+      actual_dir = if can_use_asset_path && !force_itmsp
                      # The asset gets deleted upon completion so copying to a temp directory
-                     tmp_asset_path = File.join(Dir.tmpdir, File.basename(asset_path))
+                     # (with randomized filename, for multibyte-mixed filename upload fails)
+                     new_file_name = "#{SecureRandom.uuid}#{File.extname(asset_path)}"
+                     tmp_asset_path = File.join(Dir.tmpdir, new_file_name)
                      FileUtils.cp(asset_path, tmp_asset_path)
                      tmp_asset_path
                    elsif package_path

data/gym/lib/gym/generators/build_command_generator.rb

@@ -7,7 +7,7 @@ module Gym
     class << self
       def generate
         parts = prefix
-        parts << "xcodebuild"
+        parts << Gym.config[:xcodebuild_command]
         parts += options
         parts += buildactions
         parts += setting
@@ -43,7 +43,7 @@ module Gym
           options << "-scmProvider system"
         end
         options << config[:xcargs] if config[:xcargs]
-        options << "OTHER_SWIFT_FLAGS=\"-Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
+        options << "OTHER_SWIFT_FLAGS=\"\\\$(value) -Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
 
         options
       end
@@ -72,32 +72,78 @@ module Gym
       def pipe
         pipe = []
         pipe << "| tee #{xcodebuild_log_path.shellescape}"
-        unless Gym.config[:disable_xcpretty]
-          formatter = Gym.config[:xcpretty_formatter]
-          pipe << "| xcpretty"
-          pipe << " --test" if Gym.config[:xcpretty_test_format]
-          pipe << " --no-color" if Helper.colors_disabled?
-          pipe << " --formatter " if formatter
-          pipe << formatter if formatter
-          pipe << "--utf" if Gym.config[:xcpretty_utf]
-          report_output_junit = Gym.config[:xcpretty_report_junit]
-          report_output_html = Gym.config[:xcpretty_report_html]
-          report_output_json = Gym.config[:xcpretty_report_json]
-          if report_output_junit
-            pipe << " --report junit --output "
-            pipe << report_output_junit.shellescape
-          elsif report_output_html
-            pipe << " --report html --output "
-            pipe << report_output_html.shellescape
-          elsif report_output_json
-            pipe << " --report json-compilation-database --output "
-            pipe << report_output_json.shellescape
-          end
+
+        formatter = Gym.config[:xcodebuild_formatter].chomp
+        options = legacy_xcpretty_options
+
+        if Gym.config[:disable_xcpretty] || formatter == ''
+          UI.verbose("Not using an xcodebuild formatter")
+        elsif !options.empty?
+          UI.important("Detected legacy xcpretty being used so formatting wth xcpretty")
+          UI.important("Option(s) used: #{options.join(', ')}")
+          pipe += pipe_xcpretty
+        elsif formatter == 'xcpretty'
+          pipe += pipe_xcpretty
+        elsif formatter == 'xcbeautify'
+          pipe += pipe_xcbeautify
+        else
+          pipe << "| #{formatter}"
         end
+
         pipe << "> /dev/null" if Gym.config[:suppress_xcode_output]
         pipe
       end
 
+      def pipe_xcbeautify
+        pipe = ['| xcbeautify']
+
+        if FastlaneCore::Helper.colors_disabled?
+          pipe << '--disable-colored-output'
+        end
+
+        return pipe
+      end
+
+      def legacy_xcpretty_options
+        options = []
+
+        options << "xcpretty_test_format" if Gym.config[:xcpretty_test_format]
+        options << "xcpretty_formatter" if Gym.config[:xcpretty_formatter]
+        options << "xcpretty_report_junit" if Gym.config[:xcpretty_report_junit]
+        options << "xcpretty_report_html" if Gym.config[:xcpretty_report_html]
+        options << "xcpretty_report_json" if Gym.config[:xcpretty_report_json]
+        options << "xcpretty_utf" if Gym.config[:xcpretty_utf]
+
+        return options
+      end
+
+      def pipe_xcpretty
+        pipe = []
+
+        formatter = Gym.config[:xcpretty_formatter]
+        pipe << "| xcpretty"
+        pipe << " --test" if Gym.config[:xcpretty_test_format]
+        pipe << " --no-color" if Helper.colors_disabled?
+        pipe << " --formatter " if formatter
+        pipe << formatter if formatter
+        pipe << "--utf" if Gym.config[:xcpretty_utf]
+        report_output_junit = Gym.config[:xcpretty_report_junit]
+        report_output_html = Gym.config[:xcpretty_report_html]
+        report_output_json = Gym.config[:xcpretty_report_json]
+        if report_output_junit
+          pipe << " --report junit --output "
+          pipe << report_output_junit.shellescape
+        elsif report_output_html
+          pipe << " --report html --output "
+          pipe << report_output_html.shellescape
+        elsif report_output_json
+          pipe << " --report json-compilation-database --output "
+          pipe << report_output_json.shellescape
+        end
+
+        pipe
+      end
+
       def post_build
         commands = []
         commands << %{grep -E '^[0-9.]+ms' #{xcodebuild_log_path.shellescape} | grep -vE '^0\.[0-9]' | sort -nr > culprits.txt} if Gym.config[:analyze_build_time]

data/gym/lib/gym/options.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core/configuration/config_item'
+require 'fastlane/helper/xcodebuild_formatter_helper'
 require 'credentials_manager/appfile_config'
 require_relative 'module'
 
@@ -230,8 +231,18 @@ module Gym
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      optional: true,
                                      type: Boolean),
+
+        FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
+                                     env_names: ["GYM_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test')",
+                                     type: String,
+                                     default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
+                                     default_value_dynamic: true),
+
+        # xcpretty
         FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
                                      env_name: "DISABLE_XCPRETTY",
+                                     deprecated: "Use `xcodebuild_formatter: ''` instead",
                                      description: "Disable xcpretty formatting of build output",
                                      optional: true,
                                      type: Boolean),
@@ -259,22 +270,29 @@ module Gym
                                      env_name: "XCPRETTY_REPORT_JSON",
                                      description: "Have xcpretty create a JSON compilation database at the provided path",
                                      optional: true),
-        FastlaneCore::ConfigItem.new(key: :analyze_build_time,
-                                     env_name: "GYM_ANALYZE_BUILD_TIME",
-                                     description: "Analyze the project build time and store the output in 'culprits.txt' file",
-                                     optional: true,
-                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :xcpretty_utf,
                                      env_name: "XCPRETTY_UTF",
                                      description: "Have xcpretty use unicode encoding when reporting builds",
                                      optional: true,
                                      type: Boolean),
+
+        FastlaneCore::ConfigItem.new(key: :analyze_build_time,
+                                     env_name: "GYM_ANALYZE_BUILD_TIME",
+                                     description: "Analyze the project build time and store the output in 'culprits.txt' file",
+                                     optional: true,
+                                     type: Boolean),
         FastlaneCore::ConfigItem.new(key: :skip_profile_detection,
                                      env_name: "GYM_SKIP_PROFILE_DETECTION",
                                      description: "Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used",
                                      optional: true,
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :xcodebuild_command,
+                                     env_name: "GYM_XCODE_BUILD_COMMAND",
+                                     description: "Allows for override of the default `xcodebuild` command",
+                                     type: String,
+                                     optional: true,
+                                     default_value: "xcodebuild"),
         FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
                                      env_name: "GYM_CLONED_SOURCE_PACKAGES_PATH",
                                      description: "Sets a custom path for Swift Package Manager dependencies",

data/scan/lib/scan/options.rb

@@ -1,4 +1,5 @@
 require 'fastlane_core/configuration/config_item'
+require 'fastlane/helper/xcodebuild_formatter_helper'
 require 'credentials_manager/appfile_config'
 require_relative 'module'
 
@@ -60,7 +61,7 @@ module Scan
                                      optional: true,
                                      is_string: true,
                                      env_name: "SCAN_DEVICE",
-                                     description: "The name of the simulator type you want to run tests on (e.g. 'iPhone 6')",
+                                     description: "The name of the simulator type you want to run tests on (e.g. 'iPhone 6' or 'iPhone SE (2nd generation) (14.5)')",
                                      conflicting_options: [:devices],
                                      conflict_block: proc do |value|
                                        UI.user_error!("You can't use 'device' and 'devices' options in one run")
@@ -70,7 +71,7 @@ module Scan
                                      is_string: false,
                                      env_name: "SCAN_DEVICES",
                                      type: Array,
-                                     description: "Array of devices to run the tests on (e.g. ['iPhone 6', 'iPad Air'])",
+                                     description: "Array of devices to run the tests on (e.g. ['iPhone 6', 'iPad Air', 'iPhone SE (2nd generation) (14.5)'])",
                                      conflicting_options: [:device],
                                      conflict_block: proc do |value|
                                        UI.user_error!("You can't use 'device' and 'devices' options in one run")
@@ -214,11 +215,7 @@ module Scan
                                      description: "Should the HTML report be opened when tests are completed?",
                                      is_string: false,
                                      default_value: false),
-        FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
-                                     env_name: "SCAN_DISABLE_XCPRETTY",
-                                     description: "Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table",
-                                     type: Boolean,
-                                     optional: true),
+
         FastlaneCore::ConfigItem.new(key: :output_directory,
                                      short_option: "-o",
                                      env_name: "SCAN_OUTPUT_DIRECTORY",
@@ -227,6 +224,7 @@ module Scan
                                      code_gen_default_value: "./test_output",
                                      default_value: File.join(containing, "test_output"),
                                      default_value_dynamic: true),
+
         FastlaneCore::ConfigItem.new(key: :output_style,
                                      short_option: "-b",
                                      env_name: "SCAN_OUTPUT_STYLE",
@@ -263,9 +261,30 @@ module Scan
                                      description: "Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path",
                                      optional: true,
                                      type: Boolean),
+
+        FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
+                                     env_names: ["SCAN_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test')",
+                                     type: String,
+                                     default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
+                                     default_value_dynamic: true),
+
+        # xcpretty
+        FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
+                                     env_name: "SCAN_DISABLE_XCPRETTY",
+                                     deprecated: "Use `output_style: 'raw'` instead",
+                                     description: "Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table",
+                                     type: Boolean,
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :formatter,
                                      short_option: "-n",
                                      env_name: "SCAN_FORMATTER",
+                                     deprecated: "Use 'xcpretty_formatter' instead",
+                                     description: "A custom xcpretty formatter to use",
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_formatter,
+                                     short_option: "-N",
+                                     env_name: "SCAN_XCPRETTY_FORMATTER",
                                      description: "A custom xcpretty formatter to use",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :xcpretty_args,
@@ -273,6 +292,7 @@ module Scan
                                      description: "Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf')",
                                      type: String,
                                      optional: true),
+
         FastlaneCore::ConfigItem.new(key: :derived_data_path,
                                      short_option: "-j",
                                      env_name: "SCAN_DERIVED_DATA_PATH",

data/scan/lib/scan/runner.rb

@@ -51,7 +51,9 @@ module Scan
         end
       end
 
-      execute(retries: Scan.config[:number_of_retries])
+      # Set retries to 0 if Xcode 13 because TestCommandGenerator will set '-retry-tests-on-failure -test-iterations'
+      retries = Helper.xcode_at_least?(13) ? 0 : Scan.config[:number_of_retries]
+      execute(retries: retries)
     end
 
     def execute(retries: 0)
@@ -126,7 +128,7 @@ module Scan
 
         test_cases = suite.split(":\n").fetch(1, []).split("\n").each
                           .select { |line| line.match?(/^\s+/) }
-                          .map { |line| line.strip.gsub(".", "/").gsub("()", "") }
+                          .map { |line| line.strip.gsub(/[\s\.]/, "/").gsub(/[\-\[\]\(\)]/, "") }
                           .map { |line| suite_name + "/" + line }
 
         retryable_tests += test_cases
@@ -135,27 +137,68 @@ module Scan
       return retryable_tests.uniq
     end
 
-    def handle_results(tests_exit_status)
-      if Scan.config[:disable_xcpretty]
-        unless tests_exit_status == 0
-          UI.test_failure!("Test execution failed. Exit status: #{tests_exit_status}")
-        end
-        return
+    def trainer_test_results
+      require "trainer"
+
+      results = {
+        number_of_tests: 0,
+        number_of_failures: 0,
+        number_of_retries: 0
+      }
+
+      result_bundle_path = Scan.cache[:result_bundle_path]
+      output_path = Scan.config[:output_directory] || Dir.mktmpdir
+
+      UI.crash!("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,
+        output_path: output_path,
+        silent: true,
+        extension: "xml"
+      }
+
+      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_retries] += data[:number_of_retries]
       end
 
-      result = TestResultParser.new.parse_result(test_results)
-      SlackPoster.new.run(result)
+      return results
+    end
+
+    def handle_results(tests_exit_status)
+      results = trainer_test_results
 
-      if result[:failures] > 0
-        failures_str = result[:failures].to_s.red
+      number_of_retries = results[:number_of_retries]
+      number_of_tests = results[:number_of_tests]
+      number_of_failures = results[:number_of_failures]
+
+      SlackPoster.new.run({
+        tests: number_of_tests,
+        failures: number_of_failures
+      })
+
+      if number_of_failures > 0
+        failures_str = number_of_failures.to_s.red
       else
-        failures_str = result[:failures].to_s.green
+        failures_str = number_of_failures.to_s.green
       end
 
+      retries_str = case number_of_retries
+                    when 0
+                      ""
+                    when 1
+                      " (and 1 retry)"
+                    else
+                      " (and #{number_of_retries} retries)"
+                    end
+
       puts(Terminal::Table.new({
         title: "Test Results",
         rows: [
-          ["Number of tests", result[:tests]],
+          ["Number of tests", "#{number_of_tests}#{retries_str}"],
           ["Number of failures", failures_str]
         ]
       }))
@@ -165,7 +208,7 @@ module Scan
       zip_build_products
       copy_xctestrun
 
-      if result[:failures] > 0
+      if number_of_failures > 0
         open_report
 
         UI.test_failure!("Tests have failed")