fastlane 2.203.0 → 2.204.3

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

@@ -2,35 +2,35 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.49.3",
+        "version": "0.49.4",
         "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:3fd0427fdb74e0cc88da322ce2b2cd0b9e021fd286f34978b01b0bb62f9e8529",
-              "sha256": "3fd0427fdb74e0cc88da322ce2b2cd0b9e021fd286f34978b01b0bb62f9e8529"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:8253553ad8c6ce8550175e1152e82d80ce125fa4045a890941e1e6e915104e05",
+              "sha256": "8253553ad8c6ce8550175e1152e82d80ce125fa4045a890941e1e6e915104e05"
             },
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:cc99c52385e32a1d2bb42625a535cac9835313e65ba84776cbe2ad49ae41167d",
-              "sha256": "cc99c52385e32a1d2bb42625a535cac9835313e65ba84776cbe2ad49ae41167d"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d569c123783a70a2020f3b27de99eb7a17cfb393295e04d56c73b72212a3bf49",
+              "sha256": "d569c123783a70a2020f3b27de99eb7a17cfb393295e04d56c73b72212a3bf49"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:39877fc1115e6f15d20a76c30ddbb23d45f52fb95eb81382c4f4abe2b98eb03b",
-              "sha256": "39877fc1115e6f15d20a76c30ddbb23d45f52fb95eb81382c4f4abe2b98eb03b"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4203004748fbc1eb752fc9b9b59f94627a7d5cc50ec9c0cafdbccfd3deca8558",
+              "sha256": "4203004748fbc1eb752fc9b9b59f94627a7d5cc50ec9c0cafdbccfd3deca8558"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:ead4633c1ec372b7cc6995dba2d3352691b4086f501e0346629072873bccef99",
-              "sha256": "ead4633c1ec372b7cc6995dba2d3352691b4086f501e0346629072873bccef99"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:d9781aa3d22021a0dbc3f96e5d9604b1de9b269e9ce502e4a7eedf710a6aa555",
+              "sha256": "d9781aa3d22021a0dbc3f96e5d9604b1de9b269e9ce502e4a7eedf710a6aa555"
             },
             "catalina": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:359cd4f2c3eea7c28f485db06dc955d8b27eabab340420a0c52931004a3ee3e7",
-              "sha256": "359cd4f2c3eea7c28f485db06dc955d8b27eabab340420a0c52931004a3ee3e7"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:13bf74f3ee6e5afb272cc9897cc7a660a738e30137e9be7d240cfa8c18aeb8c1",
+              "sha256": "13bf74f3ee6e5afb272cc9897cc7a660a738e30137e9be7d240cfa8c18aeb8c1"
             }
           }
         }
