fastlane 2.108.0 → 2.109.0

data/fastlane/lib/fastlane/actions/pod_lib_lint.rb

@@ -17,6 +17,11 @@ module Fastlane
           command << "--sources='#{sources}'"
         end
 
+        if params[:swift_version]
+          swift_version = params[:swift_version]
+          command << "--swift-version=#{swift_version}"
+        end
+
         if params[:allow_warnings]
           command << "--allow-warnings"
         end
@@ -46,25 +51,29 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :use_bundle_exec,
-                                         description: "Use bundle exec when there is a Gemfile presented",
-                                         is_string: false,
-                                         default_value: true),
+                                       description: "Use bundle exec when there is a Gemfile presented",
+                                       is_string: false,
+                                       default_value: true),
           FastlaneCore::ConfigItem.new(key: :verbose,
-                                         description: "Allow output detail in console",
-                                         optional: true,
-                                         is_string: false),
+                                       description: "Allow output detail in console",
+                                       optional: true,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :allow_warnings,
-                                         description: "Allow warnings during pod lint",
-                                         optional: true,
-                                         is_string: false),
+                                       description: "Allow warnings during pod lint",
+                                       optional: true,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :sources,
-                                         description: "The sources of repos you want the pod spec to lint with, separated by commas",
-                                         optional: true,
-                                         is_string: false,
-                                         type: Array,
-                                         verify_block: proc do |value|
-                                           UI.user_error!("Sources must be an array.") unless value.kind_of?(Array)
-                                         end),
+                                       description: "The sources of repos you want the pod spec to lint with, separated by commas",
+                                       optional: true,
+                                       is_string: false,
+                                       type: Array,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Sources must be an array.") unless value.kind_of?(Array)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :swift_version,
+                                       description: "The SWIFT_VERSION that should be used to lint the spec. This takes precedence over a .swift-version file",
+                                       optional: true,
+                                       is_string: true),
           FastlaneCore::ConfigItem.new(key: :use_libraries,
                                        description: "Lint uses static libraries to install the spec",
                                        is_string: false,

data/fastlane/lib/fastlane/actions/pod_push.rb

@@ -87,7 +87,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :swift_version,
                                        description: "The SWIFT_VERSION that should be used to lint the spec. This takes precedence over a .swift-version file",
                                        optional: true,
-                                       is_string: false),
+                                       is_string: true),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        description: "Show more debugging information",
                                        optional: true,

data/fastlane/lib/fastlane/actions/puts.rb

@@ -25,7 +25,7 @@ module Fastlane
         [
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_PUTS_MESSAGE",
-                                       description: "Message to be printed out. Fastlane.swift only",
+                                       description: "Message to be printed out",
                                        optional: true,
                                        is_string: true)
         ]

data/fastlane/lib/fastlane/actions/set_github_release.rb

@@ -218,6 +218,7 @@ module Fastlane
                                        description: "Path to assets to be uploaded with the release",
                                        optional: true,
                                        is_string: false,
+                                       type: Array,
                                        verify_block: proc do |value|
                                          UI.user_error!("upload_assets must be an Array of paths to assets") unless value.kind_of?(Array)
                                        end)

data/fastlane/lib/fastlane/actions/testfairy.rb

@@ -5,7 +5,7 @@ module Fastlane
     end
 
     class TestfairyAction < Action
-      def self.upload_build(upload_url, ipa, options)
+      def self.upload_build(upload_url, ipa, options, timeout)
         require 'faraday'
         require 'faraday_middleware'
 
@@ -29,6 +29,7 @@ module Fastlane
 
         begin
           connection.post do |req|
+            req.options.timeout = timeout
             req.url("/api/upload/")
             req.body = options
           end
@@ -66,9 +67,9 @@ module Fastlane
           end
         end
 
