fastlane 2.201.0.rc3 → 2.201.0

data/fastlane/swift/Fastlane.swift

@@ -1313,14 +1313,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
    - xcargs: Pass additional arguments to xcodebuild for the build phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS="-ObjC -lstdc++"
    - xcconfig: Use an extra XCCONFIG file to build your app
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
-   - disableXcpretty: Disable xcpretty formatting of build output
+   - xcodebuildFormatter: 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/)
+   - disableXcpretty: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Disable xcpretty formatting of build output
    - xcprettyTestFormat: Use the test (RSpec style) format for build output
    - xcprettyFormatter: A custom xcpretty formatter to use
    - xcprettyReportJunit: Have xcpretty create a JUnit-style XML report at the provided path
    - xcprettyReportHtml: Have xcpretty create a simple HTML report at the provided path
    - xcprettyReportJson: Have xcpretty create a JSON compilation database at the provided path
-   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - xcprettyUtf: Have xcpretty use unicode encoding when reporting builds
+   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - skipProfileDetection: Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used
    - xcodebuildCommand: Allows for override of the default `xcodebuild` command
    - clonedSourcePackagesPath: Sets a custom path for Swift Package Manager dependencies
@@ -1366,14 +1367,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
                                         xcargs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                         xcconfig: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                         suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                                        xcodebuildFormatter: String = "xcbeautify",
                                         disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                         xcprettyTestFormat: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                         xcprettyFormatter: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                         xcprettyReportJunit: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                         xcprettyReportHtml: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                         xcprettyReportJson: OptionalConfigValue<String?> = .fastlaneDefault(nil),
-                                        analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                         xcprettyUtf: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                                        analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                         skipProfileDetection: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                                         xcodebuildCommand: String = "xcodebuild",
                                         clonedSourcePackagesPath: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -1415,14 +1417,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
     let xcargsArg = xcargs.asRubyArgument(name: "xcargs", type: nil)
     let xcconfigArg = xcconfig.asRubyArgument(name: "xcconfig", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let xcprettyTestFormatArg = xcprettyTestFormat.asRubyArgument(name: "xcpretty_test_format", type: nil)
     let xcprettyFormatterArg = xcprettyFormatter.asRubyArgument(name: "xcpretty_formatter", type: nil)
     let xcprettyReportJunitArg = xcprettyReportJunit.asRubyArgument(name: "xcpretty_report_junit", type: nil)
     let xcprettyReportHtmlArg = xcprettyReportHtml.asRubyArgument(name: "xcpretty_report_html", type: nil)
     let xcprettyReportJsonArg = xcprettyReportJson.asRubyArgument(name: "xcpretty_report_json", type: nil)
-    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let xcprettyUtfArg = xcprettyUtf.asRubyArgument(name: "xcpretty_utf", type: nil)
+    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let skipProfileDetectionArg = skipProfileDetection.asRubyArgument(name: "skip_profile_detection", type: nil)
     let xcodebuildCommandArg = RubyCommand.Argument(name: "xcodebuild_command", value: xcodebuildCommand, type: nil)
     let clonedSourcePackagesPathArg = clonedSourcePackagesPath.asRubyArgument(name: "cloned_source_packages_path", type: nil)
@@ -1463,14 +1466,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
                                           xcargsArg,
                                           xcconfigArg,
                                           suppressXcodeOutputArg,
+                                          xcodebuildFormatterArg,
                                           disableXcprettyArg,
                                           xcprettyTestFormatArg,
                                           xcprettyFormatterArg,
                                           xcprettyReportJunitArg,
                                           xcprettyReportHtmlArg,
                                           xcprettyReportJsonArg,
-                                          analyzeBuildTimeArg,
                                           xcprettyUtfArg,
+                                          analyzeBuildTimeArg,
                                           skipProfileDetectionArg,
                                           xcodebuildCommandArg,
                                           clonedSourcePackagesPathArg,
@@ -1519,14 +1523,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
    - xcargs: Pass additional arguments to xcodebuild for the build phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS="-ObjC -lstdc++"
    - xcconfig: Use an extra XCCONFIG file to build your app
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
-   - disableXcpretty: Disable xcpretty formatting of build output
+   - xcodebuildFormatter: 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/)
+   - disableXcpretty: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Disable xcpretty formatting of build output
    - xcprettyTestFormat: Use the test (RSpec style) format for build output
    - xcprettyFormatter: A custom xcpretty formatter to use
    - xcprettyReportJunit: Have xcpretty create a JUnit-style XML report at the provided path
    - xcprettyReportHtml: Have xcpretty create a simple HTML report at the provided path
    - xcprettyReportJson: Have xcpretty create a JSON compilation database at the provided path
-   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - xcprettyUtf: Have xcpretty use unicode encoding when reporting builds
+   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - skipProfileDetection: Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used
    - xcodebuildCommand: Allows for override of the default `xcodebuild` command
    - clonedSourcePackagesPath: Sets a custom path for Swift Package Manager dependencies
@@ -1569,14 +1574,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
                                            xcargs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcconfig: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                                           xcodebuildFormatter: String = "xcbeautify",
                                            disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            xcprettyTestFormat: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            xcprettyFormatter: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcprettyReportJunit: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcprettyReportHtml: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcprettyReportJson: OptionalConfigValue<String?> = .fastlaneDefault(nil),
