fastlane 2.190.0 → 2.193.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8705b34d3c2ba652057cd97cf7482e1490cfdfdd26650ee1cb001b3e2d55553c
-  data.tar.gz: 4fc0b307f940f973ea7d9a70fe88ef567a97fcb9398ae9dfac52d9c4041c58c9
+  metadata.gz: 16bbd4e5c7f94860e5d9cba08578ab2918bccfe31092380f43d859da4f8393e7
+  data.tar.gz: f527779d5963a3f3110c7b5b4bb6bda4c816a01e391b16919c7ef5c0c841b82d
 SHA512:
-  metadata.gz: 8421768a3ca7030a72a000a3df67a864b7461ee3e221c1e8e91d061aa2d83eac121ed9781e75fc81e2f1e11d822309318d2f0f5aea52cfdd7ce5180c745e359f
-  data.tar.gz: bf7ca0c1eb8f5daed3a4ea7a44ffad3898535e173805f342a3590440a248cc9d5bbb4b6a9edea98af191d20cb740316ba9b5b044a75b1c0109ac1923a5df6326
+  metadata.gz: 148193a7bc745d1c044cadad094875e5375c8f0ed611231695228bd1656aa3f5030018a88cf484d7c811bcd4161ac191f786f3cfcce759a9e59d70cc5a814e34
+  data.tar.gz: b041a08c28429bc1a32c7a08702ebca0e260ac051734541b4345cb441a3cfaeb33d08f75887346bc974380463c1c8eddae468024069ad505c5edaa2ec5fdfc1c

data/README.md

@@ -35,23 +35,43 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 <!-- This table is regenerated and resorted on each release -->
 <table id='team'>
 <tr>
+<td id='iulian-onofrei'>
+<a href='https://github.com/revolter'>
+<img src='https://github.com/revolter.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
+</td>
+<td id='andrew-mcburney'>
+<a href='https://github.com/armcburney'>
+<img src='https://github.com/armcburney.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
+</td>
+<td id='maksym-grebenets'>
+<a href='https://github.com/mgrebenets'>
+<img src='https://github.com/mgrebenets.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
+</td>
+<td id='joshua-liebowitz'>
+<a href='https://github.com/taquitos'>
+<img src='https://github.com/taquitos.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
+</td>
 <td id='luka-mirosevic'>
 <a href='https://github.com/lmirosevic'>
 <img src='https://github.com/lmirosevic.png' width='140px;'>
 </a>
 <h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
 </td>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
-</td>
-<td id='fumiya-nakamura'>
-<a href='https://github.com/nafu'>
-<img src='https://github.com/nafu.png' width='140px;'>
+</tr>
+<tr>
+<td id='olivier-halligon'>
+<a href='https://github.com/AliSoftware'>
+<img src='https://github.com/AliSoftware.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
+<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
 </td>
 <td id='satoshi-namai'>
 <a href='https://github.com/ainame'>
@@ -59,19 +79,11 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/ainame'>Satoshi Namai</a></h4>
 </td>
-<td id='manish-rathi'>
-<a href='https://github.com/crazymanish'>
-<img src='https://github.com/crazymanish.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/iammanishrathi'>Manish Rathi</a></h4>
-</td>
-</tr>
-<tr>
-<td id='andrew-mcburney'>
-<a href='https://github.com/armcburney'>
-<img src='https://github.com/armcburney.png' width='140px;'>
+<td id='stefan-natchev'>
+<a href='https://github.com/snatchev'>
+<img src='https://github.com/snatchev.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
+<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
 </td>
 <td id='kohki-miki'>
 <a href='https://github.com/giginet'>
@@ -79,31 +91,19 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
 </td>
-<td id='olivier-halligon'>
-<a href='https://github.com/AliSoftware'>
-<img src='https://github.com/AliSoftware.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
-</td>
-<td id='danielle-tomlinson'>
-<a href='https://github.com/endocrimes'>
-<img src='https://github.com/endocrimes.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
-</td>
-<td id='jorge-revuelta-h'>
-<a href='https://github.com/minuscorp'>
-<img src='https://github.com/minuscorp.png' width='140px;'>
+<td id='daniel-jankowski'>
+<a href='https://github.com/mollyIV'>
+<img src='https://github.com/mollyIV.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
+<h4 align='center'><a href='https://twitter.com/mollyIV'>Daniel Jankowski</a></h4>
 </td>
 </tr>
 <tr>
-<td id='manu-wallner'>
-<a href='https://github.com/milch'>
-<img src='https://github.com/milch.png' width='140px;'>
+<td id='max-ott'>
+<a href='https://github.com/max-ott'>
+<img src='https://github.com/max-ott.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
+<h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
 </td>
 <td id='matthew-ellis'>
 <a href='https://github.com/matthewellis'>
