fastlane 2.183.2 → 2.184.0

data/fastlane/swift/Gymfile.swift

@@ -17,4 +17,4 @@ public class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.183.2
+// Generated with fastlane 2.184.0

data/fastlane/swift/GymfileProtocol.swift

@@ -196,4 +196,4 @@ public extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.72]
+// FastlaneRunnerAPIVersion [0.9.73]

data/fastlane/swift/Matchfile.swift

@@ -17,4 +17,4 @@ public class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.183.2
+// Generated with fastlane 2.184.0

data/fastlane/swift/MatchfileProtocol.swift

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

data/fastlane/swift/OptionalConfigValue.swift

@@ -23,38 +23,6 @@ public enum OptionalConfigValue<T> {
     }
 }
 
-extension Optional: ExpressibleByIntegerLiteral where Wrapped: ExpressibleByIntegerLiteral {
-    public typealias IntegerLiteralType = Wrapped.IntegerLiteralType
-
-    public init(integerLiteral value: Wrapped.IntegerLiteralType) {
-        self = .some(.init(integerLiteral: value))
-    }
-}
-
-extension Optional: ExpressibleByUnicodeScalarLiteral where Wrapped: ExpressibleByUnicodeScalarLiteral {
-    public typealias UnicodeScalarLiteralType = Wrapped.UnicodeScalarLiteralType
-
-    public init(unicodeScalarLiteral value: Wrapped.UnicodeScalarLiteralType) {
-        self = .some(.init(unicodeScalarLiteral: value))
-    }
-}
-
-extension Optional: ExpressibleByExtendedGraphemeClusterLiteral where Wrapped: ExpressibleByStringLiteral {
-    public typealias ExtendedGraphemeClusterLiteralType = Wrapped.ExtendedGraphemeClusterLiteralType
-
-    public init(extendedGraphemeClusterLiteral value: Wrapped.ExtendedGraphemeClusterLiteralType) {
-        self = .some(.init(extendedGraphemeClusterLiteral: value))
-    }
-}
-
-extension Optional: ExpressibleByStringLiteral where Wrapped: ExpressibleByStringLiteral {
-    public typealias StringLiteralType = Wrapped.StringLiteralType
-
-    public init(stringLiteral value: Wrapped.StringLiteralType) {
-        self = .some(.init(stringLiteral: value))
-    }
-}
-
 extension OptionalConfigValue: ExpressibleByUnicodeScalarLiteral where T == String? {
     public typealias UnicodeScalarLiteralType = String
 
@@ -79,6 +47,8 @@ extension OptionalConfigValue: ExpressibleByStringLiteral where T == String? {
     }
 }
 
