fastlane 2.201.0.rc2 → 2.201.2

data/fastlane/swift/Gymfile.swift

@@ -17,4 +17,4 @@ public class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.200.0
+// Generated with fastlane 2.201.2

data/fastlane/swift/GymfileProtocol.swift

@@ -104,7 +104,10 @@ public protocol GymfileProtocol: class {
     /// Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
     var suppressXcodeOutput: Bool? { get }
 
-    /// Disable xcpretty formatting of build output
+    /// xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)
+    var xcodebuildFormatter: String { get }
+
+    /// **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Disable xcpretty formatting of build output
     var disableXcpretty: Bool? { get }
 
     /// Use the test (RSpec style) format for build output
@@ -122,12 +125,12 @@ public protocol GymfileProtocol: class {
     /// Have xcpretty create a JSON compilation database at the provided path
     var xcprettyReportJson: String? { get }
 
-    /// Analyze the project build time and store the output in 'culprits.txt' file
-    var analyzeBuildTime: Bool? { get }
-
     /// Have xcpretty use unicode encoding when reporting builds
     var xcprettyUtf: Bool? { get }
 
+    /// Analyze the project build time and store the output in 'culprits.txt' file
+    var analyzeBuildTime: Bool? { get }
+
     /// Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used
     var skipProfileDetection: Bool { get }
 
@@ -182,14 +185,15 @@ public extension GymfileProtocol {
     var xcargs: String? { return nil }
     var xcconfig: String? { return nil }
     var suppressXcodeOutput: Bool? { return nil }
+    var xcodebuildFormatter: String { return "xcbeautify" }
     var disableXcpretty: Bool? { return nil }
     var xcprettyTestFormat: Bool? { return nil }
     var xcprettyFormatter: String? { return nil }
     var xcprettyReportJunit: String? { return nil }
     var xcprettyReportHtml: String? { return nil }
     var xcprettyReportJson: String? { return nil }
-    var analyzeBuildTime: Bool? { return nil }
     var xcprettyUtf: Bool? { return nil }
+    var analyzeBuildTime: Bool? { return nil }
     var skipProfileDetection: Bool { return false }
     var xcodebuildCommand: String { return "xcodebuild" }
     var clonedSourcePackagesPath: String? { return nil }
@@ -200,4 +204,4 @@ public extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.93]
+// FastlaneRunnerAPIVersion [0.9.96]

data/fastlane/swift/Matchfile.swift

@@ -17,4 +17,4 @@ public class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.200.0
+// Generated with fastlane 2.201.2

data/fastlane/swift/MatchfileProtocol.swift

@@ -192,4 +192,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.87]
+// FastlaneRunnerAPIVersion [0.9.90]

data/fastlane/swift/Precheckfile.swift

@@ -17,4 +17,4 @@ public class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.200.0
+// Generated with fastlane 2.201.2

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -52,4 +52,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.86]
+// FastlaneRunnerAPIVersion [0.9.89]

data/fastlane/swift/Scanfile.swift

@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.200.0
+// Generated with fastlane 2.201.2

data/fastlane/swift/ScanfileProtocol.swift