-                                           analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            xcprettyUtf: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                                           analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            skipProfileDetection: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                                            xcodebuildCommand: String = "xcodebuild",
                                            clonedSourcePackagesPath: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -1615,14 +1621,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
     let xcargsArg = xcargs.asRubyArgument(name: "xcargs", type: nil)
     let xcconfigArg = xcconfig.asRubyArgument(name: "xcconfig", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let xcprettyTestFormatArg = xcprettyTestFormat.asRubyArgument(name: "xcpretty_test_format", type: nil)
     let xcprettyFormatterArg = xcprettyFormatter.asRubyArgument(name: "xcpretty_formatter", type: nil)
     let xcprettyReportJunitArg = xcprettyReportJunit.asRubyArgument(name: "xcpretty_report_junit", type: nil)
     let xcprettyReportHtmlArg = xcprettyReportHtml.asRubyArgument(name: "xcpretty_report_html", type: nil)
     let xcprettyReportJsonArg = xcprettyReportJson.asRubyArgument(name: "xcpretty_report_json", type: nil)
-    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let xcprettyUtfArg = xcprettyUtf.asRubyArgument(name: "xcpretty_utf", type: nil)
+    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let skipProfileDetectionArg = skipProfileDetection.asRubyArgument(name: "skip_profile_detection", type: nil)
     let xcodebuildCommandArg = RubyCommand.Argument(name: "xcodebuild_command", value: xcodebuildCommand, type: nil)
     let clonedSourcePackagesPathArg = clonedSourcePackagesPath.asRubyArgument(name: "cloned_source_packages_path", type: nil)
@@ -1660,14 +1667,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
                                           xcargsArg,
                                           xcconfigArg,
                                           suppressXcodeOutputArg,
+                                          xcodebuildFormatterArg,
                                           disableXcprettyArg,
                                           xcprettyTestFormatArg,
                                           xcprettyFormatterArg,
                                           xcprettyReportJunitArg,
                                           xcprettyReportHtmlArg,
                                           xcprettyReportJsonArg,
-                                          analyzeBuildTimeArg,
                                           xcprettyUtfArg,
+                                          analyzeBuildTimeArg,
                                           skipProfileDetectionArg,
                                           xcodebuildCommandArg,
                                           clonedSourcePackagesPathArg,
@@ -1717,14 +1725,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
    - xcargs: Pass additional arguments to xcodebuild for the build phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS="-ObjC -lstdc++"
    - xcconfig: Use an extra XCCONFIG file to build your app
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
-   - disableXcpretty: Disable xcpretty formatting of build output
+   - xcodebuildFormatter: 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/)
+   - disableXcpretty: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Disable xcpretty formatting of build output
    - xcprettyTestFormat: Use the test (RSpec style) format for build output
    - xcprettyFormatter: A custom xcpretty formatter to use
    - xcprettyReportJunit: Have xcpretty create a JUnit-style XML report at the provided path
    - xcprettyReportHtml: Have xcpretty create a simple HTML report at the provided path
    - xcprettyReportJson: Have xcpretty create a JSON compilation database at the provided path
-   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - xcprettyUtf: Have xcpretty use unicode encoding when reporting builds
+   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - skipProfileDetection: Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used
    - xcodebuildCommand: Allows for override of the default `xcodebuild` command
    - clonedSourcePackagesPath: Sets a custom path for Swift Package Manager dependencies
@@ -1768,14 +1777,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
                                            xcargs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcconfig: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                                           xcodebuildFormatter: String = "xcbeautify",
                                            disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            xcprettyTestFormat: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            xcprettyFormatter: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcprettyReportJunit: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcprettyReportHtml: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                            xcprettyReportJson: OptionalConfigValue<String?> = .fastlaneDefault(nil),
