fastlane 2.173.0 → 2.194.0

data/deliver/lib/deliver/sync_screenshots.rb

@@ -0,0 +1,200 @@
+require 'fastlane_core'
+require 'digest/md5'
+require 'naturally'
+
+require_relative 'app_screenshot'
+require_relative 'app_screenshot_iterator'
+require_relative 'loader'
+require_relative 'screenshot_comparable'
+
+module Deliver
+  class SyncScreenshots
+    DeleteScreenshotJob = Struct.new(:app_screenshot, :locale)
+    UploadScreenshotJob = Struct.new(:app_screenshot_set, :path)
+
+    class UploadResult
+      attr_reader :asset_delivery_state_counts, :failing_screenshots
+
+      def initialize(asset_delivery_state_counts:, failing_screenshots:)
+        @asset_delivery_state_counts = asset_delivery_state_counts
+        @failing_screenshots = failing_screenshots
+      end
+
+      def processing?
+        @asset_delivery_state_counts.fetch('UPLOAD_COMPLETE', 0) > 0
+      end
+
+      def screenshot_count
+        @asset_delivery_state_counts.fetch('COMPLETE', 0)
+      end
+    end
+
+    def initialize(app:, platform:)
+      @app = app
+      @platform = platform
+    end
+
+    def sync_from_path(screenshots_path)
+      # load local screenshots
+      screenshots = Deliver::Loader.load_app_screenshots(screenshots_path, true)
+      sync(screenshots)
+    end
+
+    def sync(screenshots)
+      UI.important('This is currently a beta feature in fastlane. This may cause some errors on your environment.')
+
+      unless FastlaneCore::Feature.enabled?('FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS')
+        UI.user_error!('Please set a value to "FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS" environment variable ' \
+                       'if you acknowleage the risk and try this out.')
+      end
+
+      UI.important("Will begin uploading snapshots for '#{version.version_string}' on App Store Connect")
+
+      # enable localizations that will be used
+      screenshots_per_language = screenshots.group_by(&:language)
+      enable_localizations(screenshots_per_language.keys)
+
+      # create iterator
+      localizations = fetch_localizations
+      iterator = Deliver::AppScreenshotIterator.new(localizations)
+
+      # sync local screenshots with remote settings by deleting and uploading
+      UI.message("Starting with the upload of screenshots...")
+      replace_screenshots(iterator, screenshots)
+
+      # ensure screenshots within screenshot sets are sorted in right order
+      sort_screenshots(iterator)
+
+      UI.important('Screenshots are synced successfully!')
+    end
+
+    def enable_localizations(locales)
+      localizations = fetch_localizations
+      locales_to_enable = locales - localizations.map(&:locale)
+      Helper.show_loading_indicator("Activating localizations for #{locales_to_enable.join(', ')}...")
+      locales_to_enable.each do |locale|
+        version.create_app_store_version_localization(attributes: { locale: locale })
+      end
+      Helper.hide_loading_indicator
+    end
+
+    def replace_screenshots(iterator, screenshots, retries = 3)
+      # delete and upload screenshots to get App Store Connect in sync
+      do_replace_screenshots(iterator, screenshots, create_delete_worker, create_upload_worker)
+
+      # wait for screenshots to be processed on App Store Connect end and
+      # ensure the number of uploaded screenshots matches the one in local
+      result = wait_for_complete(iterator)
+      return if !result.processing? && result.screenshot_count == screenshots.count
+
+      if retries.zero?
+        UI.crash!("Retried uploading screenshots #{retries} but there are still failures of processing screenshots." \
+                  "Check App Store Connect console to work out which screenshots processed unsuccessfully.")
+      end
+
+      # retry with deleting failing screenshots
+      result.failing_screenshots.each(&:delete!)
+      replace_screenshots(iterator, screenshots, retries - 1)
+    end
+
+    # This is a testable method that focuses on figuring out what to update
+    def do_replace_screenshots(iterator, screenshots, delete_worker, upload_worker)
+      remote_screenshots = iterator.each_app_screenshot.map do |localization, app_screenshot_set, app_screenshot|
+        ScreenshotComparable.create_from_remote(app_screenshot: app_screenshot, locale: localization.locale)
+      end
+
+      local_screenshots = iterator.each_local_screenshot(screenshots.group_by(&:language)).map do |localization, app_screenshot_set, screenshot, index|
+        if index >= 10
+          UI.user_error!("Found #{localization.locale} has more than 10 screenshots for #{app_screenshot_set.screenshot_display_type}. "\
+                         "Make sure containts only necessary screenshots.")
+        end
+        ScreenshotComparable.create_from_local(screenshot: screenshot, app_screenshot_set: app_screenshot_set)
+      end
+
+      # Thanks to `Array#-` API and `ScreenshotComparable`, working out diffs between local screenshot directory and App Store Connect
+      # is as easy as you can see below. The former one finds what is missing in local and the latter one is visa versa.
+      screenshots_to_delete = remote_screenshots - local_screenshots
+      screenshots_to_upload = local_screenshots - remote_screenshots
+
+      delete_jobs = screenshots_to_delete.map { |x| DeleteScreenshotJob.new(x.context[:app_screenshot], x.context[:locale]) }
+      delete_worker.batch_enqueue(delete_jobs)
+      delete_worker.start
+
+      upload_jobs = screenshots_to_upload.map { |x| UploadScreenshotJob.new(x.context[:app_screenshot_set], x.context[:screenshot].path) }
+      upload_worker.batch_enqueue(upload_jobs)
+      upload_worker.start
+    end
+
+    def wait_for_complete(iterator)
+      retry_count = 0
+      Helper.show_loading_indicator("Waiting for all the screenshots processed...")
+      loop do
+        failing_screenshots = []
+        state_counts = iterator.each_app_screenshot.map { |_, _, app_screenshot| app_screenshot }.each_with_object({}) do |app_screenshot, hash|
+          state = app_screenshot.asset_delivery_state['state']
+          hash[state] ||= 0
+          hash[state] += 1
+          failing_screenshots << app_screenshot if app_screenshot.error?
+        end
+
+        result = UploadResult.new(asset_delivery_state_counts: state_counts, failing_screenshots: failing_screenshots)
+        return result unless result.processing?
+
+        # sleep with exponential backoff
+        interval = 5 + (2**retry_count)
+        UI.message("There are still incomplete screenshots. Will check the states again in #{interval} secs - #{state_counts}")
+        sleep(interval)
+        retry_count += 1
+      end
+    ensure
+      Helper.hide_loading_indicator
+    end
+
+    def sort_screenshots(iterator)
+      Helper.show_loading_indicator("Sorting screenshots uploaded...")
+      sort_worker = create_sort_worker
+      sort_worker.batch_enqueue(iterator.each_app_screenshot_set.to_a.map { |_, set| set })
+      sort_worker.start
+      Helper.hide_loading_indicator
+    end
+
+    private
+
+    def version
+      @version ||= @app.get_edit_app_store_version(platform: @platform)
+    end
+
+    def fetch_localizations
+      version.get_app_store_version_localizations
+    end
+
+    def create_upload_worker
+      FastlaneCore::QueueWorker.new do |job|
+        UI.verbose("Uploading '#{job.path}'...")
+        start_time = Time.now
+        job.app_screenshot_set.upload_screenshot(path: job.path, wait_for_processing: false)
+        UI.message("Uploaded '#{job.path}'... (#{Time.now - start_time} secs)")
+      end
+    end
+
+    def create_delete_worker
+      FastlaneCore::QueueWorker.new do |job|
+        target = "id=#{job.app_screenshot.id} #{job.locale} #{job.app_screenshot.file_name}"
+        UI.verbose("Deleting '#{target}'")
+        start_time = Time.now
+        job.app_screenshot.delete!
+        UI.message("Deleted '#{target}' -  (#{Time.now - start_time} secs)")
+      end
+    end
+
+    def create_sort_worker
+      FastlaneCore::QueueWorker.new do |app_screenshot_set|
+        original_ids = app_screenshot_set.app_screenshots.map(&:id)
+        sorted_ids = Naturally.sort(app_screenshot_set.app_screenshots, by: :file_name).map(&:id)
+        if original_ids != sorted_ids
+          app_screenshot_set.reorder_screenshots(app_screenshot_ids: sorted_ids)
+        end
+      end
+    end
+  end
+end