@@ -80,9 +80,6 @@ public protocol ScanfileProtocol: class {
     /// Should the HTML report be opened when tests are completed?
     var openReport: Bool { get }
 
-    /// Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table
-    var disableXcpretty: Bool? { get }
-
     /// The directory in which all reports will be stored
     var outputDirectory: String { get }
 
@@ -104,9 +101,21 @@ public protocol ScanfileProtocol: class {
     /// Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
     var suppressXcodeOutput: Bool? { get }
 
-    /// A custom xcpretty formatter to use
+    /// xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)
+    var xcodebuildFormatter: String { get }
+
+    /// Remove retry attempts from test results table and the JUnit report (if not using xcpretty)
+    var outputRemoveRetryAttempts: Bool { get }
+
+    /// **DEPRECATED!** Use `output_style: 'raw'` instead - Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table
+    var disableXcpretty: Bool? { get }
+
+    /// **DEPRECATED!** Use 'xcpretty_formatter' instead - A custom xcpretty formatter to use
     var formatter: String? { get }
 
+    /// A custom xcpretty formatter to use
+    var xcprettyFormatter: String? { get }
+
     /// Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf')
     var xcprettyArgs: String? { get }
 
@@ -212,7 +221,7 @@ public protocol ScanfileProtocol: class {
     /// Lets xcodebuild use system's scm configuration
     var useSystemScm: Bool { get }
 
-    /// The number of times a test can fail before scan should stop retrying
+    /// The number of times a test can fail
     var numberOfRetries: Int { get }
 
     /// Should this step stop the build if the tests fail? Set this to false if you're using trainer
@@ -246,7 +255,6 @@ public extension ScanfileProtocol {
     var addressSanitizer: Bool? { return nil }
     var threadSanitizer: Bool? { return nil }
     var openReport: Bool { return false }
-    var disableXcpretty: Bool? { return nil }
     var outputDirectory: String { return "./test_output" }
     var outputStyle: String? { return nil }
     var outputTypes: String { return "html,junit" }
@@ -254,7 +262,11 @@ public extension ScanfileProtocol {
     var buildlogPath: String { return "~/Library/Logs/scan" }
     var includeSimulatorLogs: Bool { return false }
     var suppressXcodeOutput: Bool? { return nil }
+    var xcodebuildFormatter: String { return "xcbeautify" }
+    var outputRemoveRetryAttempts: Bool { return false }
+    var disableXcpretty: Bool? { return nil }
     var formatter: String? { return nil }
+    var xcprettyFormatter: String? { return nil }
     var xcprettyArgs: String? { return nil }
     var derivedDataPath: String? { return nil }
     var shouldZipBuildProducts: Bool { return false }
@@ -296,4 +308,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.98]
+// FastlaneRunnerAPIVersion [0.9.101]

data/fastlane/swift/Screengrabfile.swift

@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.200.0
+// Generated with fastlane 2.201.2

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.88]
+// FastlaneRunnerAPIVersion [0.9.91]

data/fastlane/swift/Snapshotfile.swift

@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.200.0
+// Generated with fastlane 2.201.2

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -86,9 +86,6 @@ public protocol SnapshotfileProtocol: class {
     /// The configuration to use when building the app. Defaults to 'Release'
     var configuration: String? { get }
 
-    /// Additional xcpretty arguments
-    var xcprettyArgs: String? { get }
-
     /// The SDK that should be used for building the application
     var sdk: String? { get }
 
@@ -137,6 +134,12 @@ public protocol SnapshotfileProtocol: class {
     /// Array of strings matching Test Bundle/Test Suite/Test Cases to skip
     var skipTesting: String? { get }
 
+    /// xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)
+    var xcodebuildFormatter: String { get }
+
+    /// **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Additional xcpretty arguments
+    var xcprettyArgs: String? { get }
+
     /// Disable xcpretty formatting of build
     var disableXcpretty: Bool? { get }
 
@@ -176,7 +179,6 @@ public extension SnapshotfileProtocol {
     var clean: Bool { return false }
     var testWithoutBuilding: Bool? { return nil }
     var configuration: String? { return nil }
-    var xcprettyArgs: String? { return nil }
     var sdk: String? { return nil }
     var scheme: String? { return nil }
     var numberOfRetries: Int { return 1 }
@@ -193,6 +195,8 @@ public extension SnapshotfileProtocol {
     var testplan: String? { return nil }
     var onlyTesting: String? { return nil }
     var skipTesting: String? { return nil }
+    var xcodebuildFormatter: String { return "xcbeautify" }
+    var xcprettyArgs: String? { return nil }
     var disableXcpretty: Bool? { return nil }
     var suppressXcodeOutput: Bool? { return nil }
     var useSystemScm: Bool { return false }
@@ -200,4 +204,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.82]
+// FastlaneRunnerAPIVersion [0.9.85]

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

@@ -2,35 +2,35 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.49.1",
+        "version": "0.49.2",
         "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:c43caffb4d2cf9546b0a8fa732ffe5d95b1b1fd7ab03f1c5da39c8e7a0e8ecb4",
-              "sha256": "c43caffb4d2cf9546b0a8fa732ffe5d95b1b1fd7ab03f1c5da39c8e7a0e8ecb4"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:2279db95259ddbc7ad83e47f5bbf8c308db55b74d5464ac79a027bd33138b023",
+              "sha256": "2279db95259ddbc7ad83e47f5bbf8c308db55b74d5464ac79a027bd33138b023"
             },
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ad0ce5fc15fe1d339d366ece18694fdc1d14021684462a126ed20b537a1a9bf5",
-              "sha256": "ad0ce5fc15fe1d339d366ece18694fdc1d14021684462a126ed20b537a1a9bf5"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:2f6bddbef7d750d6ed546ed5decd4d54d439f16009491bdb4e4999c99d877bcf",
+              "sha256": "2f6bddbef7d750d6ed546ed5decd4d54d439f16009491bdb4e4999c99d877bcf"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:33652b8015d31dbe45e00bdc598f1b228cb63c7083b90137fdec66318a88010f",
-              "sha256": "33652b8015d31dbe45e00bdc598f1b228cb63c7083b90137fdec66318a88010f"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:190bf822a188ec8e8be754de2fcd34166ffb07bbd40d67385653d898a251b167",
+              "sha256": "190bf822a188ec8e8be754de2fcd34166ffb07bbd40d67385653d898a251b167"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:f0ad88e5594a6a3e5a35834a9a22473a05511375942dbb046d1085cc537d60b8",
-              "sha256": "f0ad88e5594a6a3e5a35834a9a22473a05511375942dbb046d1085cc537d60b8"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:fe294ff0fa69548876a70ef7aaf30b7221a43adc9f75f7c157c6f881089da6eb",
+              "sha256": "fe294ff0fa69548876a70ef7aaf30b7221a43adc9f75f7c157c6f881089da6eb"
             },
             "catalina": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:564f5daf9cd82407843aed590bd4190f3e5aaa73a30b3bc8ae07135f1319ac97",
-              "sha256": "564f5daf9cd82407843aed590bd4190f3e5aaa73a30b3bc8ae07135f1319ac97"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:2a174bf9c47a070b1fcaa32c066cd7c82604fc428db952f11c9bf1e4448c567a",
+              "sha256": "2a174bf9c47a070b1fcaa32c066cd7c82604fc428db952f11c9bf1e4448c567a"
             }
           }
         }
@@ -56,10 +56,10 @@
         "macOS": "11.6"
       },
       "monterey": {
-        "HOMEBREW_VERSION": "3.3.10-21-g3ba6afb",
+        "HOMEBREW_VERSION": "3.3.12-10-g129e5bb",
         "HOMEBREW_PREFIX": "/opt/homebrew",
-        "Homebrew/homebrew-core": "54f307bcd04cec374c7fd3f22fe7e6b13f1ad783",
-        "CLT": "13.1.0.0.1.1633545042",
+        "Homebrew/homebrew-core": "ee89c86d2e1e18edd19974ae766264a4dcd1246d",
+        "CLT": "13.2.0.0.1.1638488800",
         "Xcode": "13.2.1",
         "macOS": "12.0.1"
       }

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -114,6 +114,13 @@ module Commander
         action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(@program[:name], fastlane_client_language: fastlane_client_language, args: ARGV)
         FastlaneCore.session.action_launched(launch_context: action_launch_context)
 