@@ -48,17 +48,17 @@
         "macOS": "10.15.7"
       },
       "big_sur": {
-        "HOMEBREW_VERSION": "3.2.17",
-        "HOMEBREW_PREFIX": "/opt/homebrew",
-        "Homebrew/homebrew-core": "d975bb4c6f50e8cafd6df9fc7f2ebf04d22ffa41",
-        "CLT": "13.0.0.0.1.1630607135",
-        "Xcode": "13.0",
-        "macOS": "11.6"
+        "HOMEBREW_VERSION": "3.3.9-34-g2e92128",
+        "HOMEBREW_PREFIX": "/usr/local",
+        "Homebrew/homebrew-core": "c28163ed56d6e54f2f71ecf678d4b4d33bac23a5",
+        "CLT": "12.4.0.0.1.1610135815",
+        "Xcode": "12.5",
+        "macOS": "11.0.1"
       },
       "monterey": {
-        "HOMEBREW_VERSION": "3.3.12-34-gc40b2ba",
+        "HOMEBREW_VERSION": "3.3.14-58-g02ceb18",
         "HOMEBREW_PREFIX": "/opt/homebrew",
-        "Homebrew/homebrew-core": "f896f406dfd6f06ab001c6ce36e7d2087459c77a",
+        "Homebrew/homebrew-core": "23ce0d29228c3f5f9c70211d7f8db2e0ffc8dd4e",
         "CLT": "13.2.0.0.1.1638488800",
         "Xcode": "13.2.1",
         "macOS": "12.0.1"

data/fastlane/swift/upgrade_manifest.json

@@ -1 +1 @@
-{"Actions.swift":"Autogenerated API","Fastlane.swift":"Autogenerated API","DeliverfileProtocol.swift":"Autogenerated API","GymfileProtocol.swift":"Autogenerated API","MatchfileProtocol.swift":"Autogenerated API","Plugins.swift":"Autogenerated API","PrecheckfileProtocol.swift":"Autogenerated API","ScanfileProtocol.swift":"Autogenerated API","ScreengrabfileProtocol.swift":"Autogenerated API","SnapshotfileProtocol.swift":"Autogenerated API","LaneFileProtocol.swift":"Fastfile Components","OptionalConfigValue.swift":"Fastfile Components","ControlCommand.swift":"Networking","RubyCommand.swift":"Networking","RubyCommandable.swift":"Networking","Runner.swift":"Networking","SocketClient.swift":"Networking","SocketClientDelegateProtocol.swift":"Networking","SocketResponse.swift":"Networking","main.swift":"Runner Code","ArgumentProcessor.swift":"Runner Code","RunnerArgument.swift":"Runner Code"}
+{"Actions.swift":"Autogenerated API","Fastlane.swift":"Autogenerated API","DeliverfileProtocol.swift":"Autogenerated API","GymfileProtocol.swift":"Autogenerated API","MatchfileProtocol.swift":"Autogenerated API","Plugins.swift":"Autogenerated API","PrecheckfileProtocol.swift":"Autogenerated API","ScanfileProtocol.swift":"Autogenerated API","ScreengrabfileProtocol.swift":"Autogenerated API","SnapshotfileProtocol.swift":"Autogenerated API","LaneFileProtocol.swift":"Fastfile Components","OptionalConfigValue.swift":"Fastfile Components","Atomic.swift":"Networking","ControlCommand.swift":"Networking","RubyCommand.swift":"Networking","RubyCommandable.swift":"Networking","Runner.swift":"Networking","SocketClient.swift":"Networking","SocketClientDelegateProtocol.swift":"Networking","SocketResponse.swift":"Networking","main.swift":"Runner Code","ArgumentProcessor.swift":"Runner Code","RunnerArgument.swift":"Runner Code"}

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -320,7 +320,11 @@ module FastlaneCore
         UI.verbose("Uninstalling app '#{app_identifier}' from #{device_type}...")
 
         UI.message("Launch Simulator #{device_type}")
-        Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        if FastlaneCore::Helper.xcode_at_least?("13")
+          Helper.backticks("open -a Simulator.app --args -CurrentDeviceUDID #{device_udid} &> /dev/null")
+        else
+          Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        end
 
         UI.message("Uninstall application #{app_identifier}")
         Helper.backticks("xcrun simctl uninstall #{device_udid} #{app_identifier} &> /dev/null")

data/match/lib/match/nuke.rb

@@ -18,6 +18,7 @@ module Match
     attr_accessor :params
     attr_accessor :type
 
+    attr_accessor :safe_remove_certs
     attr_accessor :certs
     attr_accessor :profiles
     attr_accessor :files
@@ -70,6 +71,8 @@ module Match
                                          hide_keys: [:app_identifier],
                                              title: "Summary for match nuke #{Fastlane::VERSION}")
 
+      self.safe_remove_certs = params[:safe_remove_certs] || false
+
       prepare_list
       filter_by_cert
       print_tables
@@ -81,11 +84,13 @@ module Match
       if (self.certs + self.profiles + self.files).count > 0
         unless params[:skip_confirmation]
           UI.error("---")
-          UI.error("Are you sure you want to completely delete and revoke all the")
-          UI.error("certificates and provisioning profiles listed above? (y/n)")
+          remove_or_revoke_message = self.safe_remove_certs ? "remove" : "revoke"
+          UI.error("Are you sure you want to completely delete and #{remove_or_revoke_message} all the")
+          UI.error("certificates and delete provisioning profiles listed above? (y/n)")
           UI.error("Warning: By nuking distribution, both App Store and Ad Hoc profiles will be deleted") if type == "distribution"
           UI.error("Warning: The :app_identifier value will be ignored - this will delete all profiles for all your apps!") if had_app_identifier
           UI.error("---")
