fastlane 2.204.2 → 2.205.1

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

@@ -2,35 +2,35 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.49.3",
+        "version": "0.49.6",
         "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:0e8e1fe019fd98a5cb6d75e31130eedcb65546693eb385a06948b940da7125d3",
+              "sha256": "0e8e1fe019fd98a5cb6d75e31130eedcb65546693eb385a06948b940da7125d3"
             },
             "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:916c5eaf7600aa9a6bf7fc4d3998b1b165b5b354de260ce6e13bbc4ff3167ff1",
+              "sha256": "916c5eaf7600aa9a6bf7fc4d3998b1b165b5b354de260ce6e13bbc4ff3167ff1"
             },
             "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:8ddd11b5e105b148b8919e9c44d851e845e9c31ed7cf8a9b92b2369bd0df98d5",
+              "sha256": "8ddd11b5e105b148b8919e9c44d851e845e9c31ed7cf8a9b92b2369bd0df98d5"
             },
             "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:c1fd4ae18452ea62e6d33ca0554fa4df5f646a22abffe7f5d489c397945b7ea9",
+              "sha256": "c1fd4ae18452ea62e6d33ca0554fa4df5f646a22abffe7f5d489c397945b7ea9"
             },
             "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:f1ffad5c8bbfe80659f51b7cc54062c736fed1ff79b71b8f648d8e4552d8b752",
+              "sha256": "f1ffad5c8bbfe80659f51b7cc54062c736fed1ff79b71b8f648d8e4552d8b752"
             }
           }
         }
@@ -56,12 +56,12 @@
         "macOS": "11.0.1"
       },
       "monterey": {
-        "HOMEBREW_VERSION": "3.3.13-44-g8e97f60",
+        "HOMEBREW_VERSION": "3.4.3-43-g6e1b6a3",
         "HOMEBREW_PREFIX": "/opt/homebrew",
-        "Homebrew/homebrew-core": "e240762241519818ce5ec468ac8b67daf17d64a2",
+        "Homebrew/homebrew-core": "2b1ab33f1beebecfdf4b584992272417d9492167",
         "CLT": "13.2.0.0.1.1638488800",
         "Xcode": "13.2.1",
-        "macOS": "12.0.1"
+        "macOS": "12.2.1"
       }
     }
   }

data/fastlane_core/README.md

@@ -23,6 +23,7 @@ You can hide the inline changelog by setting the `FASTLANE_HIDE_CHANGELOG` envir
 
 - To hide timestamps in each row, set the `FASTLANE_HIDE_TIMESTAMP` environment variable to true.
 - To disable output formatting, set the `FASTLANE_DISABLE_OUTPUT_FORMAT` environment variable to true.
+- To prevent _fastlane_ from printing the plugins table on every lane run, set the `FASTLANE_HIDE_PLUGINS_TABLE` environment variable to true.
 
 ## Interacting with the user
 

data/match/lib/match/encryption/openssl.rb

@@ -135,7 +135,7 @@ module Match
         UI.crash!("Error encrypting '#{path}'")
       end
 
-      # The encryption parameters in this implementations reflect the old behaviour which depended on the users' local OpenSSL version
+      # The encryption parameters in this implementations reflect the old behavior which depended on the users' local OpenSSL version
       # 1.0.x OpenSSL and earlier versions use MD5, 1.1.0c and newer uses SHA256, we try both before giving an error
       def decrypt_specific_file(path: nil, password: nil, hash_algorithm: "MD5")
         stored_data = Base64.decode64(File.read(path))

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,

data/pilot/lib/pilot/build_manager.rb

@@ -402,8 +402,8 @@ module Pilot
       return generic_transporter unless tunes_client.teams.count > 1
 
       begin
-        team = tunes_client.teams.find { |t| t['contentProvider']['contentProviderId'].to_s == tunes_client.team_id }
-        name = team['contentProvider']['name']
+        team = tunes_client.teams.find { |t| t['providerId'].to_s == tunes_client.team_id }
+        name = team['name']
         provider_id = generic_transporter.provider_ids[name]
         UI.verbose("Inferred provider id #{provider_id} for team #{name}.")
         return FastlaneCore::ItunesTransporter.new(options[:username], nil, false, provider_id)

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
 
@@ -266,6 +268,7 @@ module Scan
       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]
 
@@ -293,8 +296,9 @@ 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("")
 

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/spaceship/lib/spaceship/client.rb

@@ -70,10 +70,10 @@ module Spaceship
 
     # @return (Array) A list of all available teams
     def teams
-      user_details_data['associatedAccounts'].sort_by do |team|
+      user_details_data['availableProviders'].sort_by do |team|
         [
-          team['contentProvider']['name'],
-          team['contentProvider']['contentProviderId']
+          team['name'],
+          team['providerId']
         ]
       end
     end
