fastlane 2.168.0 → 2.169.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -184,4 +184,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.43]
+// FastlaneRunnerAPIVersion [0.9.44]

data/gym/lib/gym/generators/build_command_generator.rb

@@ -39,6 +39,7 @@ module Gym
         options << "-destination '#{config[:destination]}'" if config[:destination]
         options << "-archivePath #{archive_path.shellescape}" unless config[:skip_archive]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
+        options << "-scmProvider system" if config[:use_system_scm]
         options << config[:xcargs] if config[:xcargs]
         options << "OTHER_SWIFT_FLAGS=\"-Xfrontend -debug-time-function-bodies\"" if config[:analyze_build_time]
 

data/gym/lib/gym/options.rb

@@ -279,7 +279,13 @@ module Gym
                                      env_name: "GYM_CLONED_SOURCE_PACKAGES_PATH",
                                      description: "Sets a custom path for Swift Package Manager dependencies",
                                      type: String,
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :use_system_scm,
+                                     env_name: "GYM_USE_SYSTEM_SCM",
+                                     description: "Lets xcodebuild use system's scm configuration",
+                                     optional: true,
+                                     type: Boolean,
+                                     default_value: false)
       ]
     end
   end

data/scan/lib/scan/options.rb

@@ -445,7 +445,13 @@ module Scan
                                     env_name: "SCAN_CLONED_SOURCE_PACKAGES_PATH",
                                     description: "Sets a custom path for Swift Package Manager dependencies",
                                     type: String,
-                                    optional: true)
+                                    optional: true),
+        FastlaneCore::ConfigItem.new(key: :use_system_scm,
+                                     env_name: "SCAN_USE_SYSTEM_SCM",
+                                     description: "Lets xcodebuild use system's scm configuration",
+                                     optional: true,
+                                     type: Boolean,
+                                     default_value: false)
 
       ]
     end

data/scan/lib/scan/test_command_generator.rb

@@ -32,6 +32,7 @@ module Scan
 
       options = []
       options += project_path_array unless config[:xctestrun]
+      options << "-scmProvider system" if config[:use_system_scm]
       options << "-sdk '#{config[:sdk]}'" if config[:sdk]
       options << destination # generated in `detect_values`
       options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -180,7 +180,11 @@ open class Snapshot: NSObject {
                 simulator = regex.stringByReplacingMatches(in: simulator, range: range, withTemplate: "")
 
                 let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
-                try image.pngData()?.write(to: path, options: .atomic)
+                #if swift(<5.0)
+                    UIImagePNGRepresentation(image)?.write(to: path, options: .atomic)
+                #else
+                    try image.pngData()?.write(to: path, options: .atomic)
+                #endif
             } catch let error {
                 NSLog("Problem writing screenshot: \(name) to \(screenshotsDir)/\(simulator)-\(name).png")
                 NSLog(error.localizedDescription)

data/spaceship/lib/spaceship/client.rb

@@ -57,6 +57,7 @@ module Spaceship
     InternalServerError = Spaceship::InternalServerError
     BadGatewayError = Spaceship::BadGatewayError
     AccessForbiddenError = Spaceship::AccessForbiddenError
+    TooManyRequestsError = Spaceship::TooManyRequestsError
 
     def self.hostname
       raise "You must implement self.hostname"
@@ -645,6 +646,17 @@ module Spaceship
         retry
       end
       raise ex # re-raise the exception
+    rescue TooManyRequestsError => ex
+      tries -= 1
+      unless tries.zero?
+        msg = "Timeout received: '#{ex.class}', '#{ex.message}'. Retrying after #{ex.retry_after} seconds (remaining: #{tries})..."
+        puts(msg) if Spaceship::Globals.verbose?
+        logger.warn(msg)
+
+        sleep(ex.retry_after) unless Object.const_defined?("SpecHelper")
+        retry
+      end
+      raise ex # re-raise the exception
     rescue \
         Faraday::ParsingError, # <h2>Internal Server Error</h2> with content type json
         InternalServerError => ex
@@ -873,6 +885,8 @@ module Spaceship
           msg = "Access forbidden"
           logger.warn(msg)
           raise AccessForbiddenError.new, msg
+        elsif resp_hash[:status] == 429
+          raise TooManyRequestsError, resp_hash
         end
 
         return response

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

@@ -117,7 +117,8 @@ module Spaceship
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_APPLE_RELEASE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_DEVELOPER_RELEASE,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PROCESSING_FOR_APP_STORE,
-          Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::DEVELOPER_REMOVED_FROM_SALE
         ]
 
         resp = client.get_app_infos(app_id: id, includes: includes)
