fastlane 2.182.0 → 2.184.1

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.182.0
+// Generated with fastlane 2.184.1

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.69]
+// FastlaneRunnerAPIVersion [0.9.74]

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.182.0
+// Generated with fastlane 2.184.1

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.63]
+// FastlaneRunnerAPIVersion [0.9.68]

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.182.0
+// Generated with fastlane 2.184.1

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.62]
+// FastlaneRunnerAPIVersion [0.9.67]

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.182.0
+// Generated with fastlane 2.184.1

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.74]
+// FastlaneRunnerAPIVersion [0.9.79]

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.182.0
+// Generated with fastlane 2.184.1

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.64]
+// FastlaneRunnerAPIVersion [0.9.69]

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.182.0
+// Generated with fastlane 2.184.1

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.58]
+// FastlaneRunnerAPIVersion [0.9.63]

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

@@ -2,30 +2,30 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.48.0",
+        "version": "0.48.3",
         "bottle": {
           "rebuild": 0,
           "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
             "arm64_big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:bca1fc4ac0264ff950c14eb3c72c0fa321baa99fb60178266da19b680d67147b",
-              "sha256": "bca1fc4ac0264ff950c14eb3c72c0fa321baa99fb60178266da19b680d67147b"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:45f0d1d25e117bba4d30e3077c3445052bf4bb5238419a0747d851adbede06d1",
+              "sha256": "45f0d1d25e117bba4d30e3077c3445052bf4bb5238419a0747d851adbede06d1"
             },
             "big_sur": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:fa1af90b137298039eab4205a9a8733fbba4f9e5cf0322197674ce6f1582f0e0",
-              "sha256": "fa1af90b137298039eab4205a9a8733fbba4f9e5cf0322197674ce6f1582f0e0"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:fbc54de6090d46e3b63592e7d304871aced14d43d2b4b23dcef1bc997b4dd8a0",
+              "sha256": "fbc54de6090d46e3b63592e7d304871aced14d43d2b4b23dcef1bc997b4dd8a0"
             },
             "catalina": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:35bc84d95bcd8e5066669c6383f999507b1d1a8a08f3aae321f89e2944ea39e2",
-              "sha256": "35bc84d95bcd8e5066669c6383f999507b1d1a8a08f3aae321f89e2944ea39e2"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:10aa177bc5b37892d4ec96e61051cf8ff5d12c6deeaef8cd276a0b2589c14848",
+              "sha256": "10aa177bc5b37892d4ec96e61051cf8ff5d12c6deeaef8cd276a0b2589c14848"
             },
             "mojave": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:b5274f542e17907e806ca6e6d1ca630a538bc2e98330329bca5a1568d76a7267",
-              "sha256": "b5274f542e17907e806ca6e6d1ca630a538bc2e98330329bca5a1568d76a7267"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4be65d16c76254414d779ebc8b7e0722d728657a21f6eeef29c7a15842dbc741",
+              "sha256": "4be65d16c76254414d779ebc8b7e0722d728657a21f6eeef29c7a15842dbc741"
             }
           }
         }
@@ -35,9 +35,9 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "3.1.5-69-g70c8693",
+        "HOMEBREW_VERSION": "3.1.9-58-g7ae9cc3",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "d4dcdecc3c226aed326813f67043b728342eec96",
+        "Homebrew/homebrew-core": "6b2b455850b3abf29ab327a17292e1c4eb7abd15",
         "CLT": "11.0.0.33.12",
         "Xcode": "12.4",
         "macOS": "10.15.7"

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -3,12 +3,15 @@ require 'spaceship/connect_api'
 require_relative 'ui/ui'
 
 module FastlaneCore
+  class BuildWatcherError < StandardError
+  end
+
   class BuildWatcher
     VersionMatches = Struct.new(:version, :builds)
 
     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.")
@@ -23,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)
@@ -53,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
@@ -78,6 +90,16 @@ module FastlaneCore
         watched_app_version_alternate = alternate_version(watched_app_version)
         versions = [watched_app_version, watched_app_version_alternate].compact
 
+        if versions.empty?
+          if select_latest
+            message = watched_build_version.nil? ? "Searching for the latest build" : "Searching for the latest build with build number: #{watched_build_version}"
+            UI.message(message)
+            versions = [nil]
+          else
+            raise BuildWatcherError.new, "There is no app version to watch"
+          end
+        end
+
         version_matches = versions.map do |version|
           match = VersionMatches.new
           match.version = version
@@ -98,8 +120,8 @@ module FastlaneCore
           error_builds = matched_builds.map do |build|
             "#{build.app_version}(#{build.version}) for #{build.platform} - #{build.processing_state}"
           end.join("\n")
-          error_message = "FastlaneCore::BuildWatcher found more than 1 matching build: \n#{error_builds}"
-          UI.crash!(error_message)
+          error_message = "Found more than 1 matching build: \n#{error_builds}"
+          raise BuildWatcherError.new, error_message
         end
 
         version_match = version_matches.reject do |match|
@@ -132,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)
@@ -272,11 +274,11 @@ module FastlaneCore
         rescue JSON::ParserError
         end
       elsif data_type != String