data/deliver/lib/deliver/upload_metadata.rb

@@ -1,7 +1,7 @@
+require 'fastlane_core'
 require 'spaceship'
 
 require_relative 'module'
-require_relative 'queue_worker'
 
 module Deliver
   # upload description, rating, etc.
@@ -82,7 +82,7 @@ module Deliver
     def upload(options)
       return if options[:skip_metadata]
 
-      app = options[:app]
+      app = Deliver.cache[:app]
 
       platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
 
@@ -97,7 +97,7 @@ module Deliver
         localised_options = LOCALISED_LIVE_VALUES
         non_localised_options = NON_LOCALISED_LIVE_VALUES
 
-        if v.nil?
+        if version.nil?
           UI.message("Couldn't find live version, editing the current version on App Store Connect instead")
           version = fetch_edit_app_store_version(app, platform)
           # we don't want to update the localised_options and non_localised_options
@@ -200,7 +200,7 @@ module Deliver
       sleep(1)
 
       # Update app store version localizations
-      store_version_worker = Deliver::QueueWorker.new do |app_store_version_localization|
+      store_version_worker = FastlaneCore::QueueWorker.new do |app_store_version_localization|
         attributes = localized_version_attributes_by_locale[app_store_version_localization.locale]
         if attributes
           UI.message("Uploading metadata to App Store Connect for localized version '#{app_store_version_localization.locale}'")