+        # Trainer has been added to fastlane as of 2.201.0
+        # We need to make sure that the trainer fastlane plugin is no longer installed
+        # to avoid any clashes
+        if Gem::Specification.any? { |s| (s.name == 'fastlane-plugin-trainer') && Gem::Requirement.default =~ (s.version) }
+          FastlaneCore::UI.user_error!("Migration Needed: As of 2.201.0, trainer is included in fastlane. Please remove the trainer plugin from your Gemfile or Pluginfile (or with 'gem uninstall fastlane-plugin-trainer') - More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/")
+        end
+
         return_value = run_active_command
 
         action_completed(@program[:name], status: FastlaneCore::ActionCompletionStatus::SUCCESS)

data/gym/lib/gym/options.rb

@@ -234,7 +234,7 @@ module Gym
 
         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'). Use empty string (ex: '') to disable any formatter",
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)",
                                      type: String,
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),

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

@@ -264,10 +264,15 @@ module Scan
 
         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'). Use empty string (ex: '') to disable any formatter",
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)",
                                      type: String,
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),
+        FastlaneCore::ConfigItem.new(key: :output_remove_retry_attempts,
+                                     env_name: "SCAN_OUTPUT_REMOVE_RETRY_ATTEMPS",
+                                     description: "Remove retry attempts from test results table and the JUnit report (if not using xcpretty)",
+                                     type: Boolean,
+                                     default_value: false),
 
         # xcpretty
         FastlaneCore::ConfigItem.new(key: :disable_xcpretty,
@@ -510,7 +515,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,6 +20,7 @@ module Scan
     end
 
     def run
+      @xcresults_before_run = find_xcresults_in_derived_data
       handle_results(test_app)
     end
 
@@ -51,13 +52,18 @@ module Scan
         end
       end
 
-      # 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]
+      retries = Scan.config[:number_of_retries]
       execute(retries: retries)
     end
 
     def execute(retries: 0)
-      Scan.cache[:retry_attempt] = Scan.config[:number_of_retries] - retries
+      # Set retries to 0 if Xcode 13 because TestCommandGenerator will set '-retry-tests-on-failure -test-iterations'
+      if Helper.xcode_at_least?(13)
+        retries = 0
+        Scan.cache[:retry_attempt] = 0
+      else
+        Scan.cache[:retry_attempt] = Scan.config[:number_of_retries] - retries
+      end
 
       command = @test_command_generator.generate
 
@@ -101,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
@@ -167,6 +173,12 @@ module Scan
       return find_filename('json-compilation-database')
     end
 
+    def find_xcresults_in_derived_data
+      derived_data_path = Scan.config[:derived_data_path]
+      xcresults_path = File.join(derived_data_path, "Logs", "Test", "*.xcresult")
+      return Dir[xcresults_path]
+    end
+
     def trainer_test_results
       require "trainer"
 
@@ -178,24 +190,44 @@ module Scan
 
       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,
-        silent: true
+        output_remove_retry_attempts: Scan.config[:output_remove_retry_attempts],
+        silent: !FastlaneCore::Globals.verbose?
       }
 
       formatter = Scan.config[:xcodebuild_formatter].chomp
