fastlane 2.177.0 → 2.181.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.177.0
+// Generated with fastlane 2.181.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.63]
+// FastlaneRunnerAPIVersion [0.9.68]

data/fastlane/swift/LaneFileProtocol.swift

@@ -17,20 +17,20 @@ public protocol LaneFileProtocol: class {
     func recordLaneDescriptions()
     func beforeAll(with lane: String)
     func afterAll(with lane: String)
-    func onError(currentLane: String, errorInfo: String)
+    func onError(currentLane: String, errorInfo: String, errorClass: String?, errorMessage: String?)
 }
 
 public extension LaneFileProtocol {
     var fastlaneVersion: String { return "" } // Defaults to "" because that means any is fine
     func beforeAll(with _: String) {} // No-op by default
     func afterAll(with _: String) {} // No-op by default
-    func onError(currentLane _: String, errorInfo _: String) {} // No-op by default
     func recordLaneDescriptions() {} // No-op by default
 }
 
 @objcMembers
 open class LaneFile: NSObject, LaneFileProtocol {
     private(set) static var fastfileInstance: LaneFile?
+    private static var onErrorCalled = Set<String>()
 
     private static func trimLaneFromName(laneName: String) -> String {
         return String(laneName.prefix(laneName.count - 4))
@@ -40,6 +40,10 @@ open class LaneFile: NSObject, LaneFileProtocol {
         return String(laneName.prefix(laneName.count - 12))
     }
 
+    public func onError(currentLane: String, errorInfo _: String, errorClass _: String?, errorMessage _: String?) {
+        LaneFile.onErrorCalled.insert(currentLane)
+    }
+
     private static var laneFunctionNames: [String] {
         var lanes: [String] = []
         var methodCount: UInt32 = 0
@@ -137,7 +141,9 @@ open class LaneFile: NSObject, LaneFileProtocol {
         _ = fastfileInstance.perform(NSSelectorFromString(laneMethod), with: parameters)
 
         // Call only on success.
-        fastfileInstance.afterAll(with: lane)
+        if !LaneFile.onErrorCalled.contains(lane) {
+            fastfileInstance.afterAll(with: lane)
+        }
 
         log(message: "Done running lane: \(lane) 🚀")
         return true

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.177.0
+// Generated with fastlane 2.181.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.57]
+// FastlaneRunnerAPIVersion [0.9.62]

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.177.0
+// Generated with fastlane 2.181.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -12,7 +12,7 @@ public protocol PrecheckfileProtocol: class {
     var appIdentifier: String { get }
 
     /// Your Apple ID Username
-    var username: String { get }
+    var username: String? { get }
 
     /// The ID of your App Store Connect team if you're in multiple teams
     var teamId: String? { get }
@@ -40,7 +40,7 @@ public extension PrecheckfileProtocol {
     var apiKeyPath: String? { return nil }
     var apiKey: [String: Any]? { return nil }
     var appIdentifier: String { return "" }
-    var username: String { return "" }
+    var username: String? { return nil }
     var teamId: String? { return nil }
     var teamName: String? { return nil }
     var platform: String { return "ios" }
@@ -52,4 +52,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.56]
+// FastlaneRunnerAPIVersion [0.9.61]

data/fastlane/swift/RubyCommand.swift

@@ -51,7 +51,7 @@ struct RubyCommand: RubyCommandable {
                 if type == .stringClosure {
                     return "{\"name\" : \"\(name)\", \"value\" : \"ignored_for_closure\"\(typeJson)}"
                 } else if let array = someValue as? [String] {
-                    return "{\"name\" : \"\(name)\", \"value\" : \"\(array.joined(separator: ","))\"\(typeJson)}"
+                    return "{\"name\" : \"\(name)\", \"value\" : \(array)\(typeJson)}"
                 } else if let hash = someValue as? [String: Any] {
                     let jsonData = try! JSONSerialization.data(withJSONObject: hash, options: [])
                     let jsonString = String(data: jsonData, encoding: .utf8)!

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.177.0
+// Generated with fastlane 2.181.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -209,6 +209,9 @@ public protocol ScanfileProtocol: class {
     /// Lets xcodebuild use system's scm configuration
     var useSystemScm: Bool { get }
 
+    /// The number of times a test can fail before scan should stop retrying
+    var numberOfRetries: Int { get }
+
     /// Should this step stop the build if the tests fail? Set this to false if you're using trainer
     var failBuild: Bool { get }
 }
@@ -283,9 +286,10 @@ public extension ScanfileProtocol {
     var skipPackageDependenciesResolution: Bool { return false }
     var disablePackageAutomaticUpdates: Bool { return false }
     var useSystemScm: Bool { return false }
+    var numberOfRetries: Int { return 0 }
     var failBuild: Bool { return true }
 }
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.68]
+// FastlaneRunnerAPIVersion [0.9.73]

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.177.0
+// Generated with fastlane 2.181.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.58]
+// FastlaneRunnerAPIVersion [0.9.63]

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.177.0
+// Generated with fastlane 2.181.0

data/fastlane/swift/SnapshotfileProtocol.swift

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

data/fastlane/swift/SocketClient.swift

@@ -302,7 +302,8 @@ extension SocketClient: StreamDelegate {
                 self.closeSession(sendAbort: false)
             }
 
-        case let .failure(failureInformation):
+        case let .failure(failureInformation, failureClass, failureMessage):
+            LaneFile.fastfileInstance?.onError(currentLane: ArgumentProcessor(args: CommandLine.arguments).currentLane, errorInfo: failureInformation.joined(), errorClass: failureClass, errorMessage: failureMessage)
             socketDelegate?.commandExecuted(serverResponse: .serverError) {
                 $0.writeSemaphore.signal()
                 self.handleFailure(message: failureInformation)

data/fastlane/swift/SocketResponse.swift

@@ -13,7 +13,7 @@ import Foundation
 struct SocketResponse {
     enum ResponseType {
         case parseFailure(failureInformation: [String])
-        case failure(failureInformation: [String])
+        case failure(failureInformation: [String], failureClass: String?, failureMessage: String?)
         case readyForNext(returnedObject: String?, closureArgumentValue: String?)
         case clientInitiatedCancel
 
@@ -40,7 +40,9 @@ struct SocketResponse {
                     return
                 }
 
-                self = .failure(failureInformation: failureInformation)
+                let failureClass = statusDictionary["failure_class"] as? String
+                let failureMessage = statusDictionary["failure_message"] as? String
+                self = .failure(failureInformation: failureInformation, failureClass: failureClass, failureMessage: failureMessage)
                 return
             }
             self = .parseFailure(failureInformation: ["Message status: \(status) not a supported status"])

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

@@ -2,28 +2,30 @@
   "entries": {
     "brew": {
       "swiftformat": {
-        "version": "0.47.12",
+        "version": "0.47.13",
         "bottle": {
           "rebuild": 0,
-          "cellar": ":any_skip_relocation",
-          "prefix": "/usr/local",
-          "root_url": "https://homebrew.bintray.com/bottles",
+          "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
             "arm64_big_sur": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.arm64_big_sur.bottle.tar.gz",
-              "sha256": "334b736f7c78b1bc48882f55558e79571be591281462bc91dedea6dac10034be"
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:fdcdb5e94b9c4d66a32d4515ba3d2db4057865f96aefab0e41fdeaf2879f4f89",
+              "sha256": "fdcdb5e94b9c4d66a32d4515ba3d2db4057865f96aefab0e41fdeaf2879f4f89"
             },
             "big_sur": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.big_sur.bottle.tar.gz",
-              "sha256": "b7ba5043f29c548dd05374125faa61dd07690bffe373890cb608609e4a7e2413"
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:cbb7a9803926d8bfaacf5c1a7d4cd07d8fe2255b1885be3ae2ffd8414e4c5292",
+              "sha256": "cbb7a9803926d8bfaacf5c1a7d4cd07d8fe2255b1885be3ae2ffd8414e4c5292"
             },
             "catalina": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.catalina.bottle.tar.gz",
-              "sha256": "030b2e18168f5680c4ee387812b14057c4cb148b6f6800b983b1b298f4af15b1"
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:3a13e9b1f4a63bc03601897944f71dd4e6942788531dc060322d20fc6b36d2fd",
+              "sha256": "3a13e9b1f4a63bc03601897944f71dd4e6942788531dc060322d20fc6b36d2fd"
             },
             "mojave": {
-              "url": "https://homebrew.bintray.com/bottles/swiftformat-0.47.12.mojave.bottle.tar.gz",
-              "sha256": "b3e35821d3094d08eb9f8423ce7d18cb5462bb5b1d02a3156ed1a10f6539709a"
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftformat/blobs/sha256:4e0691f12a5ef3b01eba9f41091b8f3457bc65151bfad057a45e8de9525074cd",
+              "sha256": "4e0691f12a5ef3b01eba9f41091b8f3457bc65151bfad057a45e8de9525074cd"
             }
           }
         }
@@ -33,11 +35,11 @@
   "system": {
     "macos": {
       "catalina": {
-        "HOMEBREW_VERSION": "3.0.4-52-gbc37074",
+        "HOMEBREW_VERSION": "3.1.2-40-g520b811",
         "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "6de8c1455224f0c7949aa103a6cf5721a7dcdde5",
-        "CLT": "11.0.33.12",
-        "Xcode": "12.4",
+        "Homebrew/homebrew-core": "241a44018cba812f495bfef054b29eab4de92686",
+        "CLT": "11.0.0.33.12",
+        "Xcode": "12.2",
         "macOS": "10.15.7"
       },
       "big_sur": {

data/fastlane_core/lib/fastlane_core.rb

@@ -3,39 +3,40 @@ require_relative 'fastlane_core/globals'
 require_relative 'fastlane_core/core_ext/string'
 require_relative 'fastlane_core/core_ext/shellwords'
 
+require_relative 'fastlane_core/analytics/action_completion_context'
+require_relative 'fastlane_core/analytics/action_launch_context'
+require_relative 'fastlane_core/analytics/analytics_event_builder'
+require_relative 'fastlane_core/analytics/analytics_ingester_client'
+require_relative 'fastlane_core/analytics/analytics_session'
+require_relative 'fastlane_core/build_watcher'
+require_relative 'fastlane_core/cert_checker'
+require_relative 'fastlane_core/clipboard'
+require_relative 'fastlane_core/command_executor'
+require_relative 'fastlane_core/configuration/configuration'
+require_relative 'fastlane_core/device_manager'
 require_relative 'fastlane_core/env'
+require_relative 'fastlane_core/fastlane_folder'
+require_relative 'fastlane_core/fastlane_pty'
 require_relative 'fastlane_core/feature/feature'
 require_relative 'fastlane_core/features'
 require_relative 'fastlane_core/helper'
-require_relative 'fastlane_core/configuration/configuration'
-require_relative 'fastlane_core/update_checker/update_checker'
-require_relative 'fastlane_core/languages'
-require_relative 'fastlane_core/cert_checker'
 require_relative 'fastlane_core/ipa_file_analyser'
+require_relative 'fastlane_core/ipa_upload_package_builder'
 require_relative 'fastlane_core/itunes_transporter'
-require_relative 'fastlane_core/provisioning_profile'
+require_relative 'fastlane_core/keychain_importer'
+require_relative 'fastlane_core/languages'
 require_relative 'fastlane_core/pkg_file_analyser'
 require_relative 'fastlane_core/pkg_upload_package_builder'
-require_relative 'fastlane_core/command_executor'
-require_relative 'fastlane_core/ipa_upload_package_builder'
 require_relative 'fastlane_core/print_table'
 require_relative 'fastlane_core/project'
-require_relative 'fastlane_core/device_manager'
-require_relative 'fastlane_core/ui/ui'
-require_relative 'fastlane_core/fastlane_folder'
-require_relative 'fastlane_core/keychain_importer'
+require_relative 'fastlane_core/provisioning_profile'
+require_relative 'fastlane_core/queue_worker'
 require_relative 'fastlane_core/swag'
-require_relative 'fastlane_core/build_watcher'
-require_relative 'fastlane_core/ui/errors'
-require_relative 'fastlane_core/test_parser'
-require_relative 'fastlane_core/analytics/action_completion_context'
-require_relative 'fastlane_core/analytics/action_launch_context'
-require_relative 'fastlane_core/analytics/analytics_event_builder'
-require_relative 'fastlane_core/analytics/analytics_ingester_client'
-require_relative 'fastlane_core/analytics/analytics_session'
 require_relative 'fastlane_core/tag_version'
-require_relative 'fastlane_core/fastlane_pty'
-require_relative 'fastlane_core/queue_worker'
+require_relative 'fastlane_core/test_parser'
+require_relative 'fastlane_core/ui/errors'
+require_relative 'fastlane_core/ui/ui'
+require_relative 'fastlane_core/update_checker/update_checker'
 
 # Third Party code
 require 'colored'

data/fastlane_core/lib/fastlane_core/build_watcher.rb

@@ -4,6 +4,8 @@ require_relative 'ui/ui'
 
 module FastlaneCore
   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)
@@ -23,7 +25,7 @@ module FastlaneCore
 
         showed_info = false
         loop do
-          matched_build = matching_build(watched_app_version: app_version, watched_build_version: build_version, app_id: app_id, platform: platform, select_latest: select_latest)
+          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)
 
           if matched_build.nil? && !showed_info
             UI.important("Read more information on why this build isn't showing up yet - https://github.com/fastlane/fastlane/issues/14997")
@@ -37,6 +39,13 @@ module FastlaneCore
           # having a build resource appear in AppStoreConnect (matched_build) may be enough (i.e. setting a changelog)
           # so here we may choose to skip the full processing of the build if return_when_build_appears is true
           if matched_build && (return_when_build_appears || matched_build.processed?)
+
+            if !app_version.nil? && app_version != app_version_queried
+              UI.important("App version is #{app_version} but build was found while querying #{app_version_queried}")
+              UI.important("This shouldn't be an issue as Apple sees #{app_version} and #{app_version_queried} as equal")
+              UI.important("See docs for more info - https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/20001431-102364")
+            end
+
             if return_spaceship_testflight_build
               return matched_build.to_testflight_build
             else
@@ -60,15 +69,31 @@ module FastlaneCore
         watched_app_version = remove_version_leading_zeros(version: watched_app_version)
         watched_build_version = remove_version_leading_zeros(version: watched_build_version)
 
-        matched_builds = Spaceship::ConnectAPI::Build.all(
-          app_id: app_id,
-          version: watched_app_version,
-          build_number: watched_build_version,
-          platform: platform
-        )
+        # App Store Connect will allow users to upload  X.Y is the same as X.Y.0 and treat them as the same version
+        # However, only the first uploaded version format will be the one that is queryable
+        # This could lead to BuildWatcher never finding X.Y.0 if X.Y was upoaded first as X.Y will only yield results
+        #
+        # This will add an additional request to search for both X.Y and X.Y.0 but
+        # will give preference to the version format specified passed in
+        watched_app_version_alternate = alternate_version(watched_app_version)
+        versions = [watched_app_version, watched_app_version_alternate].compact
+
+        version_matches = versions.map do |version|
+          match = VersionMatches.new
+          match.version = version
+          match.builds = Spaceship::ConnectAPI::Build.all(
+            app_id: app_id,
+            version: version,
+            build_number: watched_build_version,
+            platform: platform
+          )
+
+          match
+        end.flatten
 
         # Raise error if more than 1 build is returned
         # This should never happen but need to inform the user if it does
+        matched_builds = version_matches.map(&:builds).flatten
         if matched_builds.size > 1 && !select_latest
           error_builds = matched_builds.map do |build|
             "#{build.app_version}(#{build.version}) for #{build.platform} - #{build.processing_state}"
@@ -77,9 +102,25 @@ module FastlaneCore
           UI.crash!(error_message)
         end
 
-        matched_build = matched_builds.first
+        version_match = version_matches.reject do |match|
+          match.builds.empty?
+        end.first
+        matched_build = version_match&.builds&.first
+
+        return matched_build, version_match&.version
+      end
+
+      def alternate_version(version)
+        return nil if version.nil?
+
+        version_info = Gem::Version.new(version)
+        if version_info.segments.size == 3 && version_info.segments[2] == 0
+          return version_info.segments[0..1].join(".")
+        elsif version_info.segments.size == 2
+          return "#{version}.0"
+        end
 
-        return matched_build
+        return nil
       end
 
       def report_status(build: nil)

data/fastlane_core/lib/fastlane_core/clipboard.rb

@@ -0,0 +1,20 @@
+require 'fastlane_core'
+require 'open3'
+
+module FastlaneCore
+  class Clipboard
+    def self.copy(content: nil)
+      return UI.crash!("'pbcopy' or 'pbpaste' command not found.") unless is_supported?
+      Open3.popen3('pbcopy') { |input, _, _| input << content }
+    end
+
+    def self.paste
+      return UI.crash!("'pbcopy' or 'pbpaste' command not found.") unless is_supported?
+      return `pbpaste`
+    end
+
+    def self.is_supported?
+      return `which pbcopy`.length > 0 && `which pbpaste`.length > 0
+    end
+  end
+end

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

@@ -208,8 +208,10 @@ module FastlaneCore
     #####################################################
 
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
-    # if 'ask' is true and the value is not present, the user will be prompted to provide a value
-    def fetch(key, ask: true)
+    # if 'ask' is true and the value is not present, the user will be prompted to provide a value if optional
+    # 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)
 
       option = verify_options_key!(key)
@@ -227,7 +229,7 @@ module FastlaneCore
 
       value = option.auto_convert_value(value)
       value = nil if value.nil? && !option.string? # by default boolean flags are false
-      return value unless value.nil? && !option.optional && ask
+      return value unless value.nil? && (!option.optional || force_ask) && ask
 
       # fallback to asking
       if Helper.test? || !UI.interactive?