-        # Rejecting key `upload_url` as we don't need it in options
+        # Rejecting key `upload_url` and `timeout` as we don't need it in options
         client_options = Hash[params.values.reject do |key, value|
-          key == :upload_url
+          [:upload_url, :timeout].include?(key)
         end.map do |key, value|
           case key
           when :api_key
@@ -101,7 +102,7 @@ module Fastlane
 
         return path if Helper.test?
 
-        response = self.upload_build(params[:upload_url], path, client_options)
+        response = self.upload_build(params[:upload_url], path, client_options, params[:timeout])
         if parse_response(response)
           UI.success("Build URL: #{Actions.lane_context[SharedValues::TESTFAIRY_BUILD_URL]}")
           UI.success("Build successfully uploaded to TestFairy.")
@@ -221,7 +222,12 @@ module Fastlane
                                        type: Array,
                                        env_name: "FL_TESTFAIRY_OPTIONS",
                                        description: "Array of options (shake,video_only_wifi,anonymous)",
-                                       default_value: [])
+                                       default_value: []),
+          FastlaneCore::ConfigItem.new(key: :timeout,
+                                       env_name: "FL_TESTFAIRY_TIMEOUT",
+                                       description: "Request timeout in seconds",
+                                       type: Integer,
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/fast_file.rb

@@ -56,9 +56,14 @@ module Fastlane
           eval(data, parsing_binding, relative_path) # using eval is ok for this case
           # rubocop:enable Security/Eval
         rescue SyntaxError => ex
-          line = ex.to_s.match(/#{Regexp.escape(relative_path)}:(\d+)/)[1]
-          UI.content_error(data, line)
-          UI.user_error!("Syntax error in your Fastfile on line #{line}: #{ex}")
+          match = ex.to_s.match(/#{Regexp.escape(relative_path)}:(\d+)/)
+          if match
+            line = match[1]
+            UI.content_error(data, line)
+            UI.user_error!("Syntax error in your Fastfile on line #{line}: #{ex}")
+          else
+            UI.user_error!("Syntax error in your Fastfile: #{ex}")
+          end
         end
       end
 
@@ -201,9 +206,7 @@ module Fastlane
     end
 
     def generated_fastfile_id(id)
-      # This value helps us track success/failure metrics for Fastfiles we
-      # generate as part of an automated process.
-      ENV['GENERATED_FASTFILE_ID'] = id
+      UI.important("The `generated_fastfile_id` action was deprecated, you can remove the line from your `Fastfile`")
     end
 
     def import(path = nil)

data/fastlane/lib/fastlane/helper/adb_helper.rb

@@ -18,7 +18,7 @@ module Fastlane
       def initialize(adb_path: nil)
         android_home = ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT'] || ENV['ANDROID_SDK']
         if (adb_path.nil? || adb_path == "adb") && android_home
-          adb_path = Pathname.new(android_home).join("platform-tools/adb").to_s
+          adb_path = File.join(android_home, "platform-tools", "adb")
         end
         self.adb_path = adb_path
       end
@@ -26,7 +26,7 @@ module Fastlane
       # Run a certain action
       def trigger(command: nil, serial: nil)
         android_serial = serial != "" ? "ANDROID_SERIAL=#{serial}" : nil
-        command = [android_serial, adb_path, command].join(" ")
+        command = [android_serial, adb_path.shellescape, command.shellescape].join(" ")
         Action.sh(command)
       end
 
@@ -38,7 +38,7 @@ module Fastlane
       def load_all_devices
         self.devices = []
 
-        command = [adb_path, "devices"].join(" ")
+        command = [adb_path.shellescape, "devices"].join(" ")
         output = Actions.sh(command, log: false)
         output.split("\n").each do |line|
           if (result = line.match(/(.*)\tdevice$/))

data/fastlane/lib/fastlane/helper/crashlytics_helper.rb

@@ -75,13 +75,13 @@ module Fastlane
           command << "-androidRes ."
           command << "-apiKey #{params[:api_token]}"
           command << "-apiSecret #{params[:build_secret]}"
-          command << "-uploadDist '#{File.expand_path(params[:apk_path])}'"
-          command << "-androidManifest '#{xml.path}'"
+          command << "-uploadDist #{File.expand_path(params[:apk_path]).shellescape}"
+          command << "-androidManifest #{xml.path.shellescape}"
 
           # Optional
-          command << "-betaDistributionEmails '#{params[:emails]}'" if params[:emails]
-          command << "-betaDistributionReleaseNotesFilePath '#{File.expand_path(params[:notes_path])}'" if params[:notes_path]
-          command << "-betaDistributionGroupAliases '#{params[:groups]}'" if params[:groups]
+          command << "-betaDistributionEmails #{params[:emails].shellescape}" if params[:emails]
+          command << "-betaDistributionReleaseNotesFilePath #{File.expand_path(params[:notes_path]).shellescape}" if params[:notes_path]
+          command << "-betaDistributionGroupAliases #{params[:groups].shellescape}" if params[:groups]
           command << "-betaDistributionNotifications #{(params[:notifications] ? 'true' : 'false')}"
 
           return command

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.108.0'.freeze
+  VERSION = '2.109.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane/swift/Fastlane.swift

@@ -71,13 +71,15 @@ func appaloosa(binary: String,
                                                                                            RubyCommand.Argument(name: "description", value: description)])
   _ = runner.executeCommand(command)
 }
-func appetize(apiToken: String,
+func appetize(apiHost: String = "api.appetize.io",
+              apiToken: String,
               url: String? = nil,
               platform: String = "ios",
               path: String? = nil,
               publicKey: String? = nil,
               note: String? = nil) {
-  let command = RubyCommand(commandID: "", methodName: "appetize", className: nil, args: [RubyCommand.Argument(name: "api_token", value: apiToken),
+  let command = RubyCommand(commandID: "", methodName: "appetize", className: nil, args: [RubyCommand.Argument(name: "api_host", value: apiHost),
+                                                                                          RubyCommand.Argument(name: "api_token", value: apiToken),
                                                                                           RubyCommand.Argument(name: "url", value: url),
                                                                                           RubyCommand.Argument(name: "platform", value: platform),
                                                                                           RubyCommand.Argument(name: "path", value: path),
@@ -2399,6 +2401,7 @@ func podLibLint(useBundleExec: Bool = true,
                 verbose: String? = nil,
                 allowWarnings: String? = nil,
                 sources: [String]? = nil,
+                swiftVersion: String? = nil,
                 useLibraries: Bool = false,
                 failFast: Bool = false,
                 `private`: Bool = false,
@@ -2407,6 +2410,7 @@ func podLibLint(useBundleExec: Bool = true,
                                                                                               RubyCommand.Argument(name: "verbose", value: verbose),
                                                                                               RubyCommand.Argument(name: "allow_warnings", value: allowWarnings),
                                                                                               RubyCommand.Argument(name: "sources", value: sources),
+                                                                                              RubyCommand.Argument(name: "swift_version", value: swiftVersion),
                                                                                               RubyCommand.Argument(name: "use_libraries", value: useLibraries),
                                                                                               RubyCommand.Argument(name: "fail_fast", value: failFast),
                                                                                               RubyCommand.Argument(name: "private", value: `private`),
@@ -2962,7 +2966,7 @@ func setChangelog(appIdentifier: String,
                                          description: String? = nil,
                                          isDraft: Bool = false,
                                          isPrerelease: Bool = false,
-                                         uploadAssets: String? = nil) -> [String : String] {
+                                         uploadAssets: [String]? = nil) -> [String : String] {
   let command = RubyCommand(commandID: "", methodName: "set_github_release", className: nil, args: [RubyCommand.Argument(name: "repository_name", value: repositoryName),
                                                                                                     RubyCommand.Argument(name: "server_url", value: serverUrl),
                                                                                                     RubyCommand.Argument(name: "api_token", value: apiToken),
@@ -3338,6 +3342,7 @@ func supply(packageName: String,
             apk: String? = nil,
             apkPaths: [String]? = nil,
             aab: String? = nil,
+            aabPaths: [String]? = nil,
             skipUploadApk: Bool = false,
             skipUploadAab: Bool = false,
             skipUploadMetadata: Bool = false,
@@ -3362,6 +3367,7 @@ func supply(packageName: String,
                                                                                         RubyCommand.Argument(name: "apk", value: apk),
                                                                                         RubyCommand.Argument(name: "apk_paths", value: apkPaths),
                                                                                         RubyCommand.Argument(name: "aab", value: aab),
+                                                                                        RubyCommand.Argument(name: "aab_paths", value: aabPaths),
                                                                                         RubyCommand.Argument(name: "skip_upload_apk", value: skipUploadApk),
                                                                                         RubyCommand.Argument(name: "skip_upload_aab", value: skipUploadAab),
                                                                                         RubyCommand.Argument(name: "skip_upload_metadata", value: skipUploadMetadata),
@@ -3463,7 +3469,8 @@ func testfairy(apiKey: String,
                comment: String = "No comment provided",
                autoUpdate: String = "off",
                notify: String = "off",
-               options: [String] = []) {
+               options: [String] = [],
+               timeout: Int? = nil) {
   let command = RubyCommand(commandID: "", methodName: "testfairy", className: nil, args: [RubyCommand.Argument(name: "api_key", value: apiKey),
                                                                                            RubyCommand.Argument(name: "ipa", value: ipa),
                                                                                            RubyCommand.Argument(name: "apk", value: apk),
@@ -3474,7 +3481,8 @@ func testfairy(apiKey: String,
                                                                                            RubyCommand.Argument(name: "comment", value: comment),
                                                                                            RubyCommand.Argument(name: "auto_update", value: autoUpdate),
                                                                                            RubyCommand.Argument(name: "notify", value: notify),
-                                                                                           RubyCommand.Argument(name: "options", value: options)])
+                                                                                           RubyCommand.Argument(name: "options", value: options),
+                                                                                           RubyCommand.Argument(name: "timeout", value: timeout)])
   _ = runner.executeCommand(command)
 }
 func testflight(username: String,
@@ -3830,6 +3838,7 @@ func uploadToPlayStore(packageName: String,
                        apk: String? = nil,
                        apkPaths: [String]? = nil,
                        aab: String? = nil,
+                       aabPaths: [String]? = nil,
                        skipUploadApk: Bool = false,
                        skipUploadAab: Bool = false,
                        skipUploadMetadata: Bool = false,
@@ -3854,6 +3863,7 @@ func uploadToPlayStore(packageName: String,
                                                                                                       RubyCommand.Argument(name: "apk", value: apk),
                                                                                                       RubyCommand.Argument(name: "apk_paths", value: apkPaths),
                                                                                                       RubyCommand.Argument(name: "aab", value: aab),
+                                                                                                      RubyCommand.Argument(name: "aab_paths", value: aabPaths),
                                                                                                       RubyCommand.Argument(name: "skip_upload_apk", value: skipUploadApk),
                                                                                                       RubyCommand.Argument(name: "skip_upload_aab", value: skipUploadAab),
                                                                                                       RubyCommand.Argument(name: "skip_upload_metadata", value: skipUploadMetadata),
@@ -4151,4 +4161,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.33]
+// FastlaneRunnerAPIVersion [0.9.34]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.108.0
+// Generated with fastlane 2.109.0

data/fastlane_core/lib/fastlane_core.rb

@@ -22,7 +22,6 @@ 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/tool_collector'
 require_relative 'fastlane_core/fastlane_folder'
 require_relative 'fastlane_core/keychain_importer'
 require_relative 'fastlane_core/swag'

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

@@ -211,7 +211,7 @@ module FastlaneCore
     # if 'ask' is true and the value is not present, the user will be prompted to provide a value
     # rubocop:disable Metrics/PerceivedComplexity
     def fetch(key, ask: true)
-      UI.user_error!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
+      UI.crash!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
 
       option = verify_options_key!(key)
 
@@ -263,7 +263,7 @@ module FastlaneCore
     # Overwrites or sets a new value for a given key
     # @param key [Symbol] Must be a symbol
     def set(key, value)
-      UI.user_error!("Key '#{key}' must be a symbol. Example :#{key}.") unless key.kind_of?(Symbol)
+      UI.crash!("Key '#{key}' must be a symbol. Example :#{key}.") unless key.kind_of?(Symbol)
       option = option_for_key(key)
 
       unless option

data/fastlane_core/lib/fastlane_core/project.rb

@@ -448,20 +448,18 @@ module FastlaneCore
       if self.workspace?
         # Find the xcodeproj file, as the information isn't included in the workspace file
         # We have a reference to the workspace, let's find the xcodeproj file
-        # For some reason the `plist` gem can't parse the content file
-        # so we'll use a regex to find all group references
-
-        workspace_data_path = File.join(path, "contents.xcworkspacedata")
-        workspace_data = File.read(workspace_data_path)
-        @_project_paths = workspace_data.scan(/\"group:(.*)\"/).collect do |current_match|
-          # It's a relative path from the workspace file
-          File.join(File.expand_path("..", path), current_match.first)
-        end.select do |current_match|
+        # Use Xcodeproj gem here to
+        # * parse the contents.xcworkspacedata XML file
+        # * handle different types (group:, container: etc.) of file references and their paths
+        # for details see https://github.com/CocoaPods/Xcodeproj/blob/e0287156d426ba588c9234bb2a4c824149889860/lib/xcodeproj/workspace/file_reference.rb```
+
+        workspace_dir_path = File.expand_path("..", self.path)
+        file_references_paths = workspace.file_references.map { |fr| fr.absolute_path(workspace_dir_path) }
+        @_project_paths = file_references_paths.select do |current_match|
           # Xcode workspaces can contain loose files now, so let's filter non-xcodeproj files.
           current_match.end_with?(".xcodeproj")
         end.reject do |current_match|
-          # We're not interested in a `Pods` project, as it doesn't contain any relevant
-          # information about code signing
+          # We're not interested in a `Pods` project, as it doesn't contain any relevant information about code signing
           current_match.end_with?("Pods/Pods.xcodeproj")
         end
 

data/match/lib/match/encryption.rb

@@ -3,15 +3,39 @@ require_relative 'encryption/openssl'
 
 module Match
   module Encryption
-    # Returns the class to be used for a given `storage_mode`
-    def self.for_storage_mode(storage_mode, params)
-      if storage_mode == "git"
-        params[:keychain_name] = params[:git_url]
-        return Encryption::OpenSSL.configure(params)
-      elsif storage_mode == "google_cloud"
-        # return Encryption::GoogleCloudKMS.configure(params)
-      else
-        UI.user_error!("Invalid storage mode '#{storage_mode}'")
+    class << self
+      def backends
+        @backends ||= {
+          "git" => lambda { |params|
+            # OpenSSL is storage agnostic so this maps git_url
+            # to keychain_name for the name of the keychain entry
+            params[:keychain_name] = params[:git_url]
+            return Encryption::OpenSSL.configure(params)
+          }
+        }
+      end
+
+      def register_backend(type: nil, encryption_class: nil, &configurator)
+        UI.user_error!("No type specified for encryption backend") if type.nil?
+
+        normalized_name = type.to_s
+        UI.message("Replacing Match::Encryption backend for type '#{normalized_name}'") if backends.include?(normalized_name)
+
+        if configurator
+          @backends[normalized_name] = configurator
+        elsif encryption_class
+          @backends[normalized_name] = ->(params) { return encryption_class.configure(params) }
+        else
+          UI.user_error!("Specify either a `encryption_class` or a configuration block when registering a encryption backend")
+        end
+      end
+
+      # Returns the class to be used for a given `storage_mode`
+      def for_storage_mode(storage_mode, params)
+        configurator = backends[storage_mode.to_s]
+        return configurator.call(params) if configurator
+
+        UI.user_error!("No encryption backend for storage mode '#{storage_mode}'")
       end
     end
   end