+          print_safe_remove_certs_hint
         end
         if params[:skip_confirmation] || UI.confirm("Do you really want to nuke everything listed above?")
           nuke_it_now!
@@ -119,10 +124,12 @@ module Match
       if Spaceship::ConnectAPI.client.in_house? && (type == "distribution" || type == "enterprise")
         UI.error("---")
         UI.error("⚠️ Warning: This seems to be an Enterprise account!")
-        UI.error("By nuking your account's distribution, all your apps deployed via ad-hoc will stop working!") if type == "distribution"
-        UI.error("By nuking your account's enterprise, all your in-house apps will stop working!") if type == "enterprise"
+        unless self.safe_remove_certs
+          UI.error("By nuking your account's distribution, all your apps deployed via ad-hoc will stop working!") if type == "distribution"
+          UI.error("By nuking your account's enterprise, all your in-house apps will stop working!") if type == "enterprise"
+        end
         UI.error("---")
-
+        print_safe_remove_certs_hint
         UI.user_error!("Enterprise account nuke cancelled") unless UI.confirm("Do you really want to nuke your Enterprise account?")
       end
     end
@@ -168,7 +175,7 @@ module Match
         keys += self.storage.list_files(file_name: ct.to_s, file_ext: "p12")
       end
 
-      # Finds all the iOS and macOS profofiles in the file storage
+      # Finds all the iOS and macOS profiles in the file storage
       profiles = []
       prov_types.each do |prov_type|
         profiles += self.storage.list_files(file_name: prov_type.to_s, file_ext: "mobileprovision")
@@ -190,7 +197,7 @@ module Match
         [i + 1, cert.name, cert.id, cert.class.to_s.split("::").last, cert_expiration]
       end
       puts(Terminal::Table.new({
-        title: "Certificates that can be revoked".green,
+        title: "Certificates that can be #{removed_or_revoked_message}".green,
         headings: ["Option", "Name", "ID", "Type", "Expires"],
         rows: FastlaneCore::PrintTable.transform_output(rows)
       }))
@@ -259,7 +266,7 @@ module Match
           [cert.name, cert.id, cert.class.to_s.split("::").last, cert_expiration]
         end
         puts(Terminal::Table.new({
-          title: "Certificates that are going to be revoked".green,
+          title: "Certificates that are going to be #{removed_or_revoked_message}".green,
           headings: ["Name", "ID", "Type", "Expires"],
           rows: FastlaneCore::PrintTable.transform_output(rows)
         }))
@@ -313,8 +320,14 @@ module Match
         UI.success("Successfully deleted profile")
       end
 
-      UI.header("Revoking #{self.certs.count} certificates...") unless self.certs.count == 0
+      removing_or_revoking_message = self.safe_remove_certs ? "Removing" : "Revoking"
+      UI.header("#{removing_or_revoking_message} #{self.certs.count} certificates...") unless self.certs.count == 0
       self.certs.each do |cert|
+        if self.safe_remove_certs
+          UI.message("Certificate '#{cert.name}' (#{cert.id}) will be removed from repository without revoking it")
+          next
+        end
+
         UI.message("Revoking certificate '#{cert.name}' (#{cert.id})...")
         begin
           cert.delete!
@@ -427,6 +440,17 @@ module Match
         raise "Unknown provisioning type '#{prov_type}'"
       end
     end
+
+    # Helpers for `safe_remove_certs`
+    def print_safe_remove_certs_hint
+      return if self.safe_remove_certs
+      UI.important("Hint: You can use --safe_remove_certs option to remove certificates")
+      UI.important("from repository without revoking them.")
+    end
+
+    def removed_or_revoked_message
+      self.safe_remove_certs ? "removed" : "revoked"
+    end
   end
   # rubocop:disable Metrics/ClassLength
 end

data/match/lib/match/options.rb