@@ -124,8 +124,8 @@ module Spaceship
     #  "userName"=>"detlef@krausefx.com"}
     def user_details_data
       return @_cached_user_details if @_cached_user_details
-      r = request(:get, '/WebObjects/iTunesConnect.woa/ra/user/detail')
-      @_cached_user_details = parse_response(r, 'data')
+      r = request(:get, "https://appstoreconnect.apple.com/olympus/v1/session")
+      @_cached_user_details = parse_response(r)
     end
 
     # @return (String) The currently selected Team ID
@@ -135,7 +135,7 @@ module Spaceship
       if teams.count > 1
         puts("The current user is in #{teams.count} teams. Pass a team ID or call `select_team` to choose a team. Using the first one for now.")
       end
-      @current_team_id ||= user_details_data['sessionToken']['contentProviderId']
+      @current_team_id ||= user_details_data['provider']['providerId']
     end
 
     # Set a new team ID which will be used from now on
@@ -144,12 +144,11 @@ module Spaceship
       # following confusing error message
       #
       #     invalid content provider id
-      #
       available_teams = teams.collect do |team|
         {
-          team_id: (team["contentProvider"] || {})["contentProviderId"],
-          public_team_id: (team["contentProvider"] || {})["contentProviderPublicId"],
-          team_name: (team["contentProvider"] || {})["name"]
+          team_id: team["providerId"],
+          public_team_id: team["publicProviderId"],
+          team_name: team["name"]
         }
       end
 
@@ -163,21 +162,10 @@ module Spaceship
       end
 
       response = request(:post) do |req|
-        req.url("https://appstoreconnect.apple.com/olympus/v1/providerSwitchRequests")
-        req.body = {
-          "data": {
-            "type": "providerSwitchRequests",
-            "relationships": {
-              "provider": {
-                "data": {
-                  "type": "providers",
-                  "id": result[:public_team_id]
-                }
-              }
-            }
-          }
-        }.to_json
+        req.url("https://appstoreconnect.apple.com/olympus/v1/session")
+        req.body = { "provider": { "providerId": result[:team_id] } }.to_json
         req.headers['Content-Type'] = 'application/json'
+        req.headers['X-Requested-With'] = 'olympus-ui'
       end
 
       handle_itc_response(response.body)
@@ -546,7 +534,7 @@ module Spaceship
           raise AppleIDAndPrivacyAcknowledgementNeeded.new, "Need to acknowledge to Apple's Apple ID and Privacy statement. " \
                                                             "Please manually log into https://appleid.apple.com (or https://appstoreconnect.apple.com) to acknowledge the statement. " \
                                                             "Your account might also be asked to upgrade to 2FA. " \
-                                                            "Set SPACESHIP_SKIP_2FA_UPGRADE=1 for fastlane to automaticaly bypass 2FA upgrade if possible."
+                                                            "Set SPACESHIP_SKIP_2FA_UPGRADE=1 for fastlane to automatically bypass 2FA upgrade if possible."
         elsif (response['Set-Cookie'] || "").include?("itctx")
           raise "Looks like your Apple ID is not enabled for App Store Connect, make sure to be able to login online"
         else

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

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

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

@@ -20,6 +20,7 @@ module Spaceship
         COMPLETE = "COMPLETE"
         IN_REVIEW = "IN_REVIEW"
         READY_FOR_REVIEW = "READY_FOR_REVIEW"
+        UNRESOLVED_ISSUES = "UNRESOLVED_ISSUES"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
       end
 

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/spaceship/lib/spaceship/tunes/app_ratings.rb

@@ -8,22 +8,22 @@ module Spaceship
       #   this version is for
       attr_accessor :application
 
-      # @return (Integer) total number of ratings recevied
+      # @return (Integer) total number of ratings received
       attr_accessor :rating_count
 
-      # @return (Integer) total number of one star ratings recevied
+      # @return (Integer) total number of one star ratings received
       attr_accessor :one_star_rating_count
 
-      # @return (Integer) total number of two star ratings recevied
+      # @return (Integer) total number of two star ratings received
       attr_accessor :two_star_rating_count
 
-      # @return (Integer) total number of three star ratings recevied
+      # @return (Integer) total number of three star ratings received
       attr_accessor :three_star_rating_count
 
-      # @return (Integer) total number of four star ratings recevied
+      # @return (Integer) total number of four star ratings received
       attr_accessor :four_star_rating_count
 