@@ -211,7 +211,7 @@ module Deliver
       store_version_worker.start
 
       # Update app info localizations
-      app_info_worker = Deliver::QueueWorker.new do |app_info_localization|
+      app_info_worker = FastlaneCore::QueueWorker.new do |app_info_localization|
         attributes = localized_info_attributes_by_locale[app_info_localization.locale]
         if attributes
           UI.message("Uploading metadata to App Store Connect for localized info '#{app_info_localization.locale}'")
@@ -342,7 +342,7 @@ module Deliver
 
       set_review_information(version, options)
       set_review_attachment_file(version, options)
-      set_app_rating(version, options)
+      set_app_rating(app_info, options)
     end
 
     # rubocop:enable Metrics/PerceivedComplexity
@@ -592,9 +592,10 @@ module Deliver
     end
 
     def set_review_information(version, options)
-      return unless options[:app_review_information]
       info = options[:app_review_information]
-      info = info.collect { |k, v| [k.to_sym, v] }.to_h
+      return if info.nil? || info.empty?
+
+      info = info.transform_keys(&:to_sym)
       UI.user_error!("`app_review_information` must be a hash", show_github_issues: true) unless info.kind_of?(Hash)
 
       attributes = {}
@@ -641,7 +642,7 @@ module Deliver
       end
     end
 
-    def set_app_rating(version, options)
+    def set_app_rating(app_info, options)
       return unless options[:app_rating_config_path]
 
       require 'json'
@@ -674,9 +675,23 @@ module Deliver
         has_mapped_values = true
         UI.deprecated("Age rating '#{k}' from iTunesConnect has been deprecated. Please replace with '#{v}'")
       end
-      UI.deprecated("You can find more info at https://docs.fastlane.tools/actions/deliver/#reference") if has_mapped_values
 
-      age_rating_declaration = version.fetch_age_rating_declaration
+      # Handle App Store Connect deprecation/migrations of keys/values if possible
+      attributes, deprecation_messages, errors = Spaceship::ConnectAPI::AgeRatingDeclaration.map_deprecation_if_possible(attributes)
+      deprecation_messages.each do |message|
+        UI.deprecated(message)
+      end
+
+      unless errors.empty?
+        errors.each do |error|
+          UI.error(error)
+        end
+        UI.user_error!("There are Age Rating deprecation errors that cannot be solved automatically... Please apply any fixes and try again")
+      end
+
+      UI.deprecated("You can find more info at https://docs.fastlane.tools/actions/deliver/#reference") if has_mapped_values || !deprecation_messages.empty?
+
+      age_rating_declaration = app_info.fetch_age_rating_declaration
       age_rating_declaration.update(attributes: attributes)
     end
   end

data/deliver/lib/deliver/upload_price_tier.rb

@@ -9,7 +9,7 @@ module Deliver
 
       price_tier = options[:price_tier].to_s
 
-      app = options[:app]
+      app = Deliver.cache[:app]
 
       attributes = {}
       territory_ids = []

data/deliver/lib/deliver/upload_screenshots.rb