@@ -111,37 +111,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
 </td>
-<td id='felix-krause'>
-<a href='https://github.com/KrauseFx'>
-<img src='https://github.com/KrauseFx.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/KrauseFx'>Felix Krause</a></h4>
-</td>
-<td id='maksym-grebenets'>
-<a href='https://github.com/mgrebenets'>
-<img src='https://github.com/mgrebenets.png' width='140px;'>
+<td id='jorge-revuelta-h'>
+<a href='https://github.com/minuscorp'>
+<img src='https://github.com/minuscorp.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
+<h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
 </td>
-<td id='helmut-januschka'>
-<a href='https://github.com/hjanuschka'>
-<img src='https://github.com/hjanuschka.png' width='140px;'>
+<td id='fumiya-nakamura'>
+<a href='https://github.com/nafu'>
+<img src='https://github.com/nafu.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
+<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
 </td>
-</tr>
-<tr>
 <td id='jimmy-dee'>
 <a href='https://github.com/jdee'>
 <img src='https://github.com/jdee.png' width='140px;'>
 </a>
 <h4 align='center'>Jimmy Dee</h4>
 </td>
-<td id='joshua-liebowitz'>
-<a href='https://github.com/taquitos'>
-<img src='https://github.com/taquitos.png' width='140px;'>
+</tr>
+<tr>
+<td id='helmut-januschka'>
+<a href='https://github.com/hjanuschka'>
+<img src='https://github.com/hjanuschka.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
+<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
 </td>
 <td id='jérôme-lacoste'>
 <a href='https://github.com/lacostej'>
@@ -149,31 +143,11 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
 </td>
-<td id='stefan-natchev'>
-<a href='https://github.com/snatchev'>
-<img src='https://github.com/snatchev.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
-</td>
-<td id='iulian-onofrei'>
-<a href='https://github.com/revolter'>
-<img src='https://github.com/revolter.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
-</td>
-</tr>
-<tr>
-<td id='roger-oba'>
-<a href='https://github.com/rogerluan'>
-<img src='https://github.com/rogerluan.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/rogerluan_'>Roger Oba</a></h4>
-</td>
-<td id='daniel-jankowski'>
-<a href='https://github.com/mollyIV'>
-<img src='https://github.com/mollyIV.png' width='140px;'>
+<td id='danielle-tomlinson'>
+<a href='https://github.com/endocrimes'>
+<img src='https://github.com/endocrimes.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/mollyIV'>Daniel Jankowski</a></h4>
+<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
 </td>
 <td id='josh-holtz'>
 <a href='https://github.com/joshdholtz'>
@@ -181,11 +155,25 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</a></h4>
 </td>
-<td id='max-ott'>
-<a href='https://github.com/max-ott'>
-<img src='https://github.com/max-ott.png' width='140px;'>
+<td id='felix-krause'>
+<a href='https://github.com/KrauseFx'>
+<img src='https://github.com/KrauseFx.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
+<h4 align='center'><a href='https://twitter.com/KrauseFx'>Felix Krause</a></h4>
+</td>
+</tr>
+<tr>
+<td id='aaron-brager'>
+<a href='https://github.com/getaaron'>
+<img src='https://github.com/getaaron.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
+</td>
+<td id='manu-wallner'>
+<a href='https://github.com/milch'>
+<img src='https://github.com/milch.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
 </td>
 <td id='jan-piotrowski'>
 <a href='https://github.com/janpio'>
@@ -193,6 +181,18 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
 </td>
+<td id='manish-rathi'>
+<a href='https://github.com/crazymanish'>
+<img src='https://github.com/crazymanish.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/iammanishrathi'>Manish Rathi</a></h4>
+</td>
+<td id='roger-oba'>
+<a href='https://github.com/rogerluan'>
+<img src='https://github.com/rogerluan.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/rogerluan_'>Roger Oba</a></h4>
+</td>
 </tr>
 </table>
 

data/deliver/lib/deliver/app_screenshot.rb

@@ -324,7 +324,8 @@ module Deliver
       is_3rd_gen = [
         "iPad Pro (12.9-inch) (3rd generation)", # default simulator name has this
         "iPad Pro (12.9-inch) (4th generation)", # default simulator name has this
-        "ipadPro129" # downloaded screenshots name has this
+        "ipadPro129", # downloaded screenshots name has this,
+        "3GEN" # downloaded screenshots name from App Store Connect API has this
       ].any? { |key| filename.include?(key) }
       if is_3rd_gen
         if screen_size == ScreenSize::IOS_IPAD_PRO

data/deliver/lib/deliver/app_screenshot_iterator.rb