-      # @return (Integer) total number of five star ratings recevied
+      # @return (Integer) total number of five star ratings received
       attr_accessor :five_star_rating_count
 
       attr_mapping({

data/spaceship/lib/spaceship/tunes/iap_families.rb

@@ -7,7 +7,7 @@ module Spaceship
       attr_accessor :application
 
       # Create a new Purchase Family
-      # a freshly created family has to have atleast one product.
+      # a freshly created family has to have at least one product.
       # the product will be created, and versions/pricing_intervals and so on
       # should be set by subsequent edit.
       # @param name (String) Familyname

data/spaceship/lib/spaceship/tunes/tunes.rb

@@ -14,7 +14,6 @@ require_relative 'app_version_ref'
 require_relative 'app_version_history'
 require_relative 'app_version_states_history'
 require_relative 'transit_app_file'
-require_relative 'user_detail'
 require_relative 'app_screenshot'
 require_relative 'language_converter'
 require_relative 'build'

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -9,7 +9,6 @@ require_relative 'errors'
 require_relative 'iap_subscription_pricing_tier'
 require_relative 'pricing_tier'
 require_relative 'territory'
-require_relative 'user_detail'
 module Spaceship
   # rubocop:disable Metrics/ClassLength
   class TunesClient < Spaceship::Client
@@ -72,13 +71,13 @@ module Spaceship
         puts("Looking for App Store Connect Team with name #{t_name}") if Spaceship::Globals.verbose?
 
         teams.each do |t|
-          t_id = t['contentProvider']['contentProviderId'].to_s if t['contentProvider']['name'].casecmp(t_name).zero?
+          t_id = t['providerId'].to_s if t['name'].casecmp(t_name).zero?
         end
 
         puts("Could not find team with name '#{t_name}', trying to fallback to default team") if t_id.length.zero?
       end
 
-      t_id = teams.first['contentProvider']['contentProviderId'].to_s if teams.count == 1
+      t_id = teams.first['providerId'].to_s if teams.count == 1
 
       if t_id.length > 0
         puts("Looking for App Store Connect Team with ID #{t_id}") if Spaceship::Globals.verbose?
@@ -92,11 +91,11 @@ module Spaceship
       loop do
         puts("Multiple #{'App Store Connect teams'.yellow} found, please enter the number of the team you want to use: ")
         if ENV["FASTLANE_HIDE_TEAM_INFORMATION"].to_s.length == 0
+          first_team = teams.first
           puts("Note: to automatically choose the team, provide either the App Store Connect Team ID, or the Team Name in your fastlane/Appfile:")
           puts("Alternatively you can pass the team name or team ID using the `FASTLANE_ITC_TEAM_ID` or `FASTLANE_ITC_TEAM_NAME` environment variable")
-          first_team = teams.first["contentProvider"]
           puts("")
-          puts("  itc_team_id \"#{first_team['contentProviderId']}\"")
+          puts("  itc_team_id \"#{first_team['providerId']}\"")
           puts("")
           puts("or")
           puts("")
@@ -106,7 +105,7 @@ module Spaceship
 
         # We're not using highline here, as spaceship doesn't have a dependency to fastlane_core or highline
         teams.each_with_index do |team, i|
-          puts("#{i + 1}) \"#{team['contentProvider']['name']}\" (#{team['contentProvider']['contentProviderId']})")
+          puts("#{i + 1}) \"#{team['name']}\" (#{team['providerId']})")
         end
 
         unless Spaceship::Client::UserInterface.interactive?
@@ -119,7 +118,7 @@ module Spaceship
         team_to_use = teams[selected] if selected >= 0
 
         if team_to_use
-          self.team_id = team_to_use['contentProvider']['contentProviderId'].to_s # actually set the team id here
+          self.team_id = team_to_use['providerId'].to_s # actually set the team id here
           return self.team_id
         end
       end
@@ -950,13 +949,6 @@ module Spaceship
       Spaceship::Tunes::AppVersionRef.factory(data)
     end
 
-    # Fetches the User Detail information from ITC. This gets called often and almost never changes
-    # so we cache it
-    # @return [UserDetail] the response
-    def user_detail_data
-      @_cached_user_detail_data ||= Spaceship::Tunes::UserDetail.factory(user_details_data, self)
-    end
-
     #####################################################
     # @!group CandiateBuilds
     #####################################################
@@ -992,7 +984,7 @@ module Spaceship
         tries -= 1
         if tries > 0
           logger.warn("Received temporary server error from App Store Connect. Retrying the request...")
-          sleep(3) unless Object.const_defined?("SpecHelper")
+          sleep(3) unless Object.const_defined?(:SpecHelper)
           retry
         end
       end
@@ -1560,7 +1552,7 @@ module Spaceship
         msg = "App Store Connect temporary error received: '#{ex.message}'. Retrying after #{seconds_to_sleep} seconds (remaining: #{tries})..."
         puts(msg)
         logger.warn(msg)
-        sleep(seconds_to_sleep) unless Object.const_defined?("SpecHelper")
+        sleep(seconds_to_sleep) unless Object.const_defined?(:SpecHelper)
         retry
       end
       raise ex # re-raise the exception
@@ -1570,7 +1562,7 @@ module Spaceship
         msg = "Potential server error received: '#{ex.message}'. Retrying after 10 seconds (remaining: #{potential_server_error_tries})..."
         puts(msg)
         logger.warn(msg)
-        sleep(seconds_to_sleep) unless Object.const_defined?("SpecHelper")
+        sleep(seconds_to_sleep) unless Object.const_defined?(:SpecHelper)
         retry
       end
       raise ex
@@ -1582,9 +1574,14 @@ module Spaceship
       @sso_token_for_video = nil
     end
 
-    # the contentProviderIr found in the UserDetail instance
+    # the contentProviderId found in the user details data
     def content_provider_id
-      @content_provider_id ||= user_detail_data.content_provider_id
+      return @content_provider_id if @content_provider_id
+
+      provider = user_details_data["provider"]["providerId"]
+      @content_provider_id ||= provider.to_s if provider
+
+      return @content_provider_id
     end
 
     # the ssoTokenForImage found in the AppVersionRef instance

data/supply/lib/supply/client.rb

@@ -266,14 +266,9 @@ module Supply
       filtered_tracks = tracks.select { |t| !t.releases.nil? && t.releases.any? { |r| r.name == version } }
 
       if filtered_tracks.length > 1
-        # Production track takes precedence if version is present in multiple tracks
+        # Prefer tracks in production, beta, alpha, internal order
         # E.g.: A release might've been promoted from Alpha/Beta track. This means the release will be present in two or more tracks
-        if filtered_tracks.any? { |t| t.track == Supply::Tracks::DEFAULT }
-          filtered_tracks = filtered_tracks.select { |t| t.track == Supply::Tracks::DEFAULT }
-        else
-          # E.g.: A release might be in both Alpha & Beta (not sure if this is possible, just catching if it ever happens), giving Beta precedence.
-          filtered_tracks = filtered_tracks.select { |t| t.track == Supply::Tracks::BETA }
-        end
+        filtered_tracks = filtered_tracks.sort_by { |t| Supply::Tracks::DEFAULTS.index(t.track) || Float::INFINITY }
       end
 
       filtered_track = filtered_tracks.first

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

@@ -6,13 +6,21 @@
 
 <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] %>">
+      <% unless testsuite[:configuration_name].nil? %>
+        <properties>
+          <property name="Configuration" value="<%= testsuite[:configuration_name] %>"/>
+        </properties>
+      <% end %>
       <% 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/junit_generator.rb

@@ -19,7 +19,7 @@ module Trainer
 
       xml = xml.gsub('system_', 'system-').delete("\e") # Jenkins can not parse 'ESC' symbol
 
-      # We have to manuall clear empty lines
+      # We have to manually clear empty lines
       # They may contain white spaces
       clean_xml = []
       xml.each_line do |row|

data/trainer/lib/trainer/options.rb

@@ -32,7 +32,7 @@ module Trainer
                                      env_name: "TRAINER_OUTPUT_DIRECTORY",
                                      default_value: nil,
                                      optional: true,
-                                     description: "Directoy in which the xml files should be written to. Same directory as source by default"),
+                                     description: "Directory 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",

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
 