+extension OptionalConfigValue: ExpressibleByStringInterpolation where T == String? {}
+
 extension OptionalConfigValue: ExpressibleByNilLiteral {
     public init(nilLiteral _: ()) {
         self = .nil

data/fastlane/swift/Precheckfile.swift

@@ -17,4 +17,4 @@ public class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.183.2
+// Generated with fastlane 2.184.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -52,4 +52,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.65]
+// FastlaneRunnerAPIVersion [0.9.66]

data/fastlane/swift/Scanfile.swift

@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.183.2
+// Generated with fastlane 2.184.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -292,4 +292,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.77]
+// FastlaneRunnerAPIVersion [0.9.78]

data/fastlane/swift/Screengrabfile.swift

@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.183.2
+// Generated with fastlane 2.184.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.67]
+// FastlaneRunnerAPIVersion [0.9.68]

data/fastlane/swift/Snapshotfile.swift

@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.183.2
+// Generated with fastlane 2.184.0

data/fastlane/swift/SnapshotfileProtocol.swift

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

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

@@ -35,9 +35,9 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "3.1.7-78-g1810ff9",
+        "HOMEBREW_VERSION": "3.1.8-62-gc278da1",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "b9b47e504affc468e88daaa53658ee807aa706eb",
+        "Homebrew/homebrew-core": "decc1c2cbcdbaf86c19d95899ebecea59c8ce3ac",
         "CLT": "11.0.0.33.12",
         "Xcode": "12.4",
         "macOS": "10.15.7"

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -11,7 +11,7 @@ module FastlaneCore
 
     class << self
       # @return The build we waited for. This method will always return a build
-      def wait_for_build_processing_to_be_complete(app_id: nil, platform: nil, train_version: nil, app_version: nil, build_version: nil, poll_interval: 10, strict_build_watch: false, return_when_build_appears: false, return_spaceship_testflight_build: true, select_latest: false)
+      def wait_for_build_processing_to_be_complete(app_id: nil, platform: nil, train_version: nil, app_version: nil, build_version: nil, poll_interval: 10, timeout_duration: nil, strict_build_watch: false, return_when_build_appears: false, return_spaceship_testflight_build: true, select_latest: false)
         # Warn about train_version being removed in the future
         if train_version
           UI.deprecated(":train_version is no longer a used argument on FastlaneCore::BuildWatcher. Please use :app_version instead.")
@@ -26,6 +26,12 @@ module FastlaneCore
         platform = Spaceship::ConnectAPI::Platform.map(platform) if platform
         UI.message("Waiting for processing on... app_id: #{app_id}, app_version: #{app_version}, build_version: #{build_version}, platform: #{platform}")
 
+        build_watching_start_time = Time.new
+        unless timeout_duration.nil?
+          end_time = build_watching_start_time + timeout_duration
+          UI.message("Will timeout watching build after #{timeout_duration} seconds around #{end_time}...")
+        end
+
         showed_info = false
         loop do
           matched_build, app_version_queried = matching_build(watched_app_version: app_version, watched_build_version: build_version, app_id: app_id, platform: platform, select_latest: select_latest)
@@ -56,6 +62,9 @@ module FastlaneCore
             end
           end
 
+          # Before next poll, force stop build watching, if we exceeded the 'timeout_duration' waiting time
+          force_stop_build_watching_if_required(start_time: build_watching_start_time, timeout_duration: timeout_duration)
+
           sleep(poll_interval)
         end
       end
@@ -145,6 +154,20 @@ module FastlaneCore
           UI.message("Waiting for the build to show up in the build list - this may take a few minutes (check your email for processing issues if this continues)")
         end
       end
+
+      def force_stop_build_watching_if_required(start_time: nil, timeout_duration: nil)
+        return if start_time.nil? || timeout_duration.nil? # keep watching build for App Store Connect processing
+
+        current_time = Time.new
+        end_time = start_time + timeout_duration
+        pending_duration = end_time - current_time
+
+        if current_time > end_time
+          UI.crash!("FastlaneCore::BuildWatcher exceeded the '#{timeout_duration.to_i}' seconds, Stopping now!")
+        else
+          UI.verbose("Will timeout watching build after pending #{pending_duration.to_i} seconds around #{end_time}...")
+        end
+      end
     end
   end
 end

data/fastlane_core/lib/fastlane_core/configuration/commander_generator.rb

@@ -30,6 +30,11 @@ module FastlaneCore
           type = option.is_string ? String : nil
         end
 
+        # OptionParser doesn't like symbol but a symbol and string can be easily cast with `to_sym` and `to_s`
+        if type == Symbol
+          type = String
+        end
+
         # Boolean is a fastlane thing, it's either TrueClass, or FalseClass, but we won't know
         # that until runtime, so nil is the best we get
         if type == Fastlane::Boolean

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -262,6 +262,8 @@ module FastlaneCore
         return value.to_i if value.to_i.to_s == value.to_s
       elsif data_type == Float
         return value.to_f if value.to_f.to_s == value.to_s
+      elsif data_type == Symbol
+        return value.to_sym if value.to_sym.to_s == value.to_s
       elsif allow_shell_conversion
         return value.shelljoin if value.kind_of?(Array)
         return value.map { |k, v| "#{k.to_s.shellescape}=#{v.shellescape}" }.join(' ') if value.kind_of?(Hash)

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -212,7 +212,7 @@ module FastlaneCore
     # if 'force_ask' is true, the option is not required to be optional to ask
     # rubocop:disable Metrics/PerceivedComplexity
     def fetch(key, ask: true, force_ask: false)
-      UI.crash!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
+      UI.crash!("Key '#{key}' must be a symbol. Example :#{key}") unless key.kind_of?(Symbol)
 
       option = verify_options_key!(key)
 

data/match/lib/match/importer.rb

@@ -93,15 +93,17 @@ module Match
         dest_cert_path = File.join(output_dir_certs, "#{cert_name}.cer")
         dest_p12_path = File.join(output_dir_certs, "#{p12_name}.p12")
       else
-        # Need to get the cert id by comparing base64 encoded cert content with certificate content from the API responses
-        token = api_token(params)
-        if token
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
           UI.message("Creating authorization token for App Store Connect API")
-          Spaceship::ConnectAPI.token = token
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
         else
           UI.message("Login to App Store Connect (#{params[:username]})")
           Spaceship::ConnectAPI.login(params[:username], use_portal: true, use_tunes: false, portal_team_id: params[:team_id], team_name: params[:team_name])
         end
+
+        # Need to get the cert id by comparing base64 encoded cert content with certificate content from the API responses
         certs = Spaceship::ConnectAPI::Certificate.all(filter: { certificateType: certificate_type })
 
         # Base64 encode contents to find match from API to find a cert ID
@@ -147,11 +149,5 @@ module Match
       UI.user_error!("#{file_description} does not exist at path: #{file_path}") unless !file_path.nil? || optional
       file_path
     end
-
-    def api_token(params)
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**params[:api_key]) if params[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-      return @api_token
-    end
   end
 end

data/match/lib/match/migrate.rb

@@ -91,9 +91,8 @@ module Match
     end
 
     def api_token(params)
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**params[:api_key]) if params[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-      return @api_token
+      api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path])
+      return api_token
     end
 
     def ensure_parameters_are_valid(params)