@@ -1,23 +1,23 @@
+require 'fastlane_core'
 require 'spaceship/tunes/tunes'
 require 'digest/md5'
 
 require_relative 'app_screenshot'
 require_relative 'module'
 require_relative 'loader'
-require_relative 'queue_worker'
 require_relative 'app_screenshot_iterator'
 
 module Deliver
   # upload screenshots to App Store Connect
   class UploadScreenshots
-    DeleteScreenshotJob = Struct.new(:app_screenshot, :localization, :app_screenshot_set)
+    DeleteScreenshotSetJob = Struct.new(:app_screenshot_set, :localization)
     UploadScreenshotJob = Struct.new(:app_screenshot_set, :path)
 
     def upload(options, screenshots)
       return if options[:skip_screenshots]
       return if options[:edit_live]
 
-      app = options[:app]
+      app = Deliver.cache[:app]
 
       platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
       version = app.get_edit_app_store_version(platform: platform)
@@ -67,12 +67,12 @@ module Deliver
     def delete_screenshots(localizations, screenshots_per_language, tries: 5)
       tries -= 1
 
-      worker = QueueWorker.new do |job|
+      worker = FastlaneCore::QueueWorker.new do |job|
         start_time = Time.now
-        target = "#{job.localization.locale} #{job.app_screenshot_set.screenshot_display_type} #{job.app_screenshot.id}"
+        target = "#{job.localization.locale} #{job.app_screenshot_set.screenshot_display_type}"
         begin
           UI.verbose("Deleting '#{target}'")
-          job.app_screenshot.delete!
+          job.app_screenshot_set.delete!
           UI.message("Deleted '#{target}' -  (#{Time.now - start_time} secs)")
         rescue => error
           UI.error("Failed to delete screenshot #{target} - (#{Time.now - start_time} secs)")
@@ -81,12 +81,12 @@ module Deliver
       end
 
       iterator = AppScreenshotIterator.new(localizations)
-      iterator.each_app_screenshot do |localization, app_screenshot_set, app_screenshot|
+      iterator.each_app_screenshot_set do |localization, app_screenshot_set|
         # Only delete screenshots if trying to upload
         next unless screenshots_per_language.keys.include?(localization.locale)
 
-        UI.verbose("Queued delete sceeenshot job for #{localization.locale} #{app_screenshot_set.screenshot_display_type} #{app_screenshot.id}")
-        worker.enqueue(DeleteScreenshotJob.new(app_screenshot, localization, app_screenshot_set))
+        UI.verbose("Queued delete sceeenshot set job for #{localization.locale} #{app_screenshot_set.screenshot_display_type}")
+        worker.enqueue(DeleteScreenshotSetJob.new(app_screenshot_set, localization))
       end
 
       worker.start
@@ -113,7 +113,7 @@ module Deliver
       tries -= 1
 
       # Upload screenshots
-      worker = QueueWorker.new do |job|
+      worker = FastlaneCore::QueueWorker.new do |job|
         begin
           UI.verbose("Uploading '#{job.path}'...")
           start_time = Time.now
@@ -231,12 +231,13 @@ module Deliver
     end
 
     def sort_screenshots(localizations)
+      require 'naturally'
       iterator = AppScreenshotIterator.new(localizations)
 
       # Re-order screenshots within app_screenshot_set
-      worker = QueueWorker.new do |app_screenshot_set|
+      worker = FastlaneCore::QueueWorker.new do |app_screenshot_set|
         original_ids = app_screenshot_set.app_screenshots.map(&:id)
-        sorted_ids = app_screenshot_set.app_screenshots.sort_by(&:file_name).map(&:id)
+        sorted_ids = Naturally.sort(app_screenshot_set.app_screenshots, by: :file_name).map(&:id)
         if original_ids != sorted_ids
           app_screenshot_set.reorder_screenshots(app_screenshot_ids: sorted_ids)
         end

data/fastlane/lib/assets/completions/completion.bash

