fastlane 2.219.0 → 2.221.0

data/deliver/lib/deliver/upload_screenshots.rb

@@ -55,7 +55,7 @@ module Deliver
         localizations = version.get_app_store_version_localizations
       end
 
-      upload_screenshots(localizations, screenshots_per_language)
+      upload_screenshots(localizations, screenshots_per_language, options[:screenshot_processing_timeout])
 
       Helper.show_loading_indicator("Sorting screenshots uploaded...")
       sort_screenshots(localizations)
@@ -109,7 +109,7 @@ module Deliver
       end
     end
 
-    def upload_screenshots(localizations, screenshots_per_language, tries: 5)
+    def upload_screenshots(localizations, screenshots_per_language, timeout_seconds, tries: 5)
       tries -= 1
 
       # Upload screenshots
@@ -158,15 +158,16 @@ module Deliver
       UI.verbose('Uploading jobs are completed')
 
       Helper.show_loading_indicator("Waiting for all the screenshots to finish being processed...")
-      states = wait_for_complete(iterator)
+      states = wait_for_complete(iterator, timeout_seconds)
       Helper.hide_loading_indicator
-      retry_upload_screenshots_if_needed(iterator, states, total_number_of_screenshots, tries, localizations, screenshots_per_language)
+      retry_upload_screenshots_if_needed(iterator, states, total_number_of_screenshots, tries, timeout_seconds, localizations, screenshots_per_language)
 
       UI.message("Successfully uploaded all screenshots")
     end
 
     # Verify all screenshots have been processed
-    def wait_for_complete(iterator)
+    def wait_for_complete(iterator, timeout_seconds)
+      start_time = Time.now
       loop do
         states = iterator.each_app_screenshot.map { |_, _, app_screenshot| app_screenshot }.each_with_object({}) do |app_screenshot, hash|
           state = app_screenshot.asset_delivery_state['state']
@@ -177,16 +178,22 @@ module Deliver
         is_processing = states.fetch('UPLOAD_COMPLETE', 0) > 0
         return states unless is_processing
 
+        if Time.now - start_time > timeout_seconds
+          UI.important("Screenshot upload reached the timeout limit of #{timeout_seconds} seconds. We'll now retry uploading the screenshots that couldn't be uploaded in time.")
+          return states
+        end
+
         UI.verbose("There are still incomplete screenshots - #{states}")
         sleep(5)
       end
     end
 
     # Verify all screenshots states on App Store Connect are okay
-    def retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots, tries, localizations, screenshots_per_language)
+    def retry_upload_screenshots_if_needed(iterator, states, number_of_screenshots, tries, timeout_seconds, localizations, screenshots_per_language)
       is_failure = states.fetch("FAILED", 0) > 0
+      is_processing = states.fetch('UPLOAD_COMPLETE', 0) > 0
       is_missing_screenshot = !screenshots_per_language.empty? && !verify_local_screenshots_are_uploaded(iterator, screenshots_per_language)
-      return unless is_failure || is_missing_screenshot
+      return unless is_failure || is_missing_screenshot || is_processing
 
       if tries.zero?
         iterator.each_app_screenshot.select { |_, _, app_screenshot| app_screenshot.error? }.each do |localization, _, app_screenshot|
@@ -200,7 +207,7 @@ module Deliver
         iterator.each_app_screenshot do |_, _, app_screenshot|
           app_screenshot.delete! unless app_screenshot.complete?
         end
-        upload_screenshots(localizations, screenshots_per_language, tries: tries)
+        upload_screenshots(localizations, screenshots_per_language, timeout_seconds, tries: tries)
       end
     end
 

data/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb

@@ -56,7 +56,8 @@ module Fastlane
                                        description: "The key ID"),
           FastlaneCore::ConfigItem.new(key: :issuer_id,
                                        env_name: "APP_STORE_CONNECT_API_KEY_ISSUER_ID",
-                                       description: "The issuer ID"),
+                                       description: "The issuer ID. It can be nil if the key is individual API key",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :key_filepath,
                                        env_name: "APP_STORE_CONNECT_API_KEY_KEY_FILEPATH",
                                        description: "The path to the key p8 file",

data/fastlane/lib/fastlane/actions/appetize.rb

@@ -50,6 +50,10 @@ module Fastlane
 
         response = http.request(req)
 
+        unless response.code.to_i.between?(200, 299)
+          UI.user_error!("Error uploading to Appetize.io: received HTTP #{response.code} with body #{response.body}")
+        end
+
         parse_response(response) # this will raise an exception if something goes wrong
 
         UI.message("App URL: #{Actions.lane_context[SharedValues::APPETIZE_APP_URL]}")