@@ -132,7 +136,7 @@ module Trainer
 
     # @return [Bool] were all tests successful? Is false if at least one test failed
     def tests_successful?
-      self.data.collect { |a| a[:number_of_failures] }.all?(&:zero?)
+      self.data.collect { |a| a[:number_of_failures_excluding_retries] }.all?(&:zero?)
     end
 
     private
@@ -226,6 +230,8 @@ module Trainer
       all_summaries = summaries.map(&:summaries).flatten
       testable_summaries = all_summaries.map(&:testable_summaries).flatten
 
+      summaries_to_names = test_summaries_to_configuration_names(all_summaries)
+
       # Maps ActionTestableSummary to rows for junit generator
       rows = testable_summaries.map do |testable_summary|
         all_tests = testable_summary.all_tests.flatten
@@ -250,6 +256,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 +279,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
@@ -309,6 +319,7 @@ module Trainer
           project_path: testable_summary.project_relative_path,
           target_name: testable_summary.target_name,
           test_name: testable_summary.name,
+          configuration_name: summaries_to_names[testable_summary],
           duration: all_tests.map(&:duration).inject(:+),
           tests: test_rows
         }
@@ -319,7 +330,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
@@ -328,6 +340,16 @@ module Trainer
       self.data = rows
     end
 
+    def test_summaries_to_configuration_names(test_summaries)
+      summary_to_name = {}
+      test_summaries.each do |summary|
+        summary.testable_summaries.each do |testable_summary|
+          summary_to_name[testable_summary] = summary.name
+        end
+      end
+      summary_to_name
+    end
+
     # Convert the Hashes and Arrays in something more useful
     def parse_content(xcpretty_naming)
       self.data = self.raw_json["TestableSummaries"].collect do |testable_summary|