-                                           analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            xcprettyUtf: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                                           analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                            skipProfileDetection: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                                            xcodebuildCommand: String = "xcodebuild",
                                            clonedSourcePackagesPath: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -1815,14 +1825,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
     let xcargsArg = xcargs.asRubyArgument(name: "xcargs", type: nil)
     let xcconfigArg = xcconfig.asRubyArgument(name: "xcconfig", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let xcprettyTestFormatArg = xcprettyTestFormat.asRubyArgument(name: "xcpretty_test_format", type: nil)
     let xcprettyFormatterArg = xcprettyFormatter.asRubyArgument(name: "xcpretty_formatter", type: nil)
     let xcprettyReportJunitArg = xcprettyReportJunit.asRubyArgument(name: "xcpretty_report_junit", type: nil)
     let xcprettyReportHtmlArg = xcprettyReportHtml.asRubyArgument(name: "xcpretty_report_html", type: nil)
     let xcprettyReportJsonArg = xcprettyReportJson.asRubyArgument(name: "xcpretty_report_json", type: nil)
-    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let xcprettyUtfArg = xcprettyUtf.asRubyArgument(name: "xcpretty_utf", type: nil)
+    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let skipProfileDetectionArg = skipProfileDetection.asRubyArgument(name: "skip_profile_detection", type: nil)
     let xcodebuildCommandArg = RubyCommand.Argument(name: "xcodebuild_command", value: xcodebuildCommand, type: nil)
     let clonedSourcePackagesPathArg = clonedSourcePackagesPath.asRubyArgument(name: "cloned_source_packages_path", type: nil)
@@ -1861,14 +1872,15 @@ public func buildAndroidApp(task: OptionalConfigValue<String?> = .fastlaneDefaul
                                           xcargsArg,
                                           xcconfigArg,
                                           suppressXcodeOutputArg,
+                                          xcodebuildFormatterArg,
                                           disableXcprettyArg,
                                           xcprettyTestFormatArg,
                                           xcprettyFormatterArg,
                                           xcprettyReportJunitArg,
                                           xcprettyReportHtmlArg,
                                           xcprettyReportJsonArg,
-                                          analyzeBuildTimeArg,
                                           xcprettyUtfArg,
+                                          analyzeBuildTimeArg,
                                           skipProfileDetectionArg,
                                           xcodebuildCommandArg,
                                           clonedSourcePackagesPathArg,
@@ -2108,7 +2120,6 @@ public func captureAndroidScreenshots(androidHome: OptionalConfigValue<String?>
    - clean: Should the project be cleaned before building it?
    - testWithoutBuilding: Test without building, requires a derived data path
    - configuration: The configuration to use when building the app. Defaults to 'Release'
-   - xcprettyArgs: Additional xcpretty arguments
    - sdk: The SDK that should be used for building the application
    - scheme: The scheme you want to use, this must be the scheme for the UI Tests
    - numberOfRetries: The number of times a test can fail before snapshot should stop retrying
@@ -2125,6 +2136,8 @@ public func captureAndroidScreenshots(androidHome: OptionalConfigValue<String?>
    - testplan: The testplan associated with the scheme that should be used for testing
    - onlyTesting: Array of strings matching Test Bundle/Test Suite/Test Cases to run
    - skipTesting: Array of strings matching Test Bundle/Test Suite/Test Cases to skip
+   - xcodebuildFormatter: 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/)
+   - xcprettyArgs: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Additional xcpretty arguments
    - disableXcpretty: Disable xcpretty formatting of build
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
    - useSystemScm: Lets xcodebuild use system's scm configuration
@@ -2157,7 +2170,6 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
                                   clean: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                                   testWithoutBuilding: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                   configuration: OptionalConfigValue<String?> = .fastlaneDefault(nil),
-                                  xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                   sdk: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                   scheme: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                   numberOfRetries: Int = 1,
@@ -2174,6 +2186,8 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
                                   testplan: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                   onlyTesting: Any? = nil,
                                   skipTesting: Any? = nil,
+                                  xcodebuildFormatter: String = "xcbeautify",
+                                  xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                   disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                   suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                   useSystemScm: OptionalConfigValue<Bool> = .fastlaneDefault(false))
@@ -2206,7 +2220,6 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
     let cleanArg = clean.asRubyArgument(name: "clean", type: nil)
     let testWithoutBuildingArg = testWithoutBuilding.asRubyArgument(name: "test_without_building", type: nil)
     let configurationArg = configuration.asRubyArgument(name: "configuration", type: nil)
-    let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let sdkArg = sdk.asRubyArgument(name: "sdk", type: nil)
     let schemeArg = scheme.asRubyArgument(name: "scheme", type: nil)
     let numberOfRetriesArg = RubyCommand.Argument(name: "number_of_retries", value: numberOfRetries, type: nil)
@@ -2223,6 +2236,8 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
     let testplanArg = testplan.asRubyArgument(name: "testplan", type: nil)
     let onlyTestingArg = RubyCommand.Argument(name: "only_testing", value: onlyTesting, type: nil)
     let skipTestingArg = RubyCommand.Argument(name: "skip_testing", value: skipTesting, type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
+    let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
     let useSystemScmArg = useSystemScm.asRubyArgument(name: "use_system_scm", type: nil)
@@ -2254,7 +2269,6 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
                                           cleanArg,
                                           testWithoutBuildingArg,
                                           configurationArg,
-                                          xcprettyArgsArg,
                                           sdkArg,
                                           schemeArg,
                                           numberOfRetriesArg,
@@ -2271,6 +2285,8 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
                                           testplanArg,
                                           onlyTestingArg,
                                           skipTestingArg,
+                                          xcodebuildFormatterArg,
+                                          xcprettyArgsArg,
                                           disableXcprettyArg,
                                           suppressXcodeOutputArg,
                                           useSystemScmArg]
@@ -2313,7 +2329,6 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
    - clean: Should the project be cleaned before building it?
    - testWithoutBuilding: Test without building, requires a derived data path
    - configuration: The configuration to use when building the app. Defaults to 'Release'
-   - xcprettyArgs: Additional xcpretty arguments
    - sdk: The SDK that should be used for building the application
    - scheme: The scheme you want to use, this must be the scheme for the UI Tests
    - numberOfRetries: The number of times a test can fail before snapshot should stop retrying
@@ -2330,6 +2345,8 @@ public func captureIosScreenshots(workspace: OptionalConfigValue<String?> = .fas
    - testplan: The testplan associated with the scheme that should be used for testing
    - onlyTesting: Array of strings matching Test Bundle/Test Suite/Test Cases to run
    - skipTesting: Array of strings matching Test Bundle/Test Suite/Test Cases to skip
+   - xcodebuildFormatter: 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/)
+   - xcprettyArgs: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Additional xcpretty arguments
    - disableXcpretty: Disable xcpretty formatting of build
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
    - useSystemScm: Lets xcodebuild use system's scm configuration
@@ -2362,7 +2379,6 @@ public func captureScreenshots(workspace: OptionalConfigValue<String?> = .fastla
                                clean: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                                testWithoutBuilding: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                configuration: OptionalConfigValue<String?> = .fastlaneDefault(nil),
-                               xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                sdk: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                scheme: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                numberOfRetries: Int = 1,
@@ -2379,6 +2395,8 @@ public func captureScreenshots(workspace: OptionalConfigValue<String?> = .fastla
                                testplan: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                onlyTesting: Any? = nil,
                                skipTesting: Any? = nil,
+                               xcodebuildFormatter: String = "xcbeautify",
+                               xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                                useSystemScm: OptionalConfigValue<Bool> = .fastlaneDefault(false))
@@ -2411,7 +2429,6 @@ public func captureScreenshots(workspace: OptionalConfigValue<String?> = .fastla
     let cleanArg = clean.asRubyArgument(name: "clean", type: nil)
     let testWithoutBuildingArg = testWithoutBuilding.asRubyArgument(name: "test_without_building", type: nil)
     let configurationArg = configuration.asRubyArgument(name: "configuration", type: nil)
-    let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let sdkArg = sdk.asRubyArgument(name: "sdk", type: nil)
     let schemeArg = scheme.asRubyArgument(name: "scheme", type: nil)
     let numberOfRetriesArg = RubyCommand.Argument(name: "number_of_retries", value: numberOfRetries, type: nil)
@@ -2428,6 +2445,8 @@ public func captureScreenshots(workspace: OptionalConfigValue<String?> = .fastla
     let testplanArg = testplan.asRubyArgument(name: "testplan", type: nil)
     let onlyTestingArg = RubyCommand.Argument(name: "only_testing", value: onlyTesting, type: nil)
     let skipTestingArg = RubyCommand.Argument(name: "skip_testing", value: skipTesting, type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
+    let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
     let useSystemScmArg = useSystemScm.asRubyArgument(name: "use_system_scm", type: nil)
@@ -2459,7 +2478,6 @@ public func captureScreenshots(workspace: OptionalConfigValue<String?> = .fastla
                                           cleanArg,
                                           testWithoutBuildingArg,
                                           configurationArg,
-                                          xcprettyArgsArg,
                                           sdkArg,
                                           schemeArg,
                                           numberOfRetriesArg,
@@ -2476,6 +2494,8 @@ public func captureScreenshots(workspace: OptionalConfigValue<String?> = .fastla
                                           testplanArg,
                                           onlyTestingArg,
                                           skipTestingArg,
+                                          xcodebuildFormatterArg,
+                                          xcprettyArgsArg,
                                           disableXcprettyArg,
                                           suppressXcodeOutputArg,
                                           useSystemScmArg]
@@ -5528,14 +5548,15 @@ public func gradle(task: OptionalConfigValue<String?> = .fastlaneDefault(nil),
    - xcargs: Pass additional arguments to xcodebuild for the build phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS="-ObjC -lstdc++"
    - xcconfig: Use an extra XCCONFIG file to build your app
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
-   - disableXcpretty: Disable xcpretty formatting of build output
+   - xcodebuildFormatter: 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/)
+   - disableXcpretty: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Disable xcpretty formatting of build output
    - xcprettyTestFormat: Use the test (RSpec style) format for build output
    - xcprettyFormatter: A custom xcpretty formatter to use
    - xcprettyReportJunit: Have xcpretty create a JUnit-style XML report at the provided path
    - xcprettyReportHtml: Have xcpretty create a simple HTML report at the provided path
    - xcprettyReportJson: Have xcpretty create a JSON compilation database at the provided path
-   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - xcprettyUtf: Have xcpretty use unicode encoding when reporting builds
+   - analyzeBuildTime: Analyze the project build time and store the output in 'culprits.txt' file
    - skipProfileDetection: Do not try to build a profile mapping from the xcodeproj. Match or a manually provided mapping should be used
    - xcodebuildCommand: Allows for override of the default `xcodebuild` command
    - clonedSourcePackagesPath: Sets a custom path for Swift Package Manager dependencies
@@ -5581,14 +5602,15 @@ public func gradle(task: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                    xcargs: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.xcargs),
                                    xcconfig: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.xcconfig),
                                    suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(gymfile.suppressXcodeOutput),
+                                   xcodebuildFormatter: String = gymfile.xcodebuildFormatter,
                                    disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(gymfile.disableXcpretty),
                                    xcprettyTestFormat: OptionalConfigValue<Bool?> = .fastlaneDefault(gymfile.xcprettyTestFormat),
                                    xcprettyFormatter: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.xcprettyFormatter),
                                    xcprettyReportJunit: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.xcprettyReportJunit),
                                    xcprettyReportHtml: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.xcprettyReportHtml),
                                    xcprettyReportJson: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.xcprettyReportJson),
-                                   analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(gymfile.analyzeBuildTime),
                                    xcprettyUtf: OptionalConfigValue<Bool?> = .fastlaneDefault(gymfile.xcprettyUtf),
+                                   analyzeBuildTime: OptionalConfigValue<Bool?> = .fastlaneDefault(gymfile.analyzeBuildTime),
                                    skipProfileDetection: OptionalConfigValue<Bool> = .fastlaneDefault(gymfile.skipProfileDetection),
                                    xcodebuildCommand: String = gymfile.xcodebuildCommand,
                                    clonedSourcePackagesPath: OptionalConfigValue<String?> = .fastlaneDefault(gymfile.clonedSourcePackagesPath),
@@ -5630,14 +5652,15 @@ public func gradle(task: OptionalConfigValue<String?> = .fastlaneDefault(nil),
     let xcargsArg = xcargs.asRubyArgument(name: "xcargs", type: nil)
     let xcconfigArg = xcconfig.asRubyArgument(name: "xcconfig", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let xcprettyTestFormatArg = xcprettyTestFormat.asRubyArgument(name: "xcpretty_test_format", type: nil)
     let xcprettyFormatterArg = xcprettyFormatter.asRubyArgument(name: "xcpretty_formatter", type: nil)
     let xcprettyReportJunitArg = xcprettyReportJunit.asRubyArgument(name: "xcpretty_report_junit", type: nil)
     let xcprettyReportHtmlArg = xcprettyReportHtml.asRubyArgument(name: "xcpretty_report_html", type: nil)
     let xcprettyReportJsonArg = xcprettyReportJson.asRubyArgument(name: "xcpretty_report_json", type: nil)
-    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let xcprettyUtfArg = xcprettyUtf.asRubyArgument(name: "xcpretty_utf", type: nil)
+    let analyzeBuildTimeArg = analyzeBuildTime.asRubyArgument(name: "analyze_build_time", type: nil)
     let skipProfileDetectionArg = skipProfileDetection.asRubyArgument(name: "skip_profile_detection", type: nil)
     let xcodebuildCommandArg = RubyCommand.Argument(name: "xcodebuild_command", value: xcodebuildCommand, type: nil)
     let clonedSourcePackagesPathArg = clonedSourcePackagesPath.asRubyArgument(name: "cloned_source_packages_path", type: nil)
@@ -5678,14 +5701,15 @@ public func gradle(task: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                                           xcargsArg,
                                           xcconfigArg,
                                           suppressXcodeOutputArg,
+                                          xcodebuildFormatterArg,
                                           disableXcprettyArg,
                                           xcprettyTestFormatArg,
                                           xcprettyFormatterArg,
                                           xcprettyReportJunitArg,
                                           xcprettyReportHtmlArg,
                                           xcprettyReportJsonArg,
-                                          analyzeBuildTimeArg,
                                           xcprettyUtfArg,
+                                          analyzeBuildTimeArg,
                                           skipProfileDetectionArg,
                                           xcodebuildCommandArg,
                                           clonedSourcePackagesPathArg,
@@ -8558,7 +8582,6 @@ public func rubyVersion() {
    - addressSanitizer: Should the address sanitizer be turned on?
    - threadSanitizer: Should the thread sanitizer be turned on?
    - openReport: Should the HTML report be opened when tests are completed?
-   - disableXcpretty: Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table
    - outputDirectory: The directory in which all reports will be stored
    - outputStyle: Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty during xcodebuild)
    - outputTypes: Comma separated list of the output types (e.g. html, junit, json-compilation-database)
@@ -8566,7 +8589,11 @@ public func rubyVersion() {
    - buildlogPath: The directory where to store the raw log
    - includeSimulatorLogs: If the logs generated by the app (e.g. using NSLog, perror, etc.) in the Simulator should be written to the output_directory
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
-   - formatter: A custom xcpretty formatter to use
+   - xcodebuildFormatter: 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/)
+   - outputRemoveRetryAttempts: Remove retry attempts from test results table and the JUnit report (if not using xcpretty)
+   - disableXcpretty: **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
+   - formatter: **DEPRECATED!** Use 'xcpretty_formatter' instead - A custom xcpretty formatter to use
+   - xcprettyFormatter: A custom xcpretty formatter to use
    - xcprettyArgs: Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf')
    - derivedDataPath: The directory where build products and other derived data will go
    - shouldZipBuildProducts: Should zip the derived data build products and place in output path?
@@ -8633,7 +8660,6 @@ public func runTests(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                      addressSanitizer: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                      threadSanitizer: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                      openReport: OptionalConfigValue<Bool> = .fastlaneDefault(false),
-                     disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                      outputDirectory: String = "./test_output",
                      outputStyle: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                      outputTypes: String = "html,junit",
@@ -8641,7 +8667,11 @@ public func runTests(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                      buildlogPath: String = "~/Library/Logs/scan",
                      includeSimulatorLogs: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                      suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
+                     xcodebuildFormatter: String = "xcbeautify",
+                     outputRemoveRetryAttempts: OptionalConfigValue<Bool> = .fastlaneDefault(false),
+                     disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(nil),
                      formatter: OptionalConfigValue<String?> = .fastlaneDefault(nil),
+                     xcprettyFormatter: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                      xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                      derivedDataPath: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                      shouldZipBuildProducts: OptionalConfigValue<Bool> = .fastlaneDefault(false),
@@ -8706,7 +8736,6 @@ public func runTests(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
     let addressSanitizerArg = addressSanitizer.asRubyArgument(name: "address_sanitizer", type: nil)
     let threadSanitizerArg = threadSanitizer.asRubyArgument(name: "thread_sanitizer", type: nil)
     let openReportArg = openReport.asRubyArgument(name: "open_report", type: nil)
-    let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let outputDirectoryArg = RubyCommand.Argument(name: "output_directory", value: outputDirectory, type: nil)
     let outputStyleArg = outputStyle.asRubyArgument(name: "output_style", type: nil)
     let outputTypesArg = RubyCommand.Argument(name: "output_types", value: outputTypes, type: nil)
@@ -8714,7 +8743,11 @@ public func runTests(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
     let buildlogPathArg = RubyCommand.Argument(name: "buildlog_path", value: buildlogPath, type: nil)
     let includeSimulatorLogsArg = includeSimulatorLogs.asRubyArgument(name: "include_simulator_logs", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
+    let outputRemoveRetryAttemptsArg = outputRemoveRetryAttempts.asRubyArgument(name: "output_remove_retry_attempts", type: nil)
+    let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let formatterArg = formatter.asRubyArgument(name: "formatter", type: nil)
+    let xcprettyFormatterArg = xcprettyFormatter.asRubyArgument(name: "xcpretty_formatter", type: nil)
     let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let derivedDataPathArg = derivedDataPath.asRubyArgument(name: "derived_data_path", type: nil)
     let shouldZipBuildProductsArg = shouldZipBuildProducts.asRubyArgument(name: "should_zip_build_products", type: nil)
@@ -8778,7 +8811,6 @@ public func runTests(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                                           addressSanitizerArg,
                                           threadSanitizerArg,
                                           openReportArg,
-                                          disableXcprettyArg,
                                           outputDirectoryArg,
                                           outputStyleArg,
                                           outputTypesArg,
@@ -8786,7 +8818,11 @@ public func runTests(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                                           buildlogPathArg,
                                           includeSimulatorLogsArg,
                                           suppressXcodeOutputArg,
+                                          xcodebuildFormatterArg,
+                                          outputRemoveRetryAttemptsArg,
+                                          disableXcprettyArg,
                                           formatterArg,
+                                          xcprettyFormatterArg,
                                           xcprettyArgsArg,
                                           derivedDataPathArg,
                                           shouldZipBuildProductsArg,
@@ -8963,7 +8999,6 @@ public func say(text: [String],
    - addressSanitizer: Should the address sanitizer be turned on?
    - threadSanitizer: Should the thread sanitizer be turned on?
    - openReport: Should the HTML report be opened when tests are completed?
-   - disableXcpretty: Disable xcpretty formatting of build, similar to `output_style='raw'` but this will also skip the test results table
    - outputDirectory: The directory in which all reports will be stored
    - outputStyle: Define how the output should look like. Valid values are: standard, basic, rspec, or raw (disables xcpretty during xcodebuild)
    - outputTypes: Comma separated list of the output types (e.g. html, junit, json-compilation-database)
@@ -8971,7 +9006,11 @@ public func say(text: [String],
    - buildlogPath: The directory where to store the raw log
    - includeSimulatorLogs: If the logs generated by the app (e.g. using NSLog, perror, etc.) in the Simulator should be written to the output_directory
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
-   - formatter: A custom xcpretty formatter to use
+   - xcodebuildFormatter: 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/)
+   - outputRemoveRetryAttempts: Remove retry attempts from test results table and the JUnit report (if not using xcpretty)
+   - disableXcpretty: **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
+   - formatter: **DEPRECATED!** Use 'xcpretty_formatter' instead - A custom xcpretty formatter to use
+   - xcprettyFormatter: A custom xcpretty formatter to use
    - xcprettyArgs: Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf')
    - derivedDataPath: The directory where build products and other derived data will go
    - shouldZipBuildProducts: Should zip the derived data build products and place in output path?
@@ -9038,7 +9077,6 @@ public func scan(workspace: OptionalConfigValue<String?> = .fastlaneDefault(scan
                  addressSanitizer: OptionalConfigValue<Bool?> = .fastlaneDefault(scanfile.addressSanitizer),
                  threadSanitizer: OptionalConfigValue<Bool?> = .fastlaneDefault(scanfile.threadSanitizer),
                  openReport: OptionalConfigValue<Bool> = .fastlaneDefault(scanfile.openReport),
-                 disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(scanfile.disableXcpretty),
                  outputDirectory: String = scanfile.outputDirectory,
                  outputStyle: OptionalConfigValue<String?> = .fastlaneDefault(scanfile.outputStyle),
                  outputTypes: String = scanfile.outputTypes,
@@ -9046,7 +9084,11 @@ public func scan(workspace: OptionalConfigValue<String?> = .fastlaneDefault(scan
                  buildlogPath: String = scanfile.buildlogPath,
                  includeSimulatorLogs: OptionalConfigValue<Bool> = .fastlaneDefault(scanfile.includeSimulatorLogs),
                  suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(scanfile.suppressXcodeOutput),
+                 xcodebuildFormatter: String = scanfile.xcodebuildFormatter,
+                 outputRemoveRetryAttempts: OptionalConfigValue<Bool> = .fastlaneDefault(scanfile.outputRemoveRetryAttempts),
+                 disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(scanfile.disableXcpretty),
                  formatter: OptionalConfigValue<String?> = .fastlaneDefault(scanfile.formatter),
+                 xcprettyFormatter: OptionalConfigValue<String?> = .fastlaneDefault(scanfile.xcprettyFormatter),
                  xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(scanfile.xcprettyArgs),
                  derivedDataPath: OptionalConfigValue<String?> = .fastlaneDefault(scanfile.derivedDataPath),
                  shouldZipBuildProducts: OptionalConfigValue<Bool> = .fastlaneDefault(scanfile.shouldZipBuildProducts),
@@ -9111,7 +9153,6 @@ public func scan(workspace: OptionalConfigValue<String?> = .fastlaneDefault(scan
     let addressSanitizerArg = addressSanitizer.asRubyArgument(name: "address_sanitizer", type: nil)
     let threadSanitizerArg = threadSanitizer.asRubyArgument(name: "thread_sanitizer", type: nil)
     let openReportArg = openReport.asRubyArgument(name: "open_report", type: nil)
-    let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let outputDirectoryArg = RubyCommand.Argument(name: "output_directory", value: outputDirectory, type: nil)
     let outputStyleArg = outputStyle.asRubyArgument(name: "output_style", type: nil)
     let outputTypesArg = RubyCommand.Argument(name: "output_types", value: outputTypes, type: nil)
@@ -9119,7 +9160,11 @@ public func scan(workspace: OptionalConfigValue<String?> = .fastlaneDefault(scan
     let buildlogPathArg = RubyCommand.Argument(name: "buildlog_path", value: buildlogPath, type: nil)
     let includeSimulatorLogsArg = includeSimulatorLogs.asRubyArgument(name: "include_simulator_logs", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
+    let outputRemoveRetryAttemptsArg = outputRemoveRetryAttempts.asRubyArgument(name: "output_remove_retry_attempts", type: nil)
+    let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let formatterArg = formatter.asRubyArgument(name: "formatter", type: nil)
+    let xcprettyFormatterArg = xcprettyFormatter.asRubyArgument(name: "xcpretty_formatter", type: nil)
     let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let derivedDataPathArg = derivedDataPath.asRubyArgument(name: "derived_data_path", type: nil)
     let shouldZipBuildProductsArg = shouldZipBuildProducts.asRubyArgument(name: "should_zip_build_products", type: nil)
@@ -9183,7 +9228,6 @@ public func scan(workspace: OptionalConfigValue<String?> = .fastlaneDefault(scan
                                           addressSanitizerArg,
                                           threadSanitizerArg,
                                           openReportArg,
-                                          disableXcprettyArg,
                                           outputDirectoryArg,
                                           outputStyleArg,
                                           outputTypesArg,
@@ -9191,7 +9235,11 @@ public func scan(workspace: OptionalConfigValue<String?> = .fastlaneDefault(scan
                                           buildlogPathArg,
                                           includeSimulatorLogsArg,
                                           suppressXcodeOutputArg,
+                                          xcodebuildFormatterArg,
+                                          outputRemoveRetryAttemptsArg,
+                                          disableXcprettyArg,
                                           formatterArg,
+                                          xcprettyFormatterArg,
                                           xcprettyArgsArg,
                                           derivedDataPathArg,
                                           shouldZipBuildProductsArg,
@@ -10167,7 +10215,6 @@ public func slather(buildDirectory: OptionalConfigValue<String?> = .fastlaneDefa
    - clean: Should the project be cleaned before building it?
    - testWithoutBuilding: Test without building, requires a derived data path
    - configuration: The configuration to use when building the app. Defaults to 'Release'
-   - xcprettyArgs: Additional xcpretty arguments
    - sdk: The SDK that should be used for building the application
    - scheme: The scheme you want to use, this must be the scheme for the UI Tests
    - numberOfRetries: The number of times a test can fail before snapshot should stop retrying
@@ -10184,6 +10231,8 @@ public func slather(buildDirectory: OptionalConfigValue<String?> = .fastlaneDefa
    - testplan: The testplan associated with the scheme that should be used for testing
    - onlyTesting: Array of strings matching Test Bundle/Test Suite/Test Cases to run
    - skipTesting: Array of strings matching Test Bundle/Test Suite/Test Cases to skip
+   - xcodebuildFormatter: 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/)
+   - xcprettyArgs: **DEPRECATED!** Use `xcodebuild_formatter: ''` instead - Additional xcpretty arguments
    - disableXcpretty: Disable xcpretty formatting of build
    - suppressXcodeOutput: Suppress the output of xcodebuild to stdout. Output is still saved in buildlog_path
    - useSystemScm: Lets xcodebuild use system's scm configuration
@@ -10216,7 +10265,6 @@ public func snapshot(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                      clean: OptionalConfigValue<Bool> = .fastlaneDefault(snapshotfile.clean),
                      testWithoutBuilding: OptionalConfigValue<Bool?> = .fastlaneDefault(snapshotfile.testWithoutBuilding),
                      configuration: OptionalConfigValue<String?> = .fastlaneDefault(snapshotfile.configuration),
-                     xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(snapshotfile.xcprettyArgs),
                      sdk: OptionalConfigValue<String?> = .fastlaneDefault(snapshotfile.sdk),
                      scheme: OptionalConfigValue<String?> = .fastlaneDefault(snapshotfile.scheme),
                      numberOfRetries: Int = snapshotfile.numberOfRetries,
@@ -10233,6 +10281,8 @@ public func snapshot(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                      testplan: OptionalConfigValue<String?> = .fastlaneDefault(snapshotfile.testplan),
                      onlyTesting: Any? = snapshotfile.onlyTesting,
                      skipTesting: Any? = snapshotfile.skipTesting,
+                     xcodebuildFormatter: String = snapshotfile.xcodebuildFormatter,
+                     xcprettyArgs: OptionalConfigValue<String?> = .fastlaneDefault(snapshotfile.xcprettyArgs),
                      disableXcpretty: OptionalConfigValue<Bool?> = .fastlaneDefault(snapshotfile.disableXcpretty),
                      suppressXcodeOutput: OptionalConfigValue<Bool?> = .fastlaneDefault(snapshotfile.suppressXcodeOutput),
                      useSystemScm: OptionalConfigValue<Bool> = .fastlaneDefault(snapshotfile.useSystemScm))
@@ -10265,7 +10315,6 @@ public func snapshot(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
     let cleanArg = clean.asRubyArgument(name: "clean", type: nil)
     let testWithoutBuildingArg = testWithoutBuilding.asRubyArgument(name: "test_without_building", type: nil)
     let configurationArg = configuration.asRubyArgument(name: "configuration", type: nil)
-    let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let sdkArg = sdk.asRubyArgument(name: "sdk", type: nil)
     let schemeArg = scheme.asRubyArgument(name: "scheme", type: nil)
     let numberOfRetriesArg = RubyCommand.Argument(name: "number_of_retries", value: numberOfRetries, type: nil)
@@ -10282,6 +10331,8 @@ public func snapshot(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
     let testplanArg = testplan.asRubyArgument(name: "testplan", type: nil)
     let onlyTestingArg = RubyCommand.Argument(name: "only_testing", value: onlyTesting, type: nil)
     let skipTestingArg = RubyCommand.Argument(name: "skip_testing", value: skipTesting, type: nil)
+    let xcodebuildFormatterArg = RubyCommand.Argument(name: "xcodebuild_formatter", value: xcodebuildFormatter, type: nil)
+    let xcprettyArgsArg = xcprettyArgs.asRubyArgument(name: "xcpretty_args", type: nil)
     let disableXcprettyArg = disableXcpretty.asRubyArgument(name: "disable_xcpretty", type: nil)
     let suppressXcodeOutputArg = suppressXcodeOutput.asRubyArgument(name: "suppress_xcode_output", type: nil)
     let useSystemScmArg = useSystemScm.asRubyArgument(name: "use_system_scm", type: nil)
@@ -10313,7 +10364,6 @@ public func snapshot(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                                           cleanArg,
                                           testWithoutBuildingArg,
                                           configurationArg,
-                                          xcprettyArgsArg,
                                           sdkArg,
                                           schemeArg,
                                           numberOfRetriesArg,
@@ -10330,6 +10380,8 @@ public func snapshot(workspace: OptionalConfigValue<String?> = .fastlaneDefault(
                                           testplanArg,
                                           onlyTestingArg,
                                           skipTestingArg,
+                                          xcodebuildFormatterArg,
+                                          xcprettyArgsArg,
                                           disableXcprettyArg,
                                           suppressXcodeOutputArg,
                                           useSystemScmArg]
@@ -11374,6 +11426,45 @@ public func testflight(apiKeyPath: OptionalConfigValue<String?> = .fastlaneDefau
     _ = runner.executeCommand(command)
 }
 
+/**
+ Convert the Xcode plist log to a JUnit report
+
+ - parameters:
+   - path: Path to the directory that should be converted
+   - extension: The extension for the newly created file. Usually .xml or .junit
+   - outputDirectory: Directoy in which the xml files should be written to. Same directory as source by default
+   - failBuild: Should this step stop the build if the tests fail? Set this to false if you're handling this with a test reporter
+   - xcprettyNaming: Produces class name and test name identical to xcpretty naming in junit file
+   - silent: Silences all output
+
+ - returns: A hash with the key being the path of the generated file, the value being if the tests were successful
+ */
+public func trainer(path: String = ".",
+                    extension: String = ".xml",
+                    outputDirectory: OptionalConfigValue<String?> = .fastlaneDefault(nil),
+                    failBuild: OptionalConfigValue<Bool> = .fastlaneDefault(true),
+                    xcprettyNaming: OptionalConfigValue<Bool> = .fastlaneDefault(false),
+                    silent: OptionalConfigValue<Bool> = .fastlaneDefault(false))
+{
+    let pathArg = RubyCommand.Argument(name: "path", value: path, type: nil)
+    let extensionArg = RubyCommand.Argument(name: "extension", value: `extension`, type: nil)
+    let outputDirectoryArg = outputDirectory.asRubyArgument(name: "output_directory", type: nil)
+    let failBuildArg = failBuild.asRubyArgument(name: "fail_build", type: nil)
+    let xcprettyNamingArg = xcprettyNaming.asRubyArgument(name: "xcpretty_naming", type: nil)
+    let silentArg = silent.asRubyArgument(name: "silent", type: nil)
+    let array: [RubyCommand.Argument?] = [pathArg,
+                                          extensionArg,
+                                          outputDirectoryArg,
+                                          failBuildArg,
+                                          xcprettyNamingArg,
+                                          silentArg]
+    let args: [RubyCommand.Argument] = array
+        .filter { $0?.value != nil }
+        .compactMap { $0 }
+    let command = RubyCommand(commandID: "", methodName: "trainer", className: nil, args: args)
+    _ = runner.executeCommand(command)
+}
+
 /**
  Upload a new build to [Tryouts](https://tryouts.io/)
 
@@ -13295,4 +13386,4 @@ public let snapshotfile: Snapshotfile = .init()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.143]
+// FastlaneRunnerAPIVersion [0.9.144]