data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md

@@ -509,12 +509,16 @@ Please be careful when using this option and ensure the certificates and profile
 
 ### Manual Decrypt
 
-If you want to manually decrypt a file you can.
+If you want to manually decrypt or encrypt a file, you can use the companion script `match_file`:
 
 ```no-highlight
-openssl aes-256-cbc -k "<password>" -in "<fileYouWantToDecryptPath>" -out "<decryptedFilePath>" -a -d -md [md5|sha256]
+match_file encrypt "<fileYouWantToEncryptPath>" ["<encryptedFilePath>"]
+
+match_file decrypt "<fileYouWantToDecryptPath>" ["<decryptedFilePath>"]
 ```
 
+The password will be asked interactively.
+
 _**Note:** You may need to swap double quotes `"` for single quotes `'` if your match password contains an exclamation mark `!`._
 
 #### Export Distribution Certificate and Private Key as Single .p12 File

data/fastlane/lib/fastlane/actions/git_add.rb

@@ -17,7 +17,16 @@ module Fastlane
           success_message = "Successfully added all files 💾."
         end
 
-        result = Actions.sh("git add #{paths}", log: FastlaneCore::Globals.verbose?).chomp
+        force = params[:force] ? "--force" : nil
+
+        command = [
+          "git",
+          "add",
+          force,
+          paths
+        ].compact
+
+        result = Actions.sh(command.join(" "), log: FastlaneCore::Globals.verbose?).chomp
         UI.success(success_message)
         return result
       end
@@ -47,6 +56,11 @@ module Fastlane
                                        type: Boolean,
                                        default_value: true,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :force,
+                                       description: "Allow adding otherwise ignored files",
+                                       type: Boolean,
+                                       default_value: false,
+                                       optional: true),
           # Deprecated
           FastlaneCore::ConfigItem.new(key: :pathspec,
                                        description: "The pathspec you want to add files from",
@@ -76,7 +90,8 @@ module Fastlane
           'git_add(path: "./Frameworks/*", shell_escape: false)',
           'git_add(path: ["*.h", "*.m"], shell_escape: false)',
           'git_add(path: "./Frameworks/*", shell_escape: false)',
-          'git_add(path: "*.txt", shell_escape: false)'
+          'git_add(path: "*.txt", shell_escape: false)',
+          'git_add(path: "./tmp/.keep", force: true)'
         ]
       end
 

data/fastlane/lib/fastlane/actions/mailgun.rb

@@ -8,8 +8,15 @@ module Fastlane
       end
 
       def self.run(options)
-        Actions.verify_gem!('rest-client')
-        require 'rest-client'
+        Actions.verify_gem!('faraday')
+        Actions.verify_gem!('mime-types')
+        require 'faraday'
+        begin
+          # Use mime/types/columnar if available, for reduced memory usage
+          require 'mime/types/columnar'
+        rescue LoadError
+          require 'mime/types'
+        end
         handle_params_transition(options)
         mailgunit(options)
       end
@@ -101,11 +108,15 @@ module Fastlane
       end
 
       def self.handle_params_transition(options)
-        options[:postmaster] = options[:mailgun_sandbox_postmaster] if options[:mailgun_sandbox_postmaster]
-        puts("\nUsing :mailgun_sandbox_postmaster is deprecated, please change to :postmaster".yellow) if options[:mailgun_sandbox_postmaster]
+        if options[:mailgun_sandbox_postmaster] && !options[:postmaster]
+          options[:postmaster] = options[:mailgun_sandbox_postmaster]
+          puts("\nUsing :mailgun_sandbox_postmaster is deprecated, please change to :postmaster".yellow)
+        end
 
-        options[:apikey] = options[:mailgun_apikey] if options[:mailgun_apikey]
-        puts("\nUsing :mailgun_apikey is deprecated, please change to :apikey".yellow) if options[:mailgun_apikey]
+        if options[:mailgun_apikey] && !options[:apikey]
+          options[:apikey] = options[:mailgun_apikey]
+          puts("\nUsing :mailgun_apikey is deprecated, please change to :apikey".yellow)
+        end
       end
 
       def self.mailgunit(options)
@@ -122,14 +133,25 @@ module Fastlane
 
         unless options[:attachment].nil?
           attachment_filenames = [*options[:attachment]]
-          attachments = attachment_filenames.map { |filename| File.new(filename, 'rb') }
+          attachments = attachment_filenames.map { |filename| Faraday::UploadIO.new(filename, mime_for(filename), filename) }
           params.store(:attachment, attachments)
         end
 
