fastlane 2.149.1 → 2.150.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e38d836b49a278f1c3fd95c820aa3fe9dd7fa4d7f3c0fedfa5ff4fdf4ef033a
-  data.tar.gz: 7a5d7180b0bf7f32989a7dbc8396a2215d68e645691f0c7afff75817324a3e1e
+  metadata.gz: 8a0da99338a957f184c8f61225f84bbea77cf2e295f9a7fc21918095ec2967e3
+  data.tar.gz: '0998f1c0adaa75fcabb51584113223c552268c9f86c844771bdc27b1f74f10d1'
 SHA512:
-  metadata.gz: 51f0e319102f54e6e1a3878b40adf4a019042e64fcee0047d81564321f5e6b11803ac5701171f7e5ef23403f8ed169204e18635109a94928e61334b16cb36f22
-  data.tar.gz: 8d86698444bc4f689bc7ada08f30e5e9b335f8f32e8a87c7d9f919bb99f148afd0c4fe84abd421fe2c3114f9c530f75cc26dd360d7108a5f6e93a820ed2bedcc
+  metadata.gz: 49d0496a16e951b91d512f972d8e5a5f4af1bae7bc68f8a71f32d328b3e1868e0d3b5dfa948723e7c82414f3c2672a6ec73a99884822ccec740aabd2ef1632a7
+  data.tar.gz: 508186460c3e7e4c13bef4f3ad019a5f81374ddaffd32844aa079e02c2165dbb2c454aa2441e150c865aa3c42f526af7dbf494d53911ebfe99cbc02ae2cf5d3d

data/deliver/lib/deliver.rb

@@ -6,7 +6,6 @@ require_relative 'deliver/runner'
 require_relative 'deliver/upload_metadata'
 require_relative 'deliver/upload_screenshots'
 require_relative 'deliver/upload_price_tier'
-require_relative 'deliver/upload_assets'
 require_relative 'deliver/submit_for_review'
 require_relative 'deliver/app_screenshot'
 require_relative 'deliver/html_generator'

data/deliver/lib/deliver/app_screenshot.rb

@@ -1,6 +1,7 @@
 require 'fastimage'
 
 require_relative 'module'
+require 'spaceship/connect_api/models/app_screenshot_set'
 
 module Deliver
   # AppScreenshot represents one screenshots for one specific locale and
