fastlane 2.205.0 → 2.206.0

data/match/lib/match/storage/google_cloud_storage.rb

@@ -48,7 +48,8 @@ module Match
           team_id: params[:team_id],
           team_name: params[:team_name],
           api_key_path: params[:api_key_path],
-          api_key: params[:api_key]
+          api_key: params[:api_key],
+          skip_google_cloud_account_confirmation: params[:skip_google_cloud_account_confirmation]
         )
       end
 
@@ -62,7 +63,8 @@ module Match
                      team_id: nil,
                      team_name: nil,
                      api_key_path: nil,
-                     api_key: nil)
+                     api_key: nil,
+                     skip_google_cloud_account_confirmation: nil)
         @type = type if type
         @platform = platform if platform
         @google_cloud_project_id = google_cloud_project_id if google_cloud_project_id
@@ -76,8 +78,7 @@ module Match
         @api_key_path = api_key_path
         @api_key = api_key
 
-        @google_cloud_keys_file = ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id)
-
+        @google_cloud_keys_file = ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id, skip_google_cloud_account_confirmation)
         if self.google_cloud_keys_file.to_s.length > 0
           # Extract the Project ID from the `JSON` file
           # so the user doesn't have to provide it manually
@@ -223,7 +224,7 @@ module Match
 
       # This method will make sure the keys file exists
       # If it's missing, it will help the user set things up
-      def ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id)
+      def ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id, skip_google_cloud_account_confirmation)
         if google_cloud_keys_file && File.exist?(google_cloud_keys_file)
           return google_cloud_keys_file
         end
@@ -251,7 +252,7 @@ module Match
             # we can continue and ask the user if they want to use a keys file.
           end
 
-          if application_default_keys && UI.confirm("Do you want to use this system's Google Cloud application default keys?")
+          if application_default_keys && (skip_google_cloud_account_confirmation || UI.confirm("Do you want to use this system's Google Cloud application default keys?"))
             return nil
           end
         end

data/scan/lib/scan/options.rb

@@ -522,7 +522,12 @@ module Scan
                                     env_name: 'SCAN_NUMBER_OF_RETRIES',
                                     description: "The number of times a test can fail",
                                     type: Integer,
-                                    default_value: 0)
+                                    default_value: 0),
+        FastlaneCore::ConfigItem.new(key: :fail_build,
+                                    env_name: "SCAN_FAIL_BUILD",
+                                    description: "Should this step stop the build if the tests fail? Set this to false if you're using trainer",
+                                    type: Boolean,
+                                    default_value: true)
 
       ]
     end

data/scan/lib/scan/runner.rb

@@ -305,11 +305,19 @@ module Scan
       if number_of_failures > 0
         open_report
 
-        UI.test_failure!("Tests have failed")
+        if Scan.config[:fail_build]
+          UI.test_failure!("Tests have failed")
+        else
+          UI.error("Tests have failed")
+        end
       end
 
       unless tests_exit_status == 0
-        UI.test_failure!("Test execution failed. Exit status: #{tests_exit_status}")
+        if Scan.config[:fail_build]
+          UI.test_failure!("Test execution failed. Exit status: #{tests_exit_status}")
+        else
+          UI.error("Test execution failed. Exit status: #{tests_exit_status}")
+        end
       end
 
       open_report

data/sigh/lib/sigh/runner.rb