-        RestClient.post("https://api:#{options[:apikey]}@api.mailgun.net/v3/#{sandbox_domain}/messages", params)
+        conn = Faraday.new(url: "https://api:#{options[:apikey]}@api.mailgun.net") do |f|
+          f.request(:multipart)
+          f.request(:url_encoded)
+          f.adapter(:net_http)
+        end
+        response = conn.post("/v3/#{sandbox_domain}/messages", params)
+        UI.user_error!("Failed to send message via Mailgun, response: #{response.status}: #{response.body}.") if response.status != 200
         mail_template(options)
       end
 
+      def self.mime_for(path)
+        mime = MIME::Types.type_for(path)
+        mime.empty? ? 'text/plain' : mime[0].content_type
+      end
+
       def self.mail_template(options)
         hash = {
           author: Actions.git_author_email,

data/fastlane/lib/fastlane/actions/onesignal.rb

@@ -42,14 +42,19 @@ module Fastlane
           payload["apns_p12_password"] = apns_p12_password || ""
         end
 
+        unless params[:fcm_json].nil?
+          data = File.read(params[:fcm_json])
+          fcm_json = Base64.strict_encode64(data)
+          payload["fcm_v1_service_account_json"] = fcm_json
+        end
+
         payload["gcm_key"] = android_token unless android_token.nil?
         payload["android_gcm_sender_id"] = android_gcm_sender_id unless android_gcm_sender_id.nil?
         payload["organization_id"] = organization_id unless organization_id.nil?
 
         # here's the actual lifting - POST or PUT to OneSignal
-
         json_headers = { 'Content-Type' => 'application/json', 'Authorization' => "Basic #{auth_token}" }
-        url = +'https://onesignal.com/api/v1/apps'
+        url = +'https://api.onesignal.com/apps'
         url << '/' + app_id if is_update
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
@@ -122,6 +127,11 @@ module Fastlane
                                        sensitive: true,
                                        optional: true),
 
+          FastlaneCore::ConfigItem.new(key: :fcm_json,
+                                       env_name: "FCM_JSON",
+                                       description: "FCM Service Account JSON File (in .json format)",
+                                       optional: true),
+
           FastlaneCore::ConfigItem.new(key: :apns_p12,
                                        env_name: "APNS_P12",
                                        description: "APNS P12 File (in .p12 format)",
@@ -169,6 +179,7 @@ module Fastlane
             app_name: "Name for OneSignal App",
             android_token: "Your Android GCM key (optional)",
             android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
+            fcm_json: "Path to FCM Service Account JSON File (optional)",
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
             apns_env: "production/sandbox (defaults to production)",
@@ -180,6 +191,7 @@ module Fastlane
             app_name: "New Name for OneSignal App",
             android_token: "Your Android GCM key (optional)",
             android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
+            fcm_json: "Path to FCM Service Account JSON File (optional)",
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
             apns_env: "production/sandbox (defaults to production)",

data/fastlane/lib/fastlane/actions/spm.rb

@@ -11,6 +11,7 @@ module Fastlane
         cmd << "--configuration #{params[:configuration]}" if params[:configuration]
         cmd << "--disable-sandbox" if params[:disable_sandbox]
         cmd << "--verbose" if params[:verbose]
+        cmd << "--very-verbose" if params[:very_verbose]
         if params[:simulator]
           simulator_platform = simulator_platform(simulator: params[:simulator], simulator_arch: params[:simulator_arch])
           simulator_sdk = simulator_sdk(simulator: params[:simulator])
@@ -118,6 +119,12 @@ module Fastlane
                                        description: "Increase verbosity of informational output",
                                        type: Boolean,
                                        default_value: false),