@@ -230,7 +231,10 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {
-          appStoreState: Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE,
+          appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::READY_FOR_SALE,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::DEVELOPER_REMOVED_FROM_SALE
+          ].join(","),
           platform: platform
         }
         return get_app_store_versions(client: client, filter: filter, includes: includes).first
@@ -282,8 +286,13 @@ module Spaceship
 
       def get_app_store_versions(client: nil, filter: {}, includes: Spaceship::ConnectAPI::AppStoreVersion::ESSENTIAL_INCLUDES, limit: nil, sort: nil)
         client ||= Spaceship::ConnectAPI
-        resps = client.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
-        return resps.flat_map(&:to_models)
+        if limit.nil?
+          resps = client.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+          return resps.flat_map(&:to_models)
+        else
+          resp = client.get_app_store_versions(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
+          return resp.to_models
+        end
       end
 
       #

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

@@ -24,6 +24,7 @@ module Spaceship
         IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
+        DEVELOPER_REMOVED_FROM_SALE = "DEVELOPER_REMOVED_FROM_SALE"
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"

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

@@ -8,6 +8,7 @@ module Spaceship
       attr_accessor :name
       attr_accessor :subtitle
       attr_accessor :privacy_policy_url
+      attr_accessor :privacy_choices_url
       attr_accessor :privacy_policy_text
 
       attr_mapping({
@@ -15,6 +16,7 @@ module Spaceship
         "name" => "name",
         "subtitle" => "subtitle",
         "privacyPolicyUrl" => "privacy_policy_url",
+        "privacyChoicesUrl" => "privacy_choices_url",
         "privacyPolicyText" => "privacy_policy_text"
       })
 

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

@@ -30,6 +30,7 @@ module Spaceship
         IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
+        DEVELOPER_REMOVED_FROM_SALE = "DEVELOPER_REMOVED_FROM_SALE"
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"

data/spaceship/lib/spaceship/errors.rb

@@ -43,6 +43,25 @@ module Spaceship
     end
   end
 
+  # Raised when 429 is received from App Store Connect
+  class TooManyRequestsError < BasicPreferredInfoError
+    attr_reader :retry_after
+    attr_reader :rate_limit_user
+
+    def initialize(resp_hash)
+      headers = resp_hash[:response_headers] || {}
+      @retry_after = (headers['retry-after'] || 60).to_i
+      @rate_limit_user = headers['x-daiquiri-rate-limit-user']
+      message = 'Apple 429 detected'
+      message += " - #{rate_limit_user}" if rate_limit_user
+      super(message)
+    end
+
+    def show_github_issues
+      false
+    end
+  end
+
   class UnexpectedResponse < StandardError
     attr_reader :error_info
 

data/spaceship/lib/spaceship/two_step_or_factor_client.rb

@@ -134,18 +134,20 @@ module Spaceship
 
         phone_number = env_2fa_sms_default_phone_number
         phone_id = phone_id_from_number(response.body["trustedPhoneNumbers"], phone_number)
+        push_mode = push_mode_from_masked_number(response.body["trustedPhoneNumbers"], phone_number)
         # don't request sms if no trusted devices and env default is the only trusted number,
         # code was automatically sent
         should_request_code = !sms_automatically_sent(response)
         code_type = 'phone'
-        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, should_request_code)
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, push_mode, should_request_code)
       elsif sms_automatically_sent(response) # sms fallback, code was automatically sent
         fallback_number = response.body["trustedPhoneNumbers"].first
         phone_number = fallback_number["numberWithDialCode"]
         phone_id = fallback_number["id"]
+        push_mode = fallback_number['pushMode']
 
         code_type = 'phone'
-        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, false)
+        body = request_two_factor_code_from_phone(phone_id, phone_number, code_length, push_mode, false)
       elsif sms_fallback(response) # sms fallback but code wasn't sent bec > 1 phone number
         code_type = 'phone'
         body = request_two_factor_code_from_phone_choose(response.body["trustedPhoneNumbers"], code_length)
@@ -275,6 +277,15 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
       end
     end
 
+    def push_mode_from_masked_number(phone_numbers, masked_number)
+      phone_numbers.each do |phone|
+        return phone['pushMode'] if phone['numberWithDialCode'] == masked_number
+      end
+
+      # If no pushMode was supplied, assume sms
+      return "sms"
+    end
+
     def request_two_factor_code_from_phone_choose(phone_numbers, code_length)
       puts("Please select a trusted phone number to send code to:")
 