@@ -4,6 +4,7 @@ _fastlane_complete() {
   COMPREPLY=()
   local word="${COMP_WORDS[COMP_CWORD]}"
   local completions=""
+  local file
 
   # look for Fastfile either in this directory or fastlane/ then grab the lane names
   if [[ -e "Fastfile" ]]; then
@@ -12,10 +13,12 @@ _fastlane_complete() {
     file="fastlane/Fastfile"
   elif [[ -e ".fastlane/Fastfile" ]]; then
     file=".fastlane/Fastfile"
+  else
+    return 1
   fi
 
   # parse 'beta' out of 'lane :beta do', etc
-  completions=$(grep "^\s*lane \:" $file | awk -F ':' '{print $2}' | awk -F ' ' '{print $1}')
+  completions="$(sed -En 's/^[ 	]*lane +:([^ 	]+).*$/\1/p' "$file")"
   completions="$completions update_fastlane"
 
   COMPREPLY=( $(compgen -W "$completions" -- "$word") )

data/fastlane/lib/assets/completions/completion.zsh

@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 _fastlane_complete() {
-  local word completions
+  local word completions file
   word="$1"
 
   # look for Fastfile either in this directory or fastlane/ then grab the lane names
@@ -11,13 +11,14 @@ _fastlane_complete() {
     file="fastlane/Fastfile"
   elif [[ -e ".fastlane/Fastfile" ]] then
     file=".fastlane/Fastfile"
+  else
+    return 1
   fi
 
   # parse 'beta' out of 'lane :beta do', etc
-  completions=`cat $file | grep "^\s*lane \:" | awk -F ':' '{print $2}' | awk -F ' ' '{print $1}'`
-  completions="$completions
-update_fastlane"
+  completions="$(sed -En 's/^[ 	]*lane +:([^ 	]+).*$/\1/p' "$file")"
+  completions="$completions update_fastlane"
 
-  reply=( "${(ps:\n:)completions}" )
+  reply=( "${=completions}" )
 }
 

data/fastlane/lib/fastlane/actions/actions_helper.rb

@@ -87,13 +87,13 @@ module Fastlane
     end
 
     # returns a list of official integrations
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def self.get_all_official_actions
       Dir[File.expand_path('*.rb', File.dirname(__FILE__))].collect do |file|
         File.basename(file).gsub('.rb', '').to_sym
       end
     end
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
 
     # Returns the class ref to the action based on the action name
     # Returns nil if the action is not available

data/fastlane/lib/fastlane/actions/adb.rb

@@ -27,18 +27,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :serial,
                                        env_name: "FL_ANDROID_SERIAL",
                                        description: "Android serial of the device to use for this command",
-                                       is_string: true,
                                        default_value: ""),
           FastlaneCore::ConfigItem.new(key: :command,
                                        env_name: "FL_ADB_COMMAND",
                                        description: "All commands you want to pass to the adb command, e.g. `kill-server`",
-                                       optional: true,
-                                       is_string: true),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :adb_path,
                                        env_name: "FL_ADB_PATH",
                                        optional: true,
-                                       description: "The path to your `adb` binary (can be left blank if the ANDROID_SDK_ROOT environment variable is set)",
-                                       is_string: true,
+                                       description: "The path to your `adb` binary (can be left blank if the ANDROID_SDK_ROOT, ANDROID_HOME or ANDROID_SDK environment variable is set)",
                                        default_value: "adb")
         ]
       end

data/fastlane/lib/fastlane/actions/adb_devices.rb

@@ -27,7 +27,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :adb_path,
                                        env_name: "FL_ADB_PATH",
                                        description: "The path to your `adb` binary (can be left blank if the ANDROID_SDK_ROOT environment variable is set)",
-                                       is_string: true,
                                        optional: true,
                                        default_value: "adb")
         ]

data/fastlane/lib/fastlane/actions/add_git_tag.rb

@@ -63,7 +63,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :includes_lane,
                                        env_name: "FL_GIT_TAG_INCLUDES_LANE",
                                        description: "Whether the current lane should be included in the tag and message composition, e.g. '<grouping>/<lane>/<prefix><build_number><postfix>'",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :prefix,
                                        env_name: "FL_GIT_TAG_PREFIX",
@@ -78,7 +78,7 @@ module Fastlane
                                        description: "The build number. Defaults to the result of increment_build_number if you\'re using it",
                                        default_value: Actions.lane_context[Actions::SharedValues::BUILD_NUMBER],
                                        default_value_dynamic: true,