+          FastlaneCore::ConfigItem.new(key: :very_verbose,
+                                       short_option: "-V",
+                                       env_name: "FL_SPM_VERY_VERBOSE",
+                                       description: "Increase verbosity to include debug output",
+                                       type: Boolean,
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :simulator,
                                        env_name: "FL_SPM_SIMULATOR",
                                        description: "Specifies the simulator to pass for Swift Compiler (one of: #{valid_simulators.join(', ')})",

data/fastlane/lib/fastlane/actions/update_project_provisioning.rb

@@ -21,8 +21,9 @@ module Fastlane
         # download certificate
         unless File.exist?(params[:certificate]) && File.size(params[:certificate]) > 0
           UI.message("Downloading root certificate from (#{ROOT_CERTIFICATE_URL}) to path '#{params[:certificate]}'")
+          require 'open-uri'
           File.open(params[:certificate], "w:ASCII-8BIT") do |file|
-            file.write(FastlaneCore::Helper.open_uri(ROOT_CERTIFICATE_URL, "rb").read)
+            file.write(URI.open(ROOT_CERTIFICATE_URL, "rb").read)
           end
         end
 

data/fastlane/lib/fastlane/actions/upload_symbols_to_sentry.rb

@@ -7,8 +7,10 @@ module Fastlane
         UI.important("GitHub: https://github.com/getsentry/fastlane-plugin-sentry")
         UI.important("Installation: fastlane add_plugin sentry")
 
-        Actions.verify_gem!('rest-client')
-        require 'rest-client'
+        UI.user_error!("This plugin is now completely deprecated")
+        # the code below doesn't run anymore
+        # Actions.verify_gem!('rest-client')
+        # require 'rest-client'
 
         # Params - API
         host = params[:api_host]

data/fastlane/lib/fastlane/commands_generator.rb

@@ -249,6 +249,15 @@ module Fastlane
         end
       end
 
+      command :console do |c|
+        c.syntax = 'fastlane console'
+        c.description = 'Opens an interactive developer console'
+        c.action do |args, options|
+          require 'fastlane/console'
+          Fastlane::Console.execute(args, options)
+        end
+      end
+
       command :enable_auto_complete do |c|
         c.syntax = 'fastlane enable_auto_complete'
         c.description = 'Enable tab auto completion'

data/fastlane/lib/fastlane/console.rb

@@ -0,0 +1,24 @@
+require 'irb'
+
+module Fastlane
+  # Opens an interactive developer console
+  class Console
+    def self.execute(args, options)
+      ARGV.clear
+      IRB.setup(nil)
+      @irb = IRB::Irb.new(nil)
+      IRB.conf[:MAIN_CONTEXT] = @irb.context
+      IRB.conf[:PROMPT][:FASTLANE] = IRB.conf[:PROMPT][:SIMPLE].dup
+      IRB.conf[:PROMPT][:FASTLANE][:RETURN] = "%s\n"
+      @irb.context.prompt_mode = :FASTLANE
+      @irb.context.workspace = IRB::WorkSpace.new(binding)
+      trap('INT') do
+        @irb.signal_handle
+      end
+
+      UI.message('Welcome to fastlane interactive!')
+
+      catch(:IRB_EXIT) { @irb.eval_input }
+    end
+  end
+end

data/fastlane/lib/fastlane/helper/sh_helper.rb

@@ -42,7 +42,7 @@ module Fastlane
 
       result = ''
       exit_status = nil
-      if Helper.sh_enabled?
+      if FastlaneCore::Helper.sh_enabled?
         # The argument list is passed directly to Open3.popen2e, which
         # handles the variadic argument list in the same way as Kernel#spawn.
         # (http://ruby-doc.org/core-2.4.2/Kernel.html#method-i-spawn) or

data/fastlane/lib/fastlane/lane_manager_base.rb

@@ -78,15 +78,23 @@ module Fastlane
     end
 
     def self.print_error_line(ex)
-      error_line = ex.backtrace.first
-      return if error_line.nil?
-
-      error_line = error_line.match("Fastfile:(\\d+):")
-      return unless error_line
+      lines = ex.backtrace_locations&.select { |loc| loc.path == 'Fastfile' }&.map(&:lineno)
+      return if lines.nil? || lines.empty?
+
+      fastfile_content = File.read(FastlaneCore::FastlaneFolder.fastfile_path, encoding: "utf-8")
+      if ex.backtrace_locations.first&.path == 'Fastfile'
+        # If exception happened directly in the Fastfile itself (e.g. ArgumentError)
+        UI.error("Error in your Fastfile at line #{lines.first}")
+        UI.content_error(fastfile_content, lines.first)
+        lines.shift
+      end
 
-      line = error_line[1]
-      UI.error("Error in your Fastfile at line #{line}")
-      UI.content_error(File.read(FastlaneCore::FastlaneFolder.fastfile_path, encoding: "utf-8"), line)
+      unless lines.empty?
+        # If exception happened directly in the Fastfile, also print the caller (still from the Fastfile).
+        # If exception happened in _fastlane_ internal code, print the line from the Fastfile that called it
+        UI.error("Called from Fastfile at line #{lines.first}")
+        UI.content_error(fastfile_content, lines.first)
+      end
     end
   end
 end

data/fastlane/lib/fastlane/plugins/plugin_fetcher.rb

@@ -7,13 +7,14 @@ module Fastlane
     # Returns an array of FastlanePlugin objects
     def self.fetch_gems(search_query: nil)
       require 'json'
+      require 'open-uri'
 
       page = 1
       plugins = []
       loop do
         url = "https://rubygems.org/api/v1/search.json?query=#{PluginManager.plugin_prefix}&page=#{page}"
         FastlaneCore::UI.verbose("RubyGems API Request: #{url}")
-        results = JSON.parse(FastlaneCore::Helper.open_uri(url).read)
+        results = JSON.parse(URI.open(url).read)
         break if results.count == 0
 
         plugins += results.collect do |current|

data/fastlane/lib/fastlane/plugins/plugin_info_collector.rb

@@ -66,8 +66,9 @@ module Fastlane
     # Checks if the gem name is still free on RubyGems
     def gem_name_taken?(name)
       require 'json'
+      require 'open-uri'
       url = "https://rubygems.org/api/v1/gems/#{name}.json"
-      response = JSON.parse(FastlaneCore::Helper.open_uri(url).read)
+      response = JSON.parse(URI.open(url).read)
       return !!response['version']
     rescue
       false

data/fastlane/lib/fastlane/plugins/plugin_manager.rb

@@ -156,9 +156,10 @@ module Fastlane
 
     def self.fetch_gem_info_from_rubygems(gem_name)
       require 'json'
+      require 'open-uri'
       url = "https://rubygems.org/api/v1/gems/#{gem_name}.json"
       begin
-        JSON.parse(FastlaneCore::Helper.open_uri(url).read)
+        JSON.parse(URI.open(url).read)
       rescue
         nil
       end

data/fastlane/lib/fastlane/runner.rb

@@ -40,13 +40,13 @@ module Fastlane
       return_val = nil
 
       path_to_use = FastlaneCore::FastlaneFolder.path || Dir.pwd
-      parameters ||= {}
+      parameters ||= {} # by default no parameters
       begin
         Dir.chdir(path_to_use) do # the file is located in the fastlane folder
           execute_flow_block(before_all_blocks, current_platform, current_lane, parameters)
           execute_flow_block(before_each_blocks, current_platform, current_lane, parameters)
 
-          return_val = lane_obj.call(parameters) # by default no parameters
+          return_val = lane_obj.call(parameters)
 
           # after blocks are only called if no exception was raised before
           # Call the platform specific after block and then the general one

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,6 @@
 module Fastlane
-  VERSION = '2.219.0'.freeze
+  VERSION = '2.221.0'.freeze
+  SUMMARY = "The easiest way to build and release mobile apps.".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 = '1.50.2'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -17,4 +17,4 @@ public class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.219.0
+// Generated with fastlane 2.221.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -59,6 +59,9 @@ public protocol DeliverfileProtocol: AnyObject {
     /// Clear all previously uploaded screenshots before uploading the new ones
     var overwriteScreenshots: Bool { get }
 
+    /// Timeout in seconds to wait before considering screenshot processing as failed, used to handle cases where uploads to the App Store are stuck in processing
+    var screenshotProcessingTimeout: Int { get }
+
     /// Sync screenshots with local ones. This is currently beta option so set true to 'FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS' environment variable as well
     var syncScreenshots: Bool { get }
 
@@ -71,6 +74,9 @@ public protocol DeliverfileProtocol: AnyObject {
     /// Rejects the previously submitted build if it's in a state where it's possible
     var rejectIfPossible: Bool { get }
 
+    /// After submitting a new version, App Store Connect takes some time to recognize the new version and we must wait until it's available before attempting to upload metadata for it. There is a mechanism that will check if it's available and retry with an exponential backoff if it's not available yet. This option specifies how many times we should retry before giving up. Setting this to a value below 5 is not recommended and will likely cause failures. Increase this parameter when Apple servers seem to be degraded or slow
+    var versionCheckWaitRetryLimit: Int { get }
+
     /// Should the app be automatically released once it's approved? (Cannot be used together with `auto_release_date`)
     var automaticRelease: Bool? { get }
 
@@ -215,10 +221,12 @@ public extension DeliverfileProtocol {
     var skipAppVersionUpdate: Bool { return false }
     var force: Bool { return false }
     var overwriteScreenshots: Bool { return false }
+    var screenshotProcessingTimeout: Int { return 3600 }
     var syncScreenshots: Bool { return false }
     var submitForReview: Bool { return false }
     var verifyOnly: Bool { return false }
     var rejectIfPossible: Bool { return false }
+    var versionCheckWaitRetryLimit: Int { return 7 }
     var automaticRelease: Bool? { return nil }
     var autoReleaseDate: Int? { return nil }
     var phasedRelease: Bool { return false }
@@ -264,4 +272,4 @@ public extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.123]
+// FastlaneRunnerAPIVersion [0.9.125]