-
+      show_output_types_tip = false
       if output_html? && formatter != 'xcpretty'
-        UI.error("HTML output is only available with `xcodebuild_formatter: 'xcpretty'` right now...")
+        UI.important("Skipping HTML... only available with `xcodebuild_formatter: 'xcpretty'` right now")
+        show_output_types_tip = true
       end
 
       if output_json_compilation_database? && formatter != 'xcpretty'
-        UI.error("JSON Compilation Database output is only available with `xcodebuild_formatter: 'xcpretty'` right now...")
+        UI.important("Skipping JSON Compilation Database... only available with `xcodebuild_formatter: 'xcpretty'` right now")
+        show_output_types_tip = true
+      end
+
+      if show_output_types_tip
+        UI.important("Your 'xcodebuild_formatter' doesn't support these 'output_types'. Change your 'output_types' to prevent these warnings from showing...")
       end
 
       if output_junit?
@@ -219,6 +251,8 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
+      return if Scan.config[:build_for_testing]
+
       results = trainer_test_results
 
       number_of_retries = results[:number_of_retries]

data/scan/lib/scan/test_command_generator.rb

@@ -53,7 +53,7 @@ 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-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
         options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
@@ -72,9 +72,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/snapshot/lib/snapshot/options.rb

@@ -291,7 +291,7 @@ module Snapshot
 
         FastlaneCore::ConfigItem.new(key: :xcodebuild_formatter,
                                      env_names: ["SNAPSHOT_XCODEBUILD_FORMATTER", "FASTLANE_XCODEBUILD_FORMATTER"],
-                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter",
+                                     description: "xcodebuild formatter to use (ex: 'xcbeautify', 'xcbeautify --quieter', 'xcpretty', 'xcpretty -test'). Use empty string (ex: '') to disable any formatter (More information: https://docs.fastlane.tools/best-practices/xcodebuild-formatters/)",
                                      type: String,
                                      default_value: Fastlane::Helper::XcodebuildFormatterHelper.xcbeautify_installed? ? 'xcbeautify' : 'xcpretty',
                                      default_value_dynamic: true),

data/trainer/lib/assets/junit.xml.erb

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <% number_of_tests = 0 %>
 <% number_of_failures = 0 %>