data/match/lib/match/nuke.rb

@@ -102,9 +102,11 @@ module Match
     end
 
     def spaceship_login
-      if api_token
+      if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
         UI.message("Creating authorization token for App Store Connect API")
         Spaceship::ConnectAPI.token = api_token
+      elsif !Spaceship::ConnectAPI.token.nil?
+        UI.message("Using existing authorization token for App Store Connect API")
       else
         Spaceship::ConnectAPI.login(params[:username], use_portal: true, use_tunes: false, portal_team_id: params[:team_id], team_name: params[:team_name])
       end
@@ -120,12 +122,6 @@ module Match
       end
     end
 
-    def api_token
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**params[:api_key]) if params[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-      return @api_token
-    end
-
     # Collect all the certs/profiles
     def prepare_list
       UI.message("Fetching certificates and profiles...")

data/match/lib/match/runner.rb

@@ -139,9 +139,8 @@ module Match
     # rubocop:enable Metrics/PerceivedComplexity
 
     def api_token(params)
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**params[:api_key]) if params[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-      return @api_token
+      api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path])
+      return api_token
     end
 
     # Used when creating a new certificate or profile

data/match/lib/match/spaceship_ensure.rb

@@ -13,6 +13,9 @@ module Match
         UI.message("Creating authorization token for App Store Connect API")
         Spaceship::ConnectAPI.token = api_token
         self.team_id = team_id
+      elsif !Spaceship::ConnectAPI.token.nil?
+        UI.message("Using existing authorization token for App Store Connect API")
+        self.team_id = team_id
       else
         # We'll try to manually fetch the password
         # to tell the user that a password is optional

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

@@ -123,8 +123,8 @@ module Match
       end
 
       def api_token
-        api_token ||= Spaceship::ConnectAPI::Token.create(**self.api_key) if self.api_key
-        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(self.api_key_path) if self.api_key_path
+        api_token = Spaceship::ConnectAPI::Token.from(hash: self.api_key, filepath: self.api_key_path)
+        api_token ||= Spaceship::ConnectAPI.token
         return api_token
       end
 

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

@@ -196,8 +196,8 @@ module Match
       end
 
       def api_token
-        api_token ||= Spaceship::ConnectAPI::Token.create(**self.api_key) if self.api_key
-        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(self.api_key_path) if self.api_key_path
+        api_token = Spaceship::ConnectAPI::Token.from(hash: self.api_key, filepath: self.api_key_path)
+        api_token ||= Spaceship::ConnectAPI.token
         return api_token
       end
     end

data/pilot/lib/pilot/build_manager.rb

@@ -105,6 +105,7 @@ module Pilot
         app_version: app_version,
         build_version: app_build,
         poll_interval: config[:wait_processing_interval],