-                                       is_string: false,
+                                       skip_type_validation: true, # skipping validation because we both allow integer and string
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_GIT_TAG_MESSAGE",
@@ -94,13 +94,13 @@ module Fastlane
                                        env_name: "FL_GIT_TAG_FORCE",
                                        description: "Force adding the tag",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :sign,
                                        env_name: "FL_GIT_TAG_SIGN",
                                        description: "Make a GPG-signed tag, using the default e-mail address's key",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false)
         ]
       end

data/fastlane/lib/fastlane/actions/app_store_build_number.rb

@@ -27,11 +27,16 @@ module Fastlane
 
       def self.get_build_number(params)
         # Prompts select team if multiple teams and none specified
-        token = self.api_token(params)
-        if token
-          UI.message("Using App Store Connect API token...")
-          Spaceship::ConnectAPI.token = token
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
+          UI.message("Creating authorization token for App Store Connect API")
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
         else
+          # Username is now optional since addition of App Store Connect API Key
+          # Force asking for username to prompt user if not already set
+          params.fetch(:username, force_ask: true)
+
           UI.message("Login to App Store Connect (#{params[:username]})")
           Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true, tunes_team_id: params[:team_id], team_name: params[:team_name])
           UI.message("Login successful")
@@ -98,13 +103,6 @@ module Fastlane
         versions.map(&:to_s).sort_by { |v| Gem::Version.new(v) }
       end
 
-      def self.api_token(params)
-        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
-        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
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -118,7 +116,7 @@ module Fastlane
         user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
         [
           FastlaneCore::ConfigItem.new(key: :api_key_path,
-                                       env_name: "APPSTORE_BUILD_NUMBER_API_KEY_PATH",
+                                       env_names: ["APPSTORE_BUILD_NUMBER_API_KEY_PATH", "APP_STORE_CONNECT_API_KEY_PATH"],
                                        description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                        optional: true,
                                        conflicting_options: [:api_key],
@@ -126,16 +124,18 @@ module Fastlane
                                          UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_key,
-                                       env_name: "APPSTORE_BUILD_NUMBER_API_KEY",
-                                       description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
+                                       env_names: ["APPSTORE_BUILD_NUMBER_API_KEY", "APP_STORE_CONNECT_API_KEY"],
+                                       description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-hash-option)",
                                        type: Hash,
+                                       default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+                                       default_value_dynamic: true,
                                        optional: true,
                                        sensitive: true,
                                        conflicting_options: [:api_key_path]),
           FastlaneCore::ConfigItem.new(key: :initial_build_number,
                                        env_name: "INITIAL_BUILD_NUMBER",
                                        description: "sets the build number to given value if no build is in current train",
-                                       is_string: false),
+                                       skip_type_validation: true), # as we also allow integers, which we convert to strings anyway
           FastlaneCore::ConfigItem.new(key: :app_identifier,
                                        short_option: "-a",
                                        env_name: "FASTLANE_APP_IDENTIFIER",
@@ -147,6 +147,7 @@ module Fastlane
                                        short_option: "-u",
                                        env_name: "ITUNESCONNECT_USER",
                                        description: "Your Apple ID Username",
+                                       optional: true,
                                        default_value: user,
                                        default_value_dynamic: true),
           FastlaneCore::ConfigItem.new(key: :team_id,
@@ -154,7 +155,7 @@ module Fastlane
                                        env_name: "APPSTORE_BUILD_NUMBER_LIVE_TEAM_ID",
                                        description: "The ID of your App Store Connect team if you're in multiple teams",
                                        optional: true,
-                                       is_string: false, # as we also allow integers, which we convert to strings anyway
+                                       skip_type_validation: true, # as we also allow integers, which we convert to strings anyway
                                        code_gen_sensitive: true,
                                        default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id),
                                        default_value_dynamic: true,
@@ -166,7 +167,7 @@ module Fastlane
                                        env_name: "APPSTORE_BUILD_NUMBER_LIVE",
                                        description: "Query the live version (ready-for-sale)",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: true),
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "LATEST_VERSION",
@@ -177,7 +178,6 @@ module Fastlane
                                        env_name: "APPSTORE_PLATFORM",
                                        description: "The platform to use (optional)",
                                        optional: true,
-                                       is_string: true,
                                        default_value: "ios",
                                        verify_block: proc do |value|
                                          UI.user_error!("The platform can only be ios, appletvos, or osx") unless %('ios', 'appletvos', 'osx').include?(value)