-<% @results.each { |a| number_of_tests += a[:number_of_tests] } %>
-<% @results.each { |a| number_of_failures += a[:number_of_failures] } %>
+<% @results.each { |a| number_of_tests += a[:number_of_tests_excluding_retries] } %>
+<% @results.each { |a| number_of_failures += a[:number_of_failures_excluding_retries] } %>
 
 <testsuites tests="<%= number_of_tests %>" failures="<%= number_of_failures %>">
   <% @results.each do |testsuite| %>
-    <testsuite name=<%= (testsuite[:target_name].nil? ? testsuite[:test_name] : testsuite[:target_name]).encode(:xml => :attr) %> tests="<%= testsuite[:number_of_tests] %>" failures="<%= testsuite[:number_of_failures] %>" time="<%= testsuite[:duration] %>">
+    <testsuite name=<%= (testsuite[:target_name].nil? ? testsuite[:test_name] : testsuite[:target_name]).encode(:xml => :attr) %> tests="<%= testsuite[:number_of_tests_excluding_retries] %>" failures="<%= testsuite[:number_of_failures_excluding_retries] %>" time="<%= testsuite[:duration] %>">
       <% testsuite[:tests].each do |test| %>
         <testcase classname=<%= test[:test_group].encode(:xml => :attr) %> name=<%= test[:name].encode(:xml => :attr) %> time="<%= test[:duration] %>">
           <% (test[:failures] || []).each do |failure| %>

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

data/trainer/lib/trainer/test_parser.rb

@@ -100,7 +100,7 @@ module Trainer
       UI.user_error!("File not found at path '#{path}'") unless File.exist?(path)
 
       if File.directory?(path) && path.end_with?(".xcresult")
-        parse_xcresult(path)
+        parse_xcresult(path, output_remove_retry_attempts: config[:output_remove_retry_attempts])
       else
         self.file_content = File.read(path)
         self.raw_json = Plist.parse_xml(self.file_content)
@@ -193,7 +193,7 @@ module Trainer
       return output
     end
 
-    def parse_xcresult(path)
+    def parse_xcresult(path, output_remove_retry_attempts: false)
       require 'shellwords'
       path = Shellwords.escape(path)
 
@@ -218,10 +218,10 @@ module Trainer
 
       # Converts the ActionTestPlanRunSummaries to data for junit generator
       failures = actions_invocation_record.issues.test_failure_summaries || []
-      summaries_to_data(summaries, failures)
+      summaries_to_data(summaries, failures, output_remove_retry_attempts: output_remove_retry_attempts)
     end
 
-    def summaries_to_data(summaries, failures)
+    def summaries_to_data(summaries, failures, output_remove_retry_attempts: false)
       # Gets flat list of all ActionTestableSummary
       all_summaries = summaries.map(&:summaries).flatten
       testable_summaries = all_summaries.map(&:testable_summaries).flatten
@@ -281,6 +281,30 @@ module Trainer
           test_row
         end
 
+        # Remove retry attempts from the count and test rows
+        if output_remove_retry_attempts
+          test_rows = test_rows.reject do |test_row|
+            remove = false
+
+            identifier = test_row[:identifier]
+            info = tests_by_identifier[identifier]
+
+            # Remove if this row is a retry and is a failure
+            if info[:retry_count] > 0
+              remove = !(test_row[:failures] || []).empty?
+            end
+
+            # Remove all failure and retry count if test did eventually pass
+            if remove
+              info[:failure_count] -= 1
+              info[:retry_count] -= 1
+              tests_by_identifier[identifier] = info
+            end
+
+            remove
+          end
+        end
+
         row = {
           project_path: testable_summary.project_relative_path,
           target_name: testable_summary.target_name,
@@ -339,6 +363,12 @@ module Trainer
         }
         summary_row[:number_of_tests] = summary_row[:tests].count
         summary_row[:number_of_failures] = summary_row[:tests].find_all { |a| (a[:failures] || []).count > 0 }.count
+
+        # Makes sure that plist support matches data output of xcresult
+        summary_row[:number_of_tests_excluding_retries] = summary_row[:number_of_tests]
+        summary_row[:number_of_failures_excluding_retries] = summary_row[:number_of_failures]
+        summary_row[:number_of_retries] = 0
+
         summary_row
       end
     end