+        timeout_duration: config[:wait_processing_timeout_duration],
         return_when_build_appears: return_when_build_appears,
         return_spaceship_testflight_build: false
       )
@@ -365,6 +366,7 @@ module Pilot
     # If there are fewer than two teams, don't infer the provider.
     def transporter_for_selected_team(options)
       # Use JWT auth
+      api_token = Spaceship::ConnectAPI.token
       unless api_token.nil?
         api_token.refresh! if api_token.expired?
         return FastlaneCore::ItunesTransporter.new(nil, nil, false, nil, api_token.text)

data/pilot/lib/pilot/manager.rb

@@ -17,9 +17,11 @@ module Pilot
     end
 
     def login
-      if api_token
+      if (api_token = Spaceship::ConnectAPI::Token.from(hash: config[:api_key], filepath: config[:api_key_path]))
         UI.message("Creating authorization token for App Store Connect API")
         Spaceship::ConnectAPI.token = api_token
+      elsif !Spaceship::ConnectAPI.token.nil?
+        UI.message("Using existing authorization token for App Store Connect API")
       else
         config[:username] ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
@@ -33,12 +35,6 @@ module Pilot
       end
     end
 
-    def api_token
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**config[:api_key]) if config[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(config[:api_key_path]) if config[:api_key_path]
-      return @api_token
-    end
-
     # The app object we're currently using
     def app
       @app_id ||= fetch_app_id

data/pilot/lib/pilot/options.rb

@@ -286,6 +286,14 @@ module Pilot
                                      verify_block: proc do |value|
                                        UI.user_error!("Please enter a valid positive number of seconds") unless value.to_i > 0
                                      end),
+        FastlaneCore::ConfigItem.new(key: :wait_processing_timeout_duration,
+                                     env_name: "PILOT_WAIT_PROCESSING_TIMEOUT_DURATION",
+                                     description: "Timeout duration in seconds to wait for App Store Connect processing. If set, after exceeding timeout duration, this will `force stop` to wait for App Store Connect processing and exit with exception",
+                                     optional: true,
+                                     type: Integer,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Please enter a valid positive number of seconds") unless value.to_i > 0
+                                     end),
         FastlaneCore::ConfigItem.new(key: :wait_for_uploaded_build,
                                      env_name: "PILOT_WAIT_FOR_UPLOADED_BUILD",
                                      deprecated: "No longer needed with the transition over to the App Store Connect API",

data/precheck/lib/precheck/runner.rb

@@ -18,6 +18,14 @@ module Precheck
                                          hide_keys: [:output_path],
                                              title: "Summary for precheck #{Fastlane::VERSION}")
 
+      api_token = if (token = Spaceship::ConnectAPI::Token.from(hash: Precheck.config[:api_key], filepath: Precheck.config[:api_key_path]))
+                    UI.message("Creating authorization token for App Store Connect API")
+                    token
+                  elsif (token = Spaceship::ConnectAPI.token)
+                    UI.message("Using existing authorization token for App Store Connect API")
+                    token
+                  end
+
       if api_token
 
         # As of 2020-09-15, App Store Connect API does not have support for IAPs yet
@@ -29,7 +37,6 @@ module Precheck
           UI.user_error!("Precheck cannot check In-app purchases with the App Store Connect API Key (yet). Exclude In-app purchases from precheck, disable the precheck step in your build step, or use Apple ID login")
         end
 
-        UI.message("Creating authorization token for App Store Connect API")
         Spaceship::ConnectAPI.token = api_token
       elsif Spaceship::Tunes.client.nil?
         # Username is now optional since addition of App Store Connect API Key
@@ -75,12 +82,6 @@ module Precheck
       return true
     end
 
-    def api_token
-      @api_token ||= Spaceship::ConnectAPI::Token.create(**Precheck.config[:api_key]) if Precheck.config[:api_key]
-      @api_token ||= Spaceship::ConnectAPI::Token.from_json_file(Precheck.config[:api_key_path]) if Precheck.config[:api_key_path]
-      return @api_token
-    end
-
     def print_items_not_checked(processor_result: nil)
       names = processor_result.items_not_checked.map(&:friendly_name)
       UI.message("😶  Metadata fields not checked by any rule: #{names.join(', ')}".yellow) if names.length > 0