@@ -249,7 +249,7 @@ module Match
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :force_for_new_certificates,
                                      env_name:  "MATCH_FORCE_FOR_NEW_CERTIFICATES",
-                                     description: "Renew the provisioning profiles if the device count on the developer portal has changed. Works only for the 'development' provisioning profile type. Requires 'include_all_certificates' option to be 'true'",
+                                     description: "Renew the provisioning profiles if the certificate count on the developer portal has changed. Works only for the 'development' provisioning profile type. Requires 'include_all_certificates' option to be 'true'",
                                      type: Boolean,
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_confirmation,
@@ -257,6 +257,11 @@ module Match
                                      description: "Disables confirmation prompts during nuke, answering them with yes",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :safe_remove_certs,
+                                     env_name: "MATCH_SAFE_REMOVE_CERTS",
+                                     description: "Remove certs from repository during nuke without revoking them on the developer portal",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_docs,
                                      env_name: "MATCH_SKIP_DOCS",
                                      description: "Skip generation of a README.md for the created git repository",

data/match/lib/match/storage/s3_storage.rb

@@ -168,10 +168,10 @@ module Match
       private
 
       def s3_object_path(file_name)
-        santized = sanitize_file_name(file_name)
-        return santized if santized.start_with?(s3_object_prefix)
+        sanitized = sanitize_file_name(file_name)
+        return sanitized if sanitized.start_with?(s3_object_prefix)
 
-        s3_object_prefix + santized
+        s3_object_prefix + sanitized
       end
 
       def strip_s3_object_prefix(object_path)

data/pilot/lib/pilot/build_manager.rb

@@ -18,6 +18,11 @@ module Pilot
 
       UI.user_error!("No ipa or pkg file given") if config[:ipa].nil? && config[:pkg].nil?
 
+      if config[:ipa] && config[:pkg]
+        UI.important("WARNING: Both `ipa` and `pkg` options are defined either explicitly or with default_value (build found in directory)")
+        UI.important("Uploading `ipa` is preferred by default. Set `app_platform` to `osx` to force uploading `pkg`")
+      end
+
       check_for_changelog_or_whats_new!(options)
 
       UI.success("Ready to upload new build to TestFlight (App: #{fetch_app_id})...")
@@ -25,24 +30,29 @@ module Pilot
       dir = Dir.mktmpdir
 
       platform = fetch_app_platform
-      if options[:ipa]
+      ipa_path = options[:ipa]
+      if ipa_path && platform != 'osx'
+        asset_path = ipa_path
         package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(app_id: fetch_app_id,
-                                                                      ipa_path: options[:ipa],
+                                                                      ipa_path: ipa_path,
                                                                   package_path: dir,
                                                                       platform: platform)
       else
+        pkg_path = options[:pkg]
+        asset_path = pkg_path
         package_path = FastlaneCore::PkgUploadPackageBuilder.new.generate(app_id: fetch_app_id,
-                                                                        pkg_path: options[:pkg],
+                                                                        pkg_path: pkg_path,
                                                                     package_path: dir,
                                                                         platform: platform)
       end
 
       transporter = transporter_for_selected_team(options)
-      result = transporter.upload(package_path: package_path, asset_path: options[:ipa] || options[:pkg])
+      result = transporter.upload(package_path: package_path, asset_path: asset_path)
 
       unless result
         transporter_errors = transporter.displayable_errors
-        UI.user_error!("Error uploading ipa file: \n #{transporter_errors}")
+        file_type = platform == "osx" ? "pkg" : "ipa"
+        UI.user_error!("Error uploading #{file_type} file: \n #{transporter_errors}")
       end
 
       UI.success("Successfully uploaded the new binary to App Store Connect")
@@ -98,7 +108,7 @@ module Pilot
 
     def wait_for_build_processing_to_be_complete(return_when_build_appears = false)
       platform = fetch_app_platform
-      if config[:ipa]
+      if config[:ipa] && platform != "osx"
         app_version = FastlaneCore::IpaFileAnalyser.fetch_app_version(config[:ipa])
         app_build = FastlaneCore::IpaFileAnalyser.fetch_app_build(config[:ipa])
       elsif config[:pkg]