@@ -95,31 +96,31 @@ module Deliver
     # The iTC API requires a different notation for the device
     def device_type
       matching = {
-        ScreenSize::IOS_35 => "iphone35",
-        ScreenSize::IOS_40 => "iphone4",
-        ScreenSize::IOS_47 => "iphone6", # also 7 & 8
-        ScreenSize::IOS_55 => "iphone6Plus", # also 7 Plus & 8 Plus
-        ScreenSize::IOS_58 => "iphone58",
-        ScreenSize::IOS_65 => "iphone65",
-        ScreenSize::IOS_IPAD => "ipad",
-        ScreenSize::IOS_IPAD_10_5 => "ipad105",
-        ScreenSize::IOS_IPAD_11 => "ipadPro11",
-        ScreenSize::IOS_IPAD_PRO => "ipadPro",
-        ScreenSize::IOS_IPAD_PRO_12_9 => "ipadPro129",
-        ScreenSize::IOS_40_MESSAGES => "iphone4",
-        ScreenSize::IOS_47_MESSAGES => "iphone6", # also 7 & 8
-        ScreenSize::IOS_55_MESSAGES => "iphone6Plus", # also 7 Plus & 8 Plus
-        ScreenSize::IOS_58_MESSAGES => "iphone58",
-        ScreenSize::IOS_65_MESSAGES => "iphone65",
-        ScreenSize::IOS_IPAD_MESSAGES => "ipad",
-        ScreenSize::IOS_IPAD_PRO_MESSAGES => "ipadPro",
-        ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES => "ipadPro129",
-        ScreenSize::IOS_IPAD_10_5_MESSAGES => "ipad105",
-        ScreenSize::IOS_IPAD_11_MESSAGES => "ipadPro11",
-        ScreenSize::MAC => "desktop",
-        ScreenSize::IOS_APPLE_WATCH => "watch",
-        ScreenSize::IOS_APPLE_WATCH_SERIES4 => "watchSeries4",
-        ScreenSize::APPLE_TV => "appleTV"
+        ScreenSize::IOS_35 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_35,
+        ScreenSize::IOS_40 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_40,
+        ScreenSize::IOS_47 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_47, # also 7 & 8
+        ScreenSize::IOS_55 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_55, # also 7 Plus & 8 Plus
+        ScreenSize::IOS_58 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_58,
+        ScreenSize::IOS_65 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_65,
+        ScreenSize::IOS_IPAD => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_97,
+        ScreenSize::IOS_IPAD_10_5 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_105,
+        ScreenSize::IOS_IPAD_11 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_3GEN_11,
+        ScreenSize::IOS_IPAD_PRO => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_129,
+        ScreenSize::IOS_IPAD_PRO_12_9 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_3GEN_129,
+        ScreenSize::IOS_40_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_40,
+        ScreenSize::IOS_47_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_47, # also 7 & 8
+        ScreenSize::IOS_55_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_55, # also 7 Plus & 8 Plus
+        ScreenSize::IOS_58_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_58,
+        ScreenSize::IOS_65_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_65,
+        ScreenSize::IOS_IPAD_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_97,
+        ScreenSize::IOS_IPAD_PRO_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_129,
+        ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPAD_PRO_3GEN_129,
+        ScreenSize::IOS_IPAD_10_5_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_105,
+        ScreenSize::IOS_IPAD_11_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_11,
+        ScreenSize::MAC => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_DESKTOP,
+        ScreenSize::IOS_APPLE_WATCH => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_3,
+        ScreenSize::IOS_APPLE_WATCH_SERIES4 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_4,
+        # ScreenSize::APPLE_TV => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::
       }
       return matching[self.screen_size]
     end

data/deliver/lib/deliver/options.rb

@@ -2,7 +2,6 @@ require 'fastlane_core/configuration/config_item'
 require 'credentials_manager/appfile_config'
 
 require_relative 'module'
-require_relative 'upload_assets'
 
 module Deliver
   # rubocop:disable Metrics/ClassLength
@@ -206,6 +205,7 @@ module Deliver
                                      short_option: "-b",
                                      description: "Extra information for the submission (e.g. compliance specifications, IDFA settings)",
                                      is_string: false,
+                                     type: Hash,
                                      optional: true),
 
         # affiliation
@@ -283,6 +283,7 @@ module Deliver
         FastlaneCore::ConfigItem.new(key: :individual_metadata_items,
                                      env_name: "DELIVER_INDIVUDAL_METADATA_ITEMS",
                                      description: "An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow",
+                                     deprecated: "Removed after the migration to the new App Store Connect API in June 2020",
                                      is_string: false,
                                      type: Array,
                                      default_value: []),
@@ -291,21 +292,15 @@ module Deliver
         FastlaneCore::ConfigItem.new(key: :app_icon,
                                      env_name: "DELIVER_APP_ICON_PATH",
                                      description: "Metadata: The path to the app icon",
+                                     deprecated: "Removed after the migration to the new App Store Connect API in June 2020",
                                      optional: true,
-                                     short_option: "-l",
-                                     verify_block: proc do |value|
-                                       UI.user_error!("Could not find png file at path '#{File.expand_path(value)}'") unless File.exist?(value)
-                                       UI.user_error!("'#{value}' doesn't seem to be one of the supported files. supported: #{Deliver::UploadAssets::SUPPORTED_ICON_EXTENSIONS.join(',')}") unless Deliver::UploadAssets::SUPPORTED_ICON_EXTENSIONS.include?(File.extname(value).downcase)
-                                     end),
+                                     short_option: "-l"),
         FastlaneCore::ConfigItem.new(key: :apple_watch_app_icon,
                                      env_name: "DELIVER_APPLE_WATCH_APP_ICON_PATH",
                                      description: "Metadata: The path to the Apple Watch app icon",
+                                     deprecated: "Removed after the migration to the new App Store Connect API in June 2020",
                                      optional: true,
-                                     short_option: "-q",
-                                     verify_block: proc do |value|
-                                       UI.user_error!("Could not find png file at path '#{File.expand_path(value)}'") unless File.exist?(value)
-                                       UI.user_error!("'#{value}' doesn't seem to be one of the supported files. supported: #{Deliver::UploadAssets::SUPPORTED_ICON_EXTENSIONS.join(',')}") unless Deliver::UploadAssets::SUPPORTED_ICON_EXTENSIONS.include?(File.extname(value).downcase)
-                                     end),
+                                     short_option: "-q"),
         FastlaneCore::ConfigItem.new(key: :copyright,
                                      env_name: "DELIVER_COPYRIGHT",
                                      description: "Metadata: The copyright notice",

data/deliver/lib/deliver/runner.rb

@@ -7,7 +7,6 @@ require 'fastlane_core/itunes_transporter'
 require 'spaceship'
 require_relative 'html_generator'
 require_relative 'submit_for_review'
-require_relative 'upload_assets'
 require_relative 'upload_price_tier'
 require_relative 'upload_metadata'
 require_relative 'upload_screenshots'
@@ -87,9 +86,14 @@ module Deliver
     # If not, the new version will automatically be created
     def verify_version
       app_version = options[:app_version]
-      UI.message("Making sure the latest version on App Store Connect matches '#{app_version}' from the ipa file...")
+      UI.message("Making sure the latest version on App Store Connect matches '#{app_version}'...")
 
-      changed = options[:app].ensure_version!(app_version, platform: options[:platform])
+      legacy_app = options[:app]
+      app_id = legacy_app.apple_id
+      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+
+      platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
+      changed = app.ensure_version!(app_version, platform: platform)
 
       if changed
         UI.success("Successfully set the version to '#{app_version}'")
@@ -120,7 +124,6 @@ module Deliver
       upload_metadata.upload(options)
       upload_screenshots.upload(options, screenshots)
       UploadPriceTier.new.upload(options)
-      UploadAssets.new.upload(options) # e.g. app icon
     end
 
     # If options[:app_icon]/options[:apple_watch_app_icon]

data/deliver/lib/deliver/setup.rb

@@ -60,9 +60,9 @@ module Deliver
       app_details = v.application.details
 
       # All the localised metadata
-      (UploadMetadata::LOCALISED_VERSION_VALUES + UploadMetadata::LOCALISED_APP_VALUES).each do |key|
+      (UploadMetadata::LOCALISED_VERSION_VALUES.keys + UploadMetadata::LOCALISED_APP_VALUES.keys).each do |key|
         v.description.languages.each do |language|
-          if UploadMetadata::LOCALISED_VERSION_VALUES.include?(key)
+          if UploadMetadata::LOCALISED_VERSION_VALUES.keys.include?(key)
             content = v.send(key)[language].to_s
           else
             content = app_details.send(key)[language].to_s
@@ -76,8 +76,8 @@ module Deliver
       end
 
       # All non-localised metadata
-      (UploadMetadata::NON_LOCALISED_VERSION_VALUES + UploadMetadata::NON_LOCALISED_APP_VALUES).each do |key|
-        if UploadMetadata::NON_LOCALISED_VERSION_VALUES.include?(key)
+      (UploadMetadata::NON_LOCALISED_VERSION_VALUES.keys + UploadMetadata::NON_LOCALISED_APP_VALUES).each do |key|
+        if UploadMetadata::NON_LOCALISED_VERSION_VALUES.keys.include?(key)
           content = v.send(key).to_s
         else
           content = app_details.send(key).to_s
@@ -88,19 +88,8 @@ module Deliver
         UI.message("Writing to '#{resulting_path}'")
       end
 
-      # Trade Representative Contact Information
-      UploadMetadata::TRADE_REPRESENTATIVE_CONTACT_INFORMATION_VALUES.each do |key, option_name|
-        content = v.send(key).to_s
-        content += "\n"
-        base_dir = File.join(path, UploadMetadata::TRADE_REPRESENTATIVE_CONTACT_INFORMATION_DIR)
-        FileUtils.mkdir_p(base_dir)
-        resulting_path = File.join(base_dir, "#{option_name}.txt")
-        File.write(resulting_path, content)
-        UI.message("Writing to '#{resulting_path}'")
-      end
-
       # Review information
-      UploadMetadata::REVIEW_INFORMATION_VALUES.each do |key, option_name|
+      UploadMetadata::REVIEW_INFORMATION_VALUES_LEGACY.each do |key, option_name|
         content = v.send(key).to_s
         content += "\n"
         base_dir = File.join(path, UploadMetadata::REVIEW_INFORMATION_DIR)
@@ -111,20 +100,6 @@ module Deliver
       end
 
       UI.success("Successfully created new configuration files.")
-
-      # get App icon + watch icon
-      if v.large_app_icon.asset_token
-        app_icon_extension = File.extname(v.large_app_icon.url)
-        app_icon_path = File.join(path, "app_icon#{app_icon_extension}")
-        File.write(app_icon_path, open(v.large_app_icon.url).read)
-        UI.success("Successfully downloaded large app icon")
-      end
-      if v.watch_app_icon.asset_token
-        watch_app_icon_extension = File.extname(v.watch_app_icon.url)
-        watch_icon_path = File.join(path, "watch_icon#{watch_app_icon_extension}")
-        File.write(watch_icon_path, open(v.watch_app_icon.url).read)
-        UI.success("Successfully downloaded watch icon")
-      end
     end
 
     def download_screenshots(path, options)

data/deliver/lib/deliver/submit_for_review.rb

@@ -1,132 +1,169 @@
 require_relative 'module'
 
+require 'fastlane_core/build_watcher'
+require 'fastlane_core/ipa_file_analyser'
+require 'fastlane_core/pkg_file_analyser'
+
 module Deliver
   class SubmitForReview
     def submit!(options)
-      app = options[:app]
-      select_build(options)
-
-      UI.message("Submitting the app for review...")
-      submission = app.create_submission(platform: options[:platform])
-
-      # Set app submission information
-      # Default Values
-      submission.content_rights_contains_third_party_content = false
-      submission.content_rights_has_rights = true
-      submission.add_id_info_uses_idfa = false
-
-      # User Values
-      if options[:submission_information]
-        options[:submission_information].each do |key, value|
-          UI.message("Setting '#{key}' to '#{value}'...")
-          submission.send("#{key}=", value)
-        end
+      legacy_app = options[:app]
+      app_id = legacy_app.apple_id
+      app = Spaceship::ConnectAPI::App.get(app_id: app_id)
+
+      platform = Spaceship::ConnectAPI::Platform.map(options[:platform])
+      version = app.get_edit_app_store_version(platform: platform)
+
+      unless version
+        UI.user_error!("Cannot submit for review - could not find an editable version for '#{platform}'")
+        return
       end
 
-      # Finalize app submission
-      submission.complete!
+      build = select_build(options, app, version, platform)
+
+      update_export_compliance(options, app, build)
+      update_idfa(options, app, version)
+      update_submission_information(options, app)
+
+      version.create_app_store_version_submission
 
       UI.success("Successfully submitted the app for review!")
     end
 
-    private def select_build(options)
-      app = options[:app]
-      app_version = options[:app_version]
-      v = app.edit_version(platform: options[:platform])
-
+    private def select_build(options, app, version, platform)
       if options[:build_number] && options[:build_number] != "latest"
         UI.message("Selecting existing build-number: #{options[:build_number]}")
-        if app_version
-          build = v.candidate_builds.detect { |a| a.build_version == options[:build_number] && a.train_version == app_version }
-        else
-          build = v.candidate_builds.detect { |a| a.build_version == options[:build_number] }
-        end
+
+        build = Spaceship::ConnectAPI::Build.all(
+          app_id: app.id,
+          version: options[:app_version],
+          build_number: options[:build_number],
+          platform: platform
+        ).first
+
         unless build
           UI.user_error!("Build number: #{options[:build_number]} does not exist")
         end
       else
         UI.message("Selecting the latest build...")
-        build = wait_for_build(app, app_version)
+        build = wait_for_build_processing_to_be_complete(app: app, platform: platform, options: options)
       end
-      UI.message("Selecting build #{app_version} (#{build.build_version})...")
+      UI.message("Selecting build #{build.app_version} (#{build.version})...")
 
-      v.select_build(build)
-      v.save!
+      version.select_build(build_id: build.id)
 
       UI.success("Successfully selected build")
-    end
 
-    def wait_for_build(app, app_version)
-      UI.user_error!("Could not find app with app identifier") unless app
+      return build
+    end
 
-      start = Time.now
-      build = nil
+    def update_export_compliance(options, app, build)
+      submission_information = options[:submission_information] || {}
+      uses_encryption = submission_information[:export_compliance_uses_encryption]
 
-      use_latest_version = app_version.nil?
+      UI.verbose("Updating build for export compliance status of '#{uses_encryption}'")
+      if build.uses_non_exempt_encryption.nil?
+        build = build.update(attributes: {
+          usesNonExemptEncryption: uses_encryption
+        })
+      end
+      UI.verbose("Updated build for export compliance status of '#{build.uses_non_exempt_encryption}'")
+    end
 
-      loop do
-        # Sometimes candidate_builds don't appear immediately after submission
-        # Wait for candidate_builds to appear on App Store Connect
-        # Issue https://github.com/fastlane/fastlane/issues/10411
-        if use_latest_version
-          candidate_builds = app.latest_version.candidate_builds
-        else
-          candidate_builds = app.tunes_all_builds_for_train(train: app_version)
+    def update_idfa(options, app, version)
+      submission_information = options[:submission_information] || {}
+      return unless submission_information.include?(:add_id_info_uses_idfa)
+
+      uses_idfa = submission_information[:add_id_info_uses_idfa]
+      idfa_declaration = begin
+                           version.fetch_idfa_declaration
+                         rescue
+                           nil
+                         end
+
+      UI.verbose("Updating app store version for IDFA status of '#{uses_idfa}'")
+      version = version.update(attributes: {
+        usesIdfa: uses_idfa
+      })
+      UI.verbose("Updated app store version for IDFA status of '#{version.uses_idfa}'")
+
+      if uses_idfa == false
+        if idfa_declaration
+          UI.verbose("Deleting IDFA delcaration")
+          idfa_declaration.delete!
+          UI.verbose("Deleted IDFA delcaration")
         end
-        if (candidate_builds || []).count == 0
-          UI.message("Waiting for candidate builds to appear...")
-          if (Time.now - start) > (60 * 5)
-            UI.user_error!("Could not find any available candidate builds on App Store Connect to submit")
-          else
-            sleep(30)
-            next
-          end
+      else
+        attributes = {}
+        if submission_information.include?(:add_id_info_limits_tracking)
+          attributes[:honorsLimitedAdTracking] = submission_information[:add_id_info_limits_tracking]
         end
 
-        latest_build = find_build(candidate_builds)
-
-        # if the app version isn't present in the hash (could happen if we are waiting for submission, but didn't provide
-        # it explicitly and no ipa was passed to grab it from), then fall back to the best guess, which is the train_version
-        # of the most recently uploaded build
-        app_version ||= latest_build.train_version
-
-        # Sometimes latest build will disappear and a different build would get selected
-        # Only set build if no latest build found or if same build versions as previously fetched build
-        # Issue: https://github.com/fastlane/fastlane/issues/10945
-        if build.nil? || (latest_build && latest_build.build_version == build.build_version && latest_build.train_version == app_version)
-          build = latest_build
+        if submission_information.include?(:add_id_info_serves_ads)
+          attributes[:servesAds] = submission_information[:add_id_info_serves_ads]
         end
 
-        return build if build && build.processing == false
+        if submission_information.include?(:add_id_info_tracks_install)
+          attributes[:attributesAppInstallationToPreviousAd] = submission_information[:add_id_info_tracks_install]
+        end
 
-        if build
-          UI.message("Waiting App Store Connect processing for build #{app_version} (#{build.build_version})... this might take a while...")
-        else
-          UI.message("Waiting App Store Connect processing for build... this might take a while...")
+        if submission_information.include?(:add_id_info_tracks_action)
+          attributes[:attributesActionWithPreviousAd] = submission_information[:add_id_info_tracks_action]
         end
 
-        if (Time.now - start) > (60 * 5)
-          UI.message("")
-          UI.message("You can tweet: \"App Store Connect #iosprocessingtime #{((Time.now - start) / 60).round} minutes\"")
+        if idfa_declaration
+          UI.verbose("Updating IDFA delcaration")
+          idfa_declaration.update(attributes: attributes)
+          UI.verbose("Updated IDFA delcaration")
+        else
+          UI.verbose("Creating IDFA delcaration")
+          version.create_idfa_declaration(attributes: attributes)
+          UI.verbose("Created IDFA delcaration")
         end
-        sleep(30)
       end
-      nil
+
+      UI.success("Successfully updated IDFA delcarations")
     end
 
-    def find_build(candidate_builds)
-      if (candidate_builds || []).count == 0
-        UI.user_error!("Could not find any available candidate builds on App Store Connect to submit")
+    def update_submission_information(options, app)
+      submission_information = options[:submission_information] || {}
+      if submission_information.include?(:content_rights_contains_third_party_content)
+        value = if submission_information[:content_rights_contains_third_party_content]
+                  Spaceship::ConnectAPI::App::ContentRightsDeclaration::USES_THIRD_PARTY_CONTENT
+                else
+                  Spaceship::ConnectAPI::App::ContentRightsDeclaration::DOES_NOT_USE_THIRD_PARTY_CONTENT
+                end
+
+        UI.success("Updating contents rights declaration on App Store Connect")
+        app.update(attributes: {
+          contentRightsDeclaration: value
+        })
       end
+    end
 
-      build = candidate_builds.first
-      candidate_builds.each do |b|
-        if b.upload_date > build.upload_date
-          build = b
-        end
+    def wait_for_build_processing_to_be_complete(app: nil, platform: nil, options: nil)
+      app_version = options[:app_version]
+      app_version ||= FastlaneCore::IpaFileAnalyser.fetch_app_version(options[:ipa]) if options[:ipa]
+      app_version ||= FastlaneCore::PkgFileAnalyser.fetch_app_version(options[:pkg]) if options[:pkg]
+
+      app_build ||= FastlaneCore::IpaFileAnalyser.fetch_app_build(options[:ipa]) if options[:ipa]
+      app_build ||= FastlaneCore::PkgFileAnalyser.fetch_app_build(options[:pkg]) if options[:pkg]
+
+      latest_build = FastlaneCore::BuildWatcher.wait_for_build_processing_to_be_complete(
+        app_id: app.id,
+        platform: platform,
+        app_version: app_version,
+        build_version: app_build,
+        poll_interval: 15,
+        return_when_build_appears: false,
+        return_spaceship_testflight_build: false
+      )
+
+      unless latest_build.app_version == app_version && latest_build.version == app_build
+        UI.important("Uploaded app #{app_version} - #{app_build}, but received build #{latest_build.app_version} - #{latest_build.version}.")
       end
 
-      return build
+      return latest_build
     end
   end
 end