-        # Special treatment if the user specified true, false or YES, NO
+        # Special treatment if the user specified true, false, on, off or YES, NO
         # There is no boolean type, so we just do it here
-        if %w(YES yes true TRUE).include?(value)
+        if %w(yes YES true TRUE on ON).include?(value)
           return true
-        elsif %w(NO no false FALSE).include?(value)
+        elsif %w(no NO false FALSE off OFF).include?(value)
           return false
         end
       end

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/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -118,7 +118,7 @@ module FastlaneCore
           discover_devices(child_item, device_types, discovered_device_udids)
         end
 
-        is_supported_device = device_types.any? { |device_type| usb_item['_name'] == device_type }
+        is_supported_device = device_types.any?(usb_item['_name'])
         serial_num = usb_item['serial_num'] || ''
         has_serial_number = serial_num.length == 40 || serial_num.length == 24
 

data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb

@@ -145,7 +145,10 @@ module FastlaneCore
     def password(message)
       verify_interactive!(message)
 
-      ask("#{format_string}#{message.to_s.yellow}") { |q| q.echo = "*" }
+      ask("#{format_string}#{message.to_s.yellow}") do |q|
+        q.whitespace = :chomp
+        q.echo = "*"
+      end
     end
 
     private

data/frameit/lib/frameit/config_parser.rb

@@ -121,12 +121,12 @@ module Frameit
 
     def self.supported_color?(value)
       return false if value.nil?
-      Color.all_colors.any? { |c| c == value }
+      Color.all_colors.any?(value)
     end
 
     def self.supported_platform?(value)
       return false if value.nil?
-      Platform.all_platforms.any? { |c| c == value }
+      Platform.all_platforms.any?(value)
     end
 
     def self.supported_device?(value)

data/frameit/lib/frameit/frame_downloader.rb

@@ -71,8 +71,9 @@ module Frameit
     def download_file(path, txt: "file")
       require 'uri'
       require 'excon'
+      require 'addressable/uri'
 
-      url = File.join(HOST_URL, Frameit.frames_version, URI.escape(path))
+      url = File.join(HOST_URL, Frameit.frames_version, Addressable::URI.encode(path))
       UI.message("Downloading #{txt} from '#{url}' ...")
       body = Excon.get(url).body
       raise body if body.include?("<Error>")

data/gym/lib/gym/code_signing_mapping.rb

@@ -17,8 +17,8 @@ module Gym
       final_mapping = (primary_mapping || {}).dup # for verbose output at the end of the method
       secondary_mapping ||= self.detect_project_profile_mapping # default to Xcode project
 
-      final_mapping = Hash[final_mapping.map { |k, v| [k.to_sym, v] }]
-      secondary_mapping = Hash[secondary_mapping.map { |k, v| [k.to_sym, v] }]
+      final_mapping = final_mapping.transform_keys(&:to_sym)
+      secondary_mapping = secondary_mapping.transform_keys(&:to_sym)
 
       # Now it's time to merge the (potentially) existing mapping
       #   (e.g. coming from `provisioningProfiles` of the `export_options` or from previous match calls)

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -4,6 +4,7 @@
 # because of
 # `incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string) (Encoding::CompatibilityError)`
 
+require 'addressable/uri'
 require 'tempfile'
 require 'xcodeproj'
 
@@ -154,12 +155,12 @@ module Gym
 
       def normalize_export_options(hash)
         # Normalize some values
-        hash[:onDemandResourcesAssetPacksBaseURL] = URI.escape(hash[:onDemandResourcesAssetPacksBaseURL]) if hash[:onDemandResourcesAssetPacksBaseURL]
+        hash[:onDemandResourcesAssetPacksBaseURL] = Addressable::URI.encode(hash[:onDemandResourcesAssetPacksBaseURL]) if hash[:onDemandResourcesAssetPacksBaseURL]
         if hash[:manifest]
-          hash[:manifest][:appURL] = URI.escape(hash[:manifest][:appURL]) if hash[:manifest][:appURL]
-          hash[:manifest][:displayImageURL] = URI.escape(hash[:manifest][:displayImageURL]) if hash[:manifest][:displayImageURL]
-          hash[:manifest][:fullSizeImageURL] = URI.escape(hash[:manifest][:fullSizeImageURL]) if hash[:manifest][:fullSizeImageURL]
-          hash[:manifest][:assetPackManifestURL] = URI.escape(hash[:manifest][:assetPackManifestURL]) if hash[:manifest][:assetPackManifestURL]
+          hash[:manifest][:appURL] = Addressable::URI.encode(hash[:manifest][:appURL]) if hash[:manifest][:appURL]
+          hash[:manifest][:displayImageURL] = Addressable::URI.encode(hash[:manifest][:displayImageURL]) if hash[:manifest][:displayImageURL]
+          hash[:manifest][:fullSizeImageURL] = Addressable::URI.encode(hash[:manifest][:fullSizeImageURL]) if hash[:manifest][:fullSizeImageURL]
+          hash[:manifest][:assetPackManifestURL] = Addressable::URI.encode(hash[:manifest][:assetPackManifestURL]) if hash[:manifest][:assetPackManifestURL]
         end
         hash
       end

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