fastlane 2.150.0.rc3 → 2.150.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d404f18ab2b675e5d8d87a50231b245945e7190325f1b73baf33b940364fb5e
-  data.tar.gz: 268835faf3d58aa4d0707b31ae7606bd1b986ded00b2b22f51bfbb538fa334df
+  metadata.gz: f736bd9272a03db4f9c52dcb3f3cbe1cc21b3f78221a8a27849a0801ad791177
+  data.tar.gz: 61ea559625a0a4fd290774205aecfec2754b7f7a6f4264a3775b51145fd6169e
 SHA512:
-  metadata.gz: 803a021579a5478e8a136b72d3ea7623df1fc29b838c5f4a50be7a86dbf790bfc462f2724258fd96939ac9235a3a3ec8f30636ed04b4b42eec9f34395992cc97
-  data.tar.gz: 377de10f8a84594b91a35c1e1749235aa7d61cd159d197a95955d9b297f687d28164ec26536824ff9aaef44d2c4d0436674262a008bf44e9af917e04e08c5ccd
+  metadata.gz: 769baf252715d93327440d48a152c53bd5f532741f5d9118e04cc09433b1fcd654d0d68973d8c0376e979fda909f0264e6f9e61e9dd66d4d9dacc5027f4ba87b
+  data.tar.gz: 3ee6471846ffcdd74dc4e953822aed04fd05caf5ad03ee1f242d486a3197c66168fda158b9b417831b3221e8782b039bda4d59016653be9416c977691d24effb

data/deliver/lib/deliver/upload_screenshots.rb

@@ -1,4 +1,5 @@
 require 'spaceship/tunes/tunes'
+require 'digest/md5'
 
 require_relative 'app_screenshot'
 require_relative 'module'
@@ -91,6 +92,10 @@ module Deliver
         localizations = version.get_app_store_version_localizations
       end
 
+      upload_screenshots(screenshots_per_language, localizations)
+    end
+
+    def upload_screenshots(screenshots_per_language, localizations)
       # Upload screenshots
       indized = {} # per language and device type
 
@@ -114,7 +119,13 @@ module Deliver
           app_screenshot_sets_map[app_screenshot_set.screenshot_display_type] = app_screenshot_set
 
           # Set initial screnshot count
-          indized[localization.locale][app_screenshot_set.screenshot_display_type] ||= app_screenshot_set.app_screenshots.size
+          indized[localization.locale][app_screenshot_set.screenshot_display_type] ||= {
+            count: app_screenshot_set.app_screenshots.size,
+            checksums: []
+          }
+
+          checksums = app_screenshot_set.app_screenshots.map(&:source_file_checksum).uniq
+          indized[localization.locale][app_screenshot_set.screenshot_display_type][:checksums] = checksums
         end
 
         UI.message("Uploading #{screenshots_for_language.length} screenshots for language #{language}")
@@ -133,21 +144,30 @@ module Deliver
             })
             app_screenshot_sets_map[display_type] = set
 
-            indized[localization.locale][set.screenshot_display_type] = 0
+            indized[localization.locale][set.screenshot_display_type] = {
+              count: 0,
+              checksums: []
+            }
           end
 
-          index = indized[localization.locale][set.screenshot_display_type]
+          index = indized[localization.locale][set.screenshot_display_type][:count]
 
           if index >= 10