@@ -410,7 +420,7 @@ module Pilot
       # This is where we could add a check to see if encryption is required and has been updated
       uploaded_build = set_export_compliance_if_needed(uploaded_build, options)
 
-      if options[:groups] || options[:distribute_external]
+      if options[:submit_beta_review] && (options[:groups] || options[:distribute_external])
         if uploaded_build.ready_for_beta_submission?
           uploaded_build.post_beta_app_review_submission
         else

data/pilot/lib/pilot/options.rb

@@ -324,7 +324,12 @@ module Pilot
                                      env_name: "PILOT_REJECT_PREVIOUS_BUILD",
                                      description: "Expire previous if it's 'waiting for review'",
                                      is_string: false,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :submit_beta_review,
+                                     env_name: "PILOT_DISTRIBUTE_EXTERNAL",
+                                     description: "Send the build for a beta review",
+                                     type: Boolean,
+                                     default_value: true)
       ]
     end
   end

data/scan/lib/scan/runner.rb

@@ -188,6 +188,7 @@ module Scan
         number_of_tests: 0,
         number_of_failures: 0,
         number_of_retries: 0,
+        number_of_skipped: 0,
         number_of_tests_excluding_retries: 0,
         number_of_failures_excluding_retries: 0
       }
@@ -250,6 +251,7 @@ module Scan
         results[:number_of_failures] += data[:number_of_failures]
         results[:number_of_tests_excluding_retries] += data[:number_of_tests_excluding_retries]
         results[:number_of_failures_excluding_retries] += data[:number_of_failures_excluding_retries]
+        results[:number_of_skipped] += data[:number_of_skipped] || 0
         results[:number_of_retries] += data[:number_of_retries]
       end
 
@@ -257,11 +259,16 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
+      copy_simulator_logs
+      zip_build_products
+      copy_xctestrun
+
       return nil if Scan.config[:build_for_testing]
 
       results = trainer_test_results
 
       number_of_retries = results[:number_of_retries]
+      number_of_skipped = results[:number_of_skipped]
       number_of_tests = results[:number_of_tests_excluding_retries]
       number_of_failures = results[:number_of_failures_excluding_retries]
 
@@ -289,15 +296,12 @@ module Scan
         title: "Test Results",
         rows: [
           ["Number of tests", "#{number_of_tests}#{retries_str}"],
+          number_of_skipped > 0 ? ["Number of tests skipped", number_of_skipped] : nil,
           ["Number of failures", failures_str]
-        ]
+        ].compact
       }))
       puts("")
 
-      copy_simulator_logs
-      zip_build_products
-      copy_xctestrun
-
       if number_of_failures > 0
         open_report
 

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -165,7 +165,7 @@ open class Snapshot: NSObject {
             }
 
             let screenshot = XCUIScreen.main.screenshot()
-            #if os(iOS)
+            #if os(iOS) && !targetEnvironment(macCatalyst)
             let image = XCUIDevice.shared.orientation.isLandscape ?  fixLandscapeOrientation(image: screenshot.image) : screenshot.image
             #else
             let image = screenshot.image
@@ -306,4 +306,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.27]
+// SnapshotHelperVersion [1.28]

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -94,7 +94,11 @@ module Snapshot
         device_udid = TestCommandGenerator.device_udid(device_type)
 
         UI.message("Launch Simulator #{device_type}")
-        Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        if FastlaneCore::Helper.xcode_at_least?("13")
+          Helper.backticks("open -a Simulator.app --args -CurrentDeviceUDID #{device_udid} &> /dev/null")
+        else
+          Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        end
 
         paths.each do |path|
           UI.message("Adding '#{path}'")

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -168,7 +168,7 @@ module Spaceship
         "R58UK2EWSO" => Production,
         "9RQEK7MSXA" => InHouse,
         "LA30L5BJEU" => Certificate,
-        "BKLRAVXMGM" => DevelopmentPush,
+        "JKG5JZ54H7" => DevelopmentPush,
         "UPV3DW712I" => ProductionPush,
         "Y3B2F3TYSI" => Passbook,
         "3T2ZP62QW8" => WebsitePush,