@@ -85,8 +85,8 @@ module Deliver
           app_screenshot_set ||= localization.create_app_screenshot_set(attributes: { screenshotDisplayType: display_type })
 
           # iterate over screenshots per display size with index
-          screenshots.each do |screenshot|
-            yield(localization, app_screenshot_set, screenshot)
+          screenshots.each.with_index do |screenshot, index|
+            yield(localization, app_screenshot_set, screenshot, index)
           end
         end
       end

data/deliver/lib/deliver/loader.rb

@@ -82,7 +82,7 @@ module Deliver
     #
     # @param root [String] A directory path
     # @param ignore_validation [String] Set false not to raise the error when finding invalid folder name
-    # @return [Array<AppScreenshot>] The list of AppScreenshot that exist under given `root` directory
+    # @return [Array<Deliver::AppScreenshot>] The list of AppScreenshot that exist under given `root` directory
     def self.load_app_screenshots(root, ignore_validation)
       screenshots = language_folders(root, ignore_validation, true).flat_map do |language_folder|
         paths = if language_folder.framed_file_paths.count > 0

data/deliver/lib/deliver/options.rb

@@ -162,6 +162,12 @@ module Deliver
                                      description: "Clear all previously uploaded screenshots before uploading the new ones",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :sync_screenshots,
+                                     env_name: "DELIVER_SYNC_SCREENSHOTS",
+                                     description: "Sync screenshots with local ones. This is currently beta option" \
+                                                  "so set true to 'FASTLANE_ENABLE_BETA_DELIVER_SYNC_SCREENSHOTS' environment variable as well",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :submit_for_review,
                                      env_name: "DELIVER_SUBMIT_FOR_REVIEW",
                                      description: "Submit the new version for Review after uploading everything",

data/deliver/lib/deliver/runner.rb

@@ -10,6 +10,7 @@ require_relative 'submit_for_review'
 require_relative 'upload_price_tier'
 require_relative 'upload_metadata'
 require_relative 'upload_screenshots'
+require_relative 'sync_screenshots'
 require_relative 'detect_values'
 
 module Deliver
@@ -143,7 +144,14 @@ module Deliver
 
       # Commit
       upload_metadata.upload(options)
-      upload_screenshots.upload(options, screenshots)
+
+      if options[:sync_screenshots]
+        sync_screenshots = SyncScreenshots.new(app: Deliver.cache[:app], platform: Spaceship::ConnectAPI::Platform.map(options[:platform]))
+        sync_screenshots.sync(screenshots)
+      else
+        upload_screenshots.upload(options, screenshots)
+      end
+
       UploadPriceTier.new.upload(options)
     end
 

data/deliver/lib/deliver/screenshot_comparable.rb

@@ -0,0 +1,62 @@
+require 'spaceship/connect_api/models/app_screenshot'
+require 'spaceship/connect_api/models/app_screenshot_set'
+
+require_relative 'app_screenshot'
+
+module Deliver
+  # This clsas enables you to compare equality between different representations of the screenshots
+  # in the standard API `Array#-` that requires objects to implements `eql?` and `hash`.
+  class ScreenshotComparable
+    # A unique key value that is consist of locale, filename, and checksum.
+    attr_reader :key
+
+    # A hash object that contains the source data of this representation class
+    attr_reader :context
+
+    def self.create_from_local(screenshot:, app_screenshot_set:)
+      raise ArgumentError unless screenshot.kind_of?(Deliver::AppScreenshot)
+      raise ArgumentError unless app_screenshot_set.kind_of?(Spaceship::ConnectAPI::AppScreenshotSet)
+
+      new(
+        path: "#{screenshot.language}/#{File.basename(screenshot.path)}",
+        checksum: calculate_checksum(screenshot.path),
+        context: {
+          screenshot: screenshot,
+          app_screenshot_set: app_screenshot_set
+        }
+      )
+    end
+
+    def self.create_from_remote(app_screenshot:, locale:)
+      raise ArgumentError unless app_screenshot.kind_of?(Spaceship::ConnectAPI::AppScreenshot)
+      raise ArgumentError unless locale.kind_of?(String)
+
+      new(
+        path: "#{locale}/#{app_screenshot.file_name}",
+        checksum: app_screenshot.source_file_checksum,
+        context: {
+          app_screenshot: app_screenshot,
+          locale: locale
+        }
+      )
+    end
+
+    def self.calculate_checksum(path)
+      bytes = File.binread(path)
+      Digest::MD5.hexdigest(bytes)
+    end
+
+    def initialize(path:, checksum:, context:)
+      @key = "#{path}/#{checksum}"
+      @context = context
+    end
+
+    def eql?(other)
+      key == other.key
+    end
+
+    def hash
+      key.hash
+    end
+  end
+end

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