@@ -283,18 +294,19 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
       end
       chosen = choose_phone_number(available)
       phone_id = phone_id_from_masked_number(phone_numbers, chosen)
+      push_mode = push_mode_from_masked_number(phone_numbers, chosen)
 
-      request_two_factor_code_from_phone(phone_id, chosen, code_length)
+      request_two_factor_code_from_phone(phone_id, chosen, code_length, push_mode)
     end
 
     # this is used in two places: after choosing a phone number and when a phone number is set via ENV var
-    def request_two_factor_code_from_phone(phone_id, phone_number, code_length, should_request_code = true)
+    def request_two_factor_code_from_phone(phone_id, phone_number, code_length, push_mode = "sms", should_request_code = true)
       if should_request_code
         # Request code
         r = request(:put) do |req|
           req.url("https://idmsa.apple.com/appleauth/auth/verify/phone")
           req.headers['Content-Type'] = 'application/json'
-          req.body = { "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
+          req.body = { "phoneNumber" => { "id" => phone_id }, "mode" => push_mode }.to_json
           update_request_headers(req)
         end
 
@@ -307,7 +319,7 @@ If it is, please open an issue at https://github.com/fastlane/fastlane/issues/ne
 
       code = ask_for_2fa_code("Please enter the #{code_length} digit code you received at #{phone_number}:")
 
-      return { "securityCode" => { "code" => code.to_s }, "phoneNumber" => { "id" => phone_id }, "mode" => "sms" }.to_json
+      return { "securityCode" => { "code" => code.to_s }, "phoneNumber" => { "id" => phone_id }, "mode" => push_mode }.to_json
     end
 
     def store_session

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.168.0
+  version: 2.169.0
 platform: ruby
 authors:
-- Aaron Brager
-- Danielle Tomlinson
-- Matthew Ellis
+- Jimmy Dee
+- Stefan Natchev
 - Joshua Liebowitz
-- Felix Krause
-- Manu Wallner
-- Daniel Jankowski
-- Iulian Onofrei
-- Josh Holtz
-- Jérôme Lacoste
+- Kohki Miki
+- Danielle Tomlinson
 - Fumiya Nakamura
+- Daniel Jankowski
+- Manu Wallner
+- Olivier Halligon
+- Maksym Grebenets
 - Andrew McBurney
+- Luka Mirosevic
+- Felix Krause
+- Iulian Onofrei
+- Matthew Ellis
+- Aaron Brager
 - Max Ott
+- Helmut Januschka
 - Jan Piotrowski
+- Jérôme Lacoste
 - Jorge Revuelta H
-- Stefan Natchev
-- Luka Mirosevic
-- Jimmy Dee
-- Maksym Grebenets
-- Kohki Miki
-- Helmut Januschka
-- Olivier Halligon
+- Josh Holtz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -928,6 +928,8 @@ files:
 - bin/fastlane
 - cert/README.md
 - cert/lib/cert.rb
+- cert/lib/cert/.options.rb.swp
+- cert/lib/cert/.runner.rb.swp
 - cert/lib/cert/commands_generator.rb
 - cert/lib/cert/module.rb
 - cert/lib/cert/options.rb
@@ -1454,6 +1456,7 @@ files:
 - match/lib/assets/MatchfileTemplate.swift
 - match/lib/assets/READMETemplate.md
 - match/lib/match.rb
+- match/lib/match/.options.rb.swp
 - match/lib/match/change_password.rb
 - match/lib/match/commands_generator.rb
 - match/lib/match/encryption.rb
@@ -1563,6 +1566,7 @@ files:
 - sigh/README.md
 - sigh/lib/assets/resign.sh
 - sigh/lib/sigh.rb
+- sigh/lib/sigh/.options.rb.swp
 - sigh/lib/sigh/commands_generator.rb
 - sigh/lib/sigh/download_all.rb
 - sigh/lib/sigh/local_manage.rb
@@ -1619,10 +1623,7 @@ files:
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/file_uploader.rb
 - spaceship/lib/spaceship/connect_api/model.rb
-- spaceship/lib/spaceship/connect_api/models/.app.rb.swp
-- spaceship/lib/spaceship/connect_api/models/.app_screenshot.rb.swp
 - spaceship/lib/spaceship/connect_api/models/.app_store_version_submission.rb.swp
-- spaceship/lib/spaceship/connect_api/models/.build.rb.swp
 - spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb
 - spaceship/lib/spaceship/connect_api/models/app.rb
 - spaceship/lib/spaceship/connect_api/models/app_category.rb