@@ -178,12 +178,13 @@ module Spaceship
       }
 
       OLDER_IOS_CERTIFICATE_TYPES = [
-        # those are also sent by the browser, but not sure what they represent
+        "3BQKVH9I2X", # old ProductionPush
+        "BKLRAVXMGM", # old DevelopmentPush
+        # those are also sent by the browser, but not sure what they represent:
         "T44PTHVNID",
         "DZQUP8189Y",
         "FGQUP4785Z",
         "S5WE21TULA",
-        "3BQKVH9I2X", # ProductionPush,
         "FUOY7LWJET"
       ]
 

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

@@ -6,13 +6,16 @@
 
 <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_excluding_retries] %>" failures="<%= testsuite[:number_of_failures_excluding_retries] %>" 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] %>" <% if testsuite[:number_of_skipped] %>skipped="<%= testsuite[:number_of_skipped] %>" <% end %>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| %>
             <failure message=<%= failure[:failure_message].encode(:xml => :attr) %>>
             </failure>
           <% end %>
+          <% if test[:skipped] %>
+            <skipped/>
+          <% end%>
         </testcase>
       <% end %>
     </testsuite>

data/trainer/lib/trainer/test_parser.rb

@@ -19,6 +19,7 @@ module Trainer
     attr_accessor :number_of_tests_excluding_retries
     attr_accessor :number_of_failures_excluding_retries
     attr_accessor :number_of_retries
+    attr_accessor :number_of_skipped
 
     # Returns a hash with the path being the key, and the value
     # defining if the tests were successful
@@ -89,7 +90,8 @@ module Trainer
           number_of_failures: tp.number_of_failures,
           number_of_tests_excluding_retries: tp.number_of_tests_excluding_retries,
           number_of_failures_excluding_retries: tp.number_of_failures_excluding_retries,
-          number_of_retries: tp.number_of_retries
+          number_of_retries: tp.number_of_retries,
+          number_of_skipped: tp.number_of_skipped
         }
       end
       return_hash
@@ -116,12 +118,14 @@ module Trainer
       self.number_of_tests_excluding_retries = 0
       self.number_of_failures_excluding_retries = 0
       self.number_of_retries = 0
+      self.number_of_skipped = 0
       self.data.each do |thing|
         self.number_of_tests += thing[:number_of_tests].to_i
         self.number_of_failures += thing[:number_of_failures].to_i
         self.number_of_tests_excluding_retries += thing[:number_of_tests_excluding_retries].to_i
         self.number_of_failures_excluding_retries += thing[:number_of_failures_excluding_retries].to_i
         self.number_of_retries += thing[:number_of_retries].to_i
+        self.number_of_skipped += thing[:number_of_skipped].to_i
       end
     end
 
@@ -250,6 +254,7 @@ module Trainer
 
           info = tests_by_identifier[identifier] || {}
           info[:failure_count] ||= 0
+          info[:skip_count] ||= 0
           info[:success_count] ||= 0
 
           retry_count = info[:retry_count]
@@ -272,6 +277,9 @@ module Trainer
             }]
 
             info[:failure_count] += 1
+          elsif test.test_status == "Skipped"
+            test_row[:skipped] = true
+            info[:skip_count] += 1
           else
             info[:success_count] = 1
           end
@@ -319,7 +327,8 @@ module Trainer
         # Used for seeing if any tests continued to fail after all of the Xcode 13 (and up) retries have finished
         unique_tests = tests_by_identifier.values || []
         row[:number_of_tests_excluding_retries] = unique_tests.count
-        row[:number_of_failures_excluding_retries] = unique_tests.find_all { |a| a[:success_count] == 0 }.count
+        row[:number_of_skipped] = unique_tests.map { |a| a[:skip_count] }.inject(:+)
+        row[:number_of_failures_excluding_retries] = unique_tests.find_all { |a| (a[:success_count] + a[:skip_count]) == 0 }.count
         row[:number_of_retries] = unique_tests.map { |a| a[:retry_count] }.inject(:+)
 
         row

metadata

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