@@ -251,7 +251,8 @@ module Sigh
           ]
         elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
           types = [
-            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
           ]
         else
           types = [

data/spaceship/lib/spaceship/connect_api/api_client.rb

@@ -157,8 +157,6 @@ module Spaceship
       end
 
       def with_asc_retry(tries = 5, &_block)
-        tries = 1 if Object.const_defined?("SpecHelper")
-
         response = yield
 
         status = response.status if response
@@ -170,9 +168,16 @@ module Spaceship
 
         return response
       rescue UnauthorizedAccessError => error
-        # Catch unathorized access and re-raising
-        # There is no need to try again
-        raise error
+        tries -= 1
+        puts(error) if Spaceship::Globals.verbose?
+        if tries.zero?
+          raise error
+        else
+          msg = "Token has expired or has been revoked! Trying to refresh..."
+          puts(msg) if Spaceship::Globals.verbose?
+          @token.refresh!
+          retry
+        end
       rescue TimeoutRetryError => error
         tries -= 1
         puts(error) if Spaceship::Globals.verbose?

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

@@ -362,9 +362,8 @@ module Spaceship
       def get_build_deliveries(client: nil, filter: {}, includes: nil, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
         filter ||= {}
-        filter[:app] = id
 
-        resps = client.get_build_deliveries(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        resps = client.get_build_deliveries(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
         return resps.flat_map(&:to_models)
       end
 

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

@@ -27,7 +27,8 @@ module Spaceship
       def self.all(client: nil, app_id: nil, version: nil, build_number: nil)
         client ||= Spaceship::ConnectAPI
         resps = client.get_build_deliveries(
-          filter: { app: app_id, cfBundleShortVersionString: version, cfBundleVersion: build_number },
+          app_id: app_id,
+          filter: { cfBundleShortVersionString: version, cfBundleVersion: build_number },
           limit: 1
         ).all_pages
         return resps.flat_map(&:to_models)

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

@@ -41,6 +41,7 @@ module Spaceship
         MAC_APP_DEVELOPMENT = "MAC_APP_DEVELOPMENT"
         DEVELOPER_ID_KEXT = "DEVELOPER_ID_KEXT"
         DEVELOPER_ID_APPLICATION = "DEVELOPER_ID_APPLICATION"
+        DEVELOPER_ID_APPLICATION_G2 = "DEVELOPER_ID_APPLICATION_G2"
 
         # As of 2021-11-09, this is only available with Apple ID auth
         DEVELOPER_ID_INSTALLER = "DEVELOPER_ID_INSTALLER"

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

@@ -57,6 +57,11 @@ module Spaceship
         return all(client: client, filter: { email: email }, includes: includes)
       end
 
+      def delete!(client: nil)
+        client ||= Spaceship::ConnectAPI
+        client.delete_user(user_id: id)
+      end
+
       def get_visible_apps(client: nil, limit: nil)
         client ||= Spaceship::ConnectAPI
         resp = client.get_user_visible_apps(user_id: id, limit: limit)

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -290,6 +290,28 @@ module Spaceship
           test_flight_request_client.post("bulkBetaTesterAssignments", body)
         end
 
+        # attributes - {email: "", firstName: "", lastName: ""}
+        def post_beta_tester_assignment(beta_group_ids: [], attributes: {})
+          body = {
+            data: {
+              attributes: attributes,
+              relationships: {
+                betaGroups: {
+                  data: beta_group_ids.map do |id|
+                    {
+                      type: "betaGroups",
+                      id: id
+                    }
+                  end
+                }
+              },
+              type: "betaTesters"
+            }
+          }
+
+          test_flight_request_client.post("betaTesters", body)
+        end
+
         def add_beta_tester_to_group(beta_group_id: nil, beta_tester_ids: nil)
           beta_tester_ids || []
           body = {
@@ -448,9 +470,9 @@ module Spaceship
         # buildDeliveries
         #
 
-        def get_build_deliveries(filter: {}, includes: nil, limit: nil, sort: nil)
+        def get_build_deliveries(app_id:, filter: {}, includes: nil, limit: nil, sort: nil)
           params = test_flight_request_client.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-          test_flight_request_client.get("buildDeliveries", params)
+          test_flight_request_client.get("apps/#{app_id}/buildDeliveries", params)
         end
 
         #

data/spaceship/lib/spaceship/connect_api/token.rb

@@ -90,14 +90,17 @@ module Spaceship
       end
 
       def refresh!
-        @expiration = Time.now + @duration
+        now = Time.now
+        @expiration = now + @duration
 
         header = {
-          kid: key_id
+          kid: key_id,
+          typ: 'JWT'
         }
 
         payload = {
           iss: issuer_id,
+          iat: now.to_i,
           exp: @expiration.to_i,
           aud: 'appstoreconnect-v1'
         }

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

@@ -91,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("")
@@ -105,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?
@@ -118,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
@@ -984,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
@@ -1552,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
@@ -1562,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

data/trainer/lib/trainer/test_parser.rb

@@ -136,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

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.205.0
+  version: 2.206.0
 platform: ruby
 authors:
-- Łukasz Grabowski
-- Luka Mirosevic
-- Max Ott
-- Danielle Tomlinson
-- Andrew McBurney
-- Jérôme Lacoste
-- Manu Wallner
-- Stefan Natchev
-- Josh Holtz
+- Satoshi Namai
 - Fumiya Nakamura
-- Helmut Januschka
-- Jimmy Dee
-- Maksym Grebenets
-- Daniel Jankowski
+- Matthew Ellis
 - Roger Oba
-- Jorge Revuelta H
+- Jimmy Dee
+- Luka Mirosevic
 - Iulian Onofrei
-- Aaron Brager
-- Satoshi Namai
 - Jan Piotrowski
+- Aaron Brager
+- Maksym Grebenets
+- Josh Holtz
+- Danielle Tomlinson
+- Daniel Jankowski
+- Jérôme Lacoste
+- Andrew McBurney
+- Manish Rathi
 - Olivier Halligon
-- Matthew Ellis
-- Joshua Liebowitz
+- Łukasz Grabowski
+- Manu Wallner
+- Jorge Revuelta H
+- Stefan Natchev
 - Felix Krause
-- Manish Rathi
+- Joshua Liebowitz
+- Max Ott
 - Kohki Miki
+- Helmut Januschka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-18 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -1017,6 +1017,7 @@ files:
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
 - fastlane/lib/fastlane/actions/.DS_Store
+- fastlane/lib/fastlane/actions/.supply.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1653,7 +1654,6 @@ files:
 - spaceship/lib/assets/languageMapping.json
 - spaceship/lib/assets/languageMappingReadable.json
 - spaceship/lib/spaceship.rb
-- spaceship/lib/spaceship/.client.rb.swp
 - spaceship/lib/spaceship/base.rb
 - spaceship/lib/spaceship/client.rb
 - spaceship/lib/spaceship/commands_generator.rb
@@ -1780,7 +1780,6 @@ files:
 - spaceship/lib/spaceship/test_flight/group.rb
 - spaceship/lib/spaceship/test_flight/test_info.rb
 - spaceship/lib/spaceship/test_flight/tester.rb
-- spaceship/lib/spaceship/tunes/.tunes_client.rb.swp
 - spaceship/lib/spaceship/tunes/app_analytics.rb
 - spaceship/lib/spaceship/tunes/app_details.rb
 - spaceship/lib/spaceship/tunes/app_image.rb