-            UI.error("Too many screenshots found for device '#{screenshot.formatted_name}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
+            UI.error("Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
             next
           end
 
-          indized[localization.locale][set.screenshot_display_type] += 1
+          bytes = File.binread(screenshot.path)
+          checksum = Digest::MD5.hexdigest(bytes)
+          duplicate = indized[localization.locale][set.screenshot_display_type][:checksums].include?(checksum)
 
-          # Also.. what is the messages type even for?
-          UI.message("Uploading '#{screenshot.path}'...")
-          set.upload_screenshot(path: screenshot.path)
+          if duplicate
+            UI.message("Previous uploaded. Skipping '#{screenshot.path}'...")
+          else
+            indized[localization.locale][set.screenshot_display_type][:count] += 1
+            UI.message("Uploading '#{screenshot.path}'...")
+            set.upload_screenshot(path: screenshot.path)
+          end
         end
       end
       UI.success("Successfully uploaded screenshots to App Store Connect")

data/fastlane/lib/fastlane/version.rb

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

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -239,64 +239,101 @@ module FastlaneCore
   # escaping problems in its accompanying shell script.
   class JavaTransporterExecutor < TransporterExecutor
     def build_upload_command(username, password, source = "/tmp", provider_short_name = "")
-      [
-        Helper.transporter_java_executable_path.shellescape,
-        "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
-        '-XX:NewSize=2m',
-        '-Xms32m',
-        '-Xmx1024m',
-        '-Xms1024m',
-        '-Djava.awt.headless=true',
-        '-Dsun.net.http.retryPost=false',
-        java_code_option,
-        '-m upload',
-        "-u #{username.shellescape}",
-        "-p #{password.shellescape}",
-        "-f #{source.shellescape}",
-        additional_upload_parameters, # that's here, because the user might overwrite the -t option
-        '-k 100000',
-        ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
-        '2>&1' # cause stderr to be written to stdout
-      ].compact.join(' ') # compact gets rid of the possibly nil ENV value
+      if Helper.mac? && Helper.xcode_at_least?(11)
+        [
+          'xcrun iTMSTransporter',
+          '-m upload',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-f #{source.shellescape}",
+          additional_upload_parameters, # that's here, because the user might overwrite the -t option
+          '-k 100000',
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ') # compact gets rid of the possibly nil ENV value
+      else
+        [
+          Helper.transporter_java_executable_path.shellescape,
+          "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
+          '-XX:NewSize=2m',
+          '-Xms32m',
+          '-Xmx1024m',
+          '-Xms1024m',
+          '-Djava.awt.headless=true',
+          '-Dsun.net.http.retryPost=false',
+          java_code_option,
+          '-m upload',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-f #{source.shellescape}",
+          additional_upload_parameters, # that's here, because the user might overwrite the -t option
+          '-k 100000',
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ') # compact gets rid of the possibly nil ENV value
+      end
     end
 
     def build_download_command(username, password, apple_id, destination = "/tmp", provider_short_name = "")
-      [
-        Helper.transporter_java_executable_path.shellescape,
-        "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
-        '-XX:NewSize=2m',
-        '-Xms32m',
-        '-Xmx1024m',
-        '-Xms1024m',
-        '-Djava.awt.headless=true',
-        '-Dsun.net.http.retryPost=false',
-        java_code_option,
-        '-m lookupMetadata',
-        "-u #{username.shellescape}",
-        "-p #{password.shellescape}",
-        "-apple_id #{apple_id.shellescape}",
-        "-destination #{destination.shellescape}",
-        ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
-        '2>&1' # cause stderr to be written to stdout
-      ].compact.join(' ')
+      if Helper.mac? && Helper.xcode_at_least?(11)
+        [
+          'xcrun iTMSTransporter',
+          '-m lookupMetadata',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-apple_id #{apple_id.shellescape}",
+          "-destination #{destination.shellescape}",
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      else
+        [
+          Helper.transporter_java_executable_path.shellescape,
+          "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
+          '-XX:NewSize=2m',
+          '-Xms32m',
+          '-Xmx1024m',
+          '-Xms1024m',
+          '-Djava.awt.headless=true',
+          '-Dsun.net.http.retryPost=false',
+          java_code_option,
+          '-m lookupMetadata',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          "-apple_id #{apple_id.shellescape}",
+          "-destination #{destination.shellescape}",
+          ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      end
     end
 
     def build_provider_ids_command(username, password)
-      [
-        Helper.transporter_java_executable_path.shellescape,
-        "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
-        '-XX:NewSize=2m',
-        '-Xms32m',
-        '-Xmx1024m',
-        '-Xms1024m',
-        '-Djava.awt.headless=true',
-        '-Dsun.net.http.retryPost=false',
-        java_code_option,
-        '-m provider',
-        "-u #{username.shellescape}",
-        "-p #{password.shellescape}",
-        '2>&1' # cause stderr to be written to stdout
-      ].compact.join(' ')
+      if Helper.mac? && Helper.xcode_at_least?(11)
+        [
+          'xcrun iTMSTransporter',
+          '-m provider',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      else
+        [
+          Helper.transporter_java_executable_path.shellescape,
+          "-Djava.ext.dirs=#{Helper.transporter_java_ext_dir.shellescape}",
+          '-XX:NewSize=2m',
+          '-Xms32m',
+          '-Xmx1024m',
+          '-Xms1024m',
+          '-Djava.awt.headless=true',
+          '-Dsun.net.http.retryPost=false',
+          java_code_option,
+          '-m provider',
+          "-u #{username.shellescape}",
+          "-p #{password.shellescape}",
+          '2>&1' # cause stderr to be written to stdout
+        ].compact.join(' ')
+      end
     end
 
     def java_code_option

data/spaceship/lib/spaceship/connect_api/file_uploader.rb

@@ -2,10 +2,12 @@ require 'faraday' # HTTP Client
 require 'faraday-cookie_jar'
 require 'faraday_middleware'
 
+require 'spaceship/globals'
+
 module Spaceship
   class ConnectAPI
     module FileUploader
-      def self.upload(upload_operation, payload)
+      def self.upload(upload_operations, bytes)
         # {
         #   "method": "PUT",
         #   "url": "https://some-url-apple-gives-us",
@@ -19,17 +21,47 @@ module Spaceship
         #   ]
         # }
 
-        headers = {}
-        upload_operation["requestHeaders"].each do |hash|
-          headers[hash["name"]] = hash["value"]
+        upload_operations.each_with_index do |upload_operation, index|
+          headers = {}
+          upload_operation["requestHeaders"].each do |hash|
+            headers[hash["name"]] = hash["value"]
+          end
+
+          offset = upload_operation["offset"]
+          length = upload_operation["length"]
+
+          puts("Uploading file (part #{index + 1})...") if Spaceship::Globals.verbose?
+          with_retry do
+            client.send(
+              upload_operation["method"].downcase,
+              upload_operation["url"],
+              bytes[offset, length],
+              headers
+            )
+          end
         end
+        puts("Uploading complete!") if Spaceship::Globals.verbose?
+      end
 
-        client.send(
-          upload_operation["method"].downcase,
-          upload_operation["url"],
-          payload,
-          headers
-        )
+      def self.with_retry(tries = 5, &_block)
+        tries = 1 if Object.const_defined?("SpecHelper")
+        response = yield
+
+        tries -= 1
+
+        unless (200...300).cover?(response.status)
+          msg = "Received status of #{response.status}! Retrying after 3 seconds (remaining: #{tries})..."
+          raise msg
+        end
+
+        return response
+      rescue => error
+        puts(error) if Spaceship::Globals.verbose?
+        if tries.zero?
+          raise "Failed to upload file after retries... Received #{response.status}"
+        else
+          retry
+        end
       end
 
       def self.client

data/spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb

@@ -95,7 +95,7 @@ module Spaceship
           return value if new_value.nil?
           return new_value
         else
-          return LEGACY_RATING_VALUE_ITC_MAP[value]
+          return LEGACY_RATING_VALUE_ITC_MAP[value] || value
         end
 
         return value

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -82,10 +82,13 @@ module Spaceship
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::DEVELOPER_REJECTED,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::REJECTED,
-          Spaceship::ConnectAPI::AppInfo::AppStoreState::METADATA_REJECTED
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::METADATA_REJECTED,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::WAITING_FOR_REVIEW,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::INVALID_BINARY
         ]
 
-        resp = Spaceship::ConnectAPI.get_app_infos(app_id: id)
+        filter = { app: id }
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -144,7 +147,9 @@ module Spaceship
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PREPARE_FOR_SUBMISSION,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::DEVELOPER_REJECTED,
             Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::REJECTED,
-            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::METADATA_REJECTED
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::METADATA_REJECTED,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::INVALID_BINARY
           ].join(","),
           platform: platform
         }

data/spaceship/lib/spaceship/connect_api/models/app_info.rb

@@ -16,6 +16,7 @@ module Spaceship
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"
+        INVALID_BINARY = "INVALID_BINARY"
       end
 
       module AppStoreAgeRating

data/spaceship/lib/spaceship/connect_api/models/app_preview.rb

@@ -1,5 +1,8 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require 'spaceship/globals'
+
+require 'digest/md5'
 
 module Spaceship
   class ConnectAPI
@@ -34,39 +37,88 @@ module Spaceship
         return "appPreviews"
       end
 
+      def complete?
+        (asset_delivery_state || {})["state"] == "COMPLETE"
+      end
+
       #
       # API
       #
 
-      def self.create(app_preview_set_id: nil, path: nil)
+      def self.get(app_preview_id: nil)
+        Spaceship::ConnectAPI.get_app_preview(app_preview_id: app_preview_id).first
+      end
+
+      # Creates an AppPreview in an AppPreviewSet
+      # Setting the optional frame_time_code will force polling until video is done processing
+      # @param app_preview_set_id The AppPreviewSet id
+      # @param path The path of the file
+      # @param frame_time_code The time code for the preview still frame (ex: "00:00:07:01")
+      def self.create(app_preview_set_id: nil, path: nil, frame_time_code: nil)
         require 'faraday'
 
         filename = File.basename(path)
         filesize = File.size(path)
-        payload = File.binread(path)
+        bytes = File.binread(path)
 
         post_attributes = {
           fileSize: filesize,
           fileName: filename
         }
 
-        post_resp = Spaceship::ConnectAPI.post_app_preview(
+        # Create placeholder
+        preview = Spaceship::ConnectAPI.post_app_preview(
           app_preview_set_id: app_preview_set_id,
           attributes: post_attributes
         ).to_models.first
 
-        upload_operation = post_resp.upload_operations.first
-        Spaceship::ConnectAPI::FileUploader.upload(upload_operation, payload)
+        # Upload the file
+        upload_operations = preview.upload_operations
+        Spaceship::ConnectAPI::FileUploader.upload(upload_operations, bytes)
 
+        # Update file uploading complete
         patch_attributes = {
           uploaded: true,
-          sourceFileChecksum: "checksum-holder"
+          sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
-        Spaceship::ConnectAPI.patch_app_preview(
-          app_preview_id: post_resp.id,
-          attributes: patch_attributes
-        ).to_models.first
+        begin
+          preview = Spaceship::ConnectAPI.patch_app_preview(
+            app_preview_id: preview.id,
+            attributes: patch_attributes
+          ).to_models.first
+        rescue => error
+          puts("Failed to patch app preview. Update may have gone through so verifying") if Spaceship::Globals.verbose?
+
+          preview = Spaceship::ConnectAPI::AppPreview.get(app_preview_id: preview.id)
+          raise error unless preview.complete?
+        end
+
+        # Poll for video processing completion to set still frame time
+        unless frame_time_code.nil?
+          loop do
+            unless preview.video_url.nil?
+              puts("Preview processing complete!") if Spaceship::Globals.verbose?
+              preview = preview.update(attributes: {
+                previewFrameTimeCode: frame_time_code
+              })
+              puts("Updated preview frame time code!") if Spaceship::Globals.verbose?
+              break
+            end
+
+            sleep_time = 30
+            puts("Waiting #{sleep_time} seconds before checking status of processing...") if Spaceship::Globals.verbose?
+            sleep(sleep_time)
+
+            preview = Spaceship::ConnectAPI::AppPreview.get(app_preview_id: preview.id)
+          end
+        end
+
+        preview
+      end
+
+      def update(attributes: nil)
+        Spaceship::ConnectAPI.patch_app_preview(app_preview_id: id, attributes: attributes)
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)

data/spaceship/lib/spaceship/connect_api/models/app_preview_set.rb

@@ -63,8 +63,8 @@ module Spaceship
         return resp.to_models
       end
 
-      def upload_preview(path: nil)
-        return Spaceship::ConnectAPI::AppPreview.create(app_preview_set_id: id, path: path)
+      def upload_preview(path: nil, frame_time_code: nil)
+        return Spaceship::ConnectAPI::AppPreview.create(app_preview_set_id: id, path: path, frame_time_code: frame_time_code)
       end
     end
   end

data/spaceship/lib/spaceship/connect_api/models/app_review_attachment.rb

@@ -1,4 +1,7 @@
 require_relative '../model'
+require_relative '../file_uploader'
+require 'digest/md5'
+
 module Spaceship
   class ConnectAPI
     class AppReviewAttachment
@@ -31,46 +34,33 @@ module Spaceship
 
         filename = File.basename(path)
         filesize = File.size(path)
-        payload = File.binread(path)
+        bytes = File.binread(path)
 
         post_attributes = {
           fileSize: filesize,
           fileName: filename
         }
 
-        post_resp = Spaceship::ConnectAPI.post_app_review_attachment(app_store_review_detail_id: app_store_review_detail_id, attributes: post_attributes).to_models.first
-
-        # {
-        #   "method": "PUT",
-        #   "url": "https://some-url-apple-gives-us",
-        #   "length": 57365,
-        #   "offset": 0,
-        #   "requestHeaders": [
-        #     {
-        #       "name": "Content-Type",
-        #       "value": "image/png"
-        #     }
-        #   ]
-        # }
-        upload_operation = post_resp.upload_operations.first
-
-        headers = {}
-        upload_operation["requestHeaders"].each do |hash|
-          headers[hash["name"]] = hash["value"]
-        end
+        # Create placeholder
+        attachment = Spaceship::ConnectAPI.post_app_review_attachment(
+          app_store_review_detail_id: app_store_review_detail_id,
+          attributes: post_attributes
+        ).to_models.first
 
-        Faraday.put(
-          upload_operation["url"],
-          payload,
-          headers
-        )
+        # Upload the file
+        upload_operations = attachment.upload_operations
+        Spaceship::ConnectAPI::FileUploader.upload(upload_operations, bytes)
 
+        # Update file uploading complete
         patch_attributes = {
           uploaded: true,
-          sourceFileChecksum: "checksum-holder"
+          sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
-        Spaceship::ConnectAPI.patch_app_review_attachment(app_review_attachment_id: post_resp.id, attributes: patch_attributes).to_models.first
+        Spaceship::ConnectAPI.patch_app_review_attachment(
+          app_review_attachment_id: attachment.id,
+          attributes: patch_attributes
+        ).to_models.first
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)

data/spaceship/lib/spaceship/connect_api/models/app_screenshot.rb

@@ -1,5 +1,8 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require 'spaceship/globals'
+
+require 'digest/md5'
 
 module Spaceship
   class ConnectAPI
@@ -15,36 +18,6 @@ module Spaceship
       attr_accessor :asset_delivery_state
       attr_accessor :uploaded
 
-      # "fileSize": 92542,
-      #   "fileName": "ftl_3241d62418767c0aa9b889b020c4f8db_45455763d4aaf7b18ee0045bc787f3de.png",
-      #   "sourceFileChecksum": "c237fd7852ed8f9285d16d9a28d2ec25",
-      #   "imageAsset": {
-      #     "templateUrl": "https://is4-ssl.mzstatic.com/image/thumb/Purple113/v4/61/18/68/61186886-b234-5bd0-1f4a-563124f18511/pr_source.png/{w}x{h}bb.{f}",
-      #     "width": 2048,
-      #     "height": 2732
-      #   },
-      #   "assetToken": "Purple113/v4/61/18/68/61186886-b234-5bd0-1f4a-563124f18511/pr_source.png",
-      #   "assetType": "SortedJ99ScreenShot",
-      #   "uploadOperations": null,
-      #   "assetDeliveryState": {
-      #     "errors": [],
-      #     "warnings": null,
-      #     "state": "COMPLETE"
-      #   },
-      #   "uploaded": null
-
-      # "assetDeliveryState": {
-      #   "errors": [],
-      #   "warnings": null,
-      #   "state": "AWAITING_UPLOAD"
-      # },
-
-      # "assetDeliveryState": {
-      #   "errors": [],
-      #   "warnings": null,
-      #   "state": "UPLOAD_COMPLETE"
-      # },
-
       attr_mapping({
         "fileName" => "file_name",
         "sourceFileChecksum" => "source_file_checksum",
@@ -60,33 +33,56 @@ module Spaceship
         return "appScreenshots"
       end
 
+      def complete?
+        (asset_delivery_state || {})["state"] == "COMPLETE"
+      end
+
       #
       # API
       #
+      #
 
       def self.create(app_screenshot_set_id: nil, path: nil)
         require 'faraday'
 
         filename = File.basename(path)
         filesize = File.size(path)
-        payload = File.binread(path)
+        bytes = File.binread(path)
 
         post_attributes = {
           fileSize: filesize,
           fileName: filename
         }
 
-        post_resp = Spaceship::ConnectAPI.post_app_screenshot(app_screenshot_set_id: app_screenshot_set_id, attributes: post_attributes).to_models.first
+        # Create placeholder
+        screenshot = Spaceship::ConnectAPI.post_app_screenshot(
+          app_screenshot_set_id: app_screenshot_set_id,
+          attributes: post_attributes
+        ).first
 
-        upload_operation = post_resp.upload_operations.first
-        Spaceship::ConnectAPI::FileUploader.upload(upload_operation, payload)
+        # Upload the file
+        upload_operations = screenshot.upload_operations
+        Spaceship::ConnectAPI::FileUploader.upload(upload_operations, bytes)
 
+        # Update file uploading complete
         patch_attributes = {
           uploaded: true,
-          sourceFileChecksum: "checksum-holder"
+          sourceFileChecksum: Digest::MD5.hexdigest(bytes)
         }
 
-        Spaceship::ConnectAPI.patch_app_screenshot(app_screenshot_id: post_resp.id, attributes: patch_attributes).to_models.first
+        begin
+          screenshot = Spaceship::ConnectAPI.patch_app_screenshot(
+            app_screenshot_id: screenshot.id,
+            attributes: patch_attributes
+          ).first
+        rescue => error
+          puts("Failed to patch app screenshot. Update may have gone through so verifying") if Spaceship::Globals.verbose?
+
+          screenshot = Spaceship::ConnectAPI.get_app_screenshot(app_screenshot_id: screenshot.id).first
+          raise error unless screenshot.complete?
+        end
+
+        return screenshot
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)

data/spaceship/lib/spaceship/connect_api/models/app_store_version.rb

@@ -26,6 +26,7 @@ module Spaceship
         REJECTED = "REJECTED"
         PREPARE_FOR_SUBMISSION = "PREPARE_FOR_SUBMISSION"
         METADATA_REJECTED = "METADATA_REJECTED"
+        INVALID_BINARY = "INVALID_BINARY"
       end
 
       module ReleaseType

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -188,6 +188,11 @@ module Spaceship
       # appPreview
       #
 
+      def get_app_preview(app_preview_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("appPreviews/#{app_preview_id}", params)
+      end
+
       def post_app_preview(app_preview_set_id: nil, attributes: {})
         body = {
           data: {
@@ -338,6 +343,11 @@ module Spaceship
       # appScreenshots
       #
 
+      def get_app_screenshot(app_screenshot_id: nil)
+        params = Client.instance.build_params(filter: nil, includes: nil, limit: nil, sort: nil)
+        Client.instance.get("appScreenshots/#{app_screenshot_id}", params)
+      end
+
       def post_app_screenshot(app_screenshot_set_id: nil, attributes: {})
         body = {
           data: {
@@ -378,9 +388,9 @@ module Spaceship
       # appInfos
       #
 
-      def get_app_infos(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+      def get_app_infos(filter: {}, includes: nil, limit: nil, sort: nil)
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
-        Client.instance.get("apps/#{app_id}/appInfos", params)
+        Client.instance.get("appInfos", params)
       end
 
       def patch_app_info(app_info_id: nil, attributes: {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.150.0.rc3
+  version: 2.150.0.rc4
 platform: ruby
 authors:
 - Manu Wallner
@@ -29,7 +29,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-25 00:00:00.000000000 Z
+date: 2020-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier