fastlane 2.150.0.rc5 → 2.150.2

data/fastlane/lib/fastlane/actions/slather.rb

@@ -16,6 +16,7 @@ module Fastlane
           cobertura_xml: '--cobertura-xml',
           sonarqube_xml: '--sonarqube-xml',
           llvm_cov: '--llvm-cov',
+          json: '--json',
           html: '--html',
           show: '--show',
 
@@ -225,6 +226,12 @@ module Fastlane
                                        description: "Tell slather that it should output results as llvm-cov show format",
                                        is_string: false,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :json,
+                                       env_name: "FL_SLATHER_JSON_ENABLED",
+                                       description: "Tell slather that it should output results as static JSON report",
+                                       is_string: false,
+                                       type: Boolean,
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :html,
                                        env_name: "FL_SLATHER_HTML_ENABLED",
                                        description: "Tell slather that it should output results as static HTML pages",

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.150.0.rc5'.freeze
+  VERSION = '2.150.2'.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/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/DeliverfileProtocol.swift

@@ -76,7 +76,7 @@ protocol DeliverfileProtocol: class {
   var appRatingConfigPath: String? { get }
 
   /// Extra information for the submission (e.g. compliance specifications, IDFA settings)
-  var submissionInformation: String? { get }
+  var submissionInformation: [String : Any]? { get }
 
   /// The ID of your App Store Connect team if you're in multiple teams
   var teamId: String? { get }
@@ -99,13 +99,13 @@ protocol DeliverfileProtocol: class {
   /// The default precheck rule level unless otherwise configured
   var precheckDefaultRuleLevel: String { get }
 
-  /// 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 - An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
   var individualMetadataItems: [String] { get }
 
-  /// Metadata: The path to the app icon
+  /// **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the app icon
   var appIcon: String? { get }
 
-  /// Metadata: The path to the Apple Watch app icon
+  /// **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the Apple Watch app icon
   var appleWatchAppIcon: String? { get }
 
   /// Metadata: The copyright notice
@@ -207,7 +207,7 @@ extension DeliverfileProtocol {
   var resetRatings: Bool { return false }
   var priceTier: String? { return nil }
   var appRatingConfigPath: String? { return nil }
-  var submissionInformation: String? { return nil }
+  var submissionInformation: [String : Any]? { return nil }
   var teamId: String? { return nil }
   var teamName: String? { return nil }
   var devPortalTeamId: String? { return nil }
@@ -246,4 +246,4 @@ extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.19]
+// FastlaneRunnerAPIVersion [0.9.20]

data/fastlane/swift/Fastlane.swift

@@ -455,9 +455,9 @@ func appledoc(input: Any,
    - itcProvider: The provider short name to be used with the iTMSTransporter to identify your team. This value will override the automatically detected provider short name. To get provider short name run `pathToXcode.app/Contents/Applications/Application\ Loader.app/Contents/itms/bin/iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column
    - runPrecheckBeforeSubmit: Run precheck before submitting to app review
    - precheckDefaultRuleLevel: The default precheck rule level unless otherwise configured
-   - individualMetadataItems: An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
-   - appIcon: Metadata: The path to the app icon
-   - appleWatchAppIcon: Metadata: The path to the Apple Watch app icon
+   - individualMetadataItems: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
+   - appIcon: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the app icon
+   - appleWatchAppIcon: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the Apple Watch app icon
    - copyright: Metadata: The copyright notice
    - primaryCategory: Metadata: The english name of the primary category (e.g. `Business`, `Books`)
    - secondaryCategory: Metadata: The english name of the secondary category (e.g. `Business`, `Books`)
@@ -515,7 +515,7 @@ func appstore(username: String,
               resetRatings: Bool = false,
               priceTier: Any? = nil,
               appRatingConfigPath: String? = nil,
-              submissionInformation: Any? = nil,
+              submissionInformation: [String : Any]? = nil,
               teamId: Any? = nil,
               teamName: String? = nil,
               devPortalTeamId: String? = nil,
@@ -2248,7 +2248,7 @@ func createAppOnManagedPlayStore(jsonKey: String? = nil,
    - sku: SKU Number (e.g. '1234')
    - platform: The platform to use (optional)
    - platforms: The platforms to use (optional)
-   - language: Primary Language (e.g. 'English', 'German')
+   - language: Primary Language (e.g. 'en-US', 'fr-FR')
    - companyName: The name of your company. Only required if it's the first app you create
    - skipItc: Skip the creation of the app on App Store Connect
    - itcUsers: Array of App Store Connect users. If provided, you can limit access to this newly created app for users with the App Manager, Developer, Marketer or Sales roles
@@ -2505,9 +2505,9 @@ func deleteKeychain(name: String? = nil,
    - itcProvider: The provider short name to be used with the iTMSTransporter to identify your team. This value will override the automatically detected provider short name. To get provider short name run `pathToXcode.app/Contents/Applications/Application\ Loader.app/Contents/itms/bin/iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column
    - runPrecheckBeforeSubmit: Run precheck before submitting to app review
    - precheckDefaultRuleLevel: The default precheck rule level unless otherwise configured
-   - individualMetadataItems: An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
-   - appIcon: Metadata: The path to the app icon
-   - appleWatchAppIcon: Metadata: The path to the Apple Watch app icon
+   - individualMetadataItems: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
+   - appIcon: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the app icon
+   - appleWatchAppIcon: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the Apple Watch app icon
    - copyright: Metadata: The copyright notice
    - primaryCategory: Metadata: The english name of the primary category (e.g. `Business`, `Books`)
    - secondaryCategory: Metadata: The english name of the secondary category (e.g. `Business`, `Books`)
@@ -2565,7 +2565,7 @@ func deliver(username: Any = deliverfile.username,
              resetRatings: Bool = deliverfile.resetRatings,
              priceTier: Any? = deliverfile.priceTier,
              appRatingConfigPath: Any? = deliverfile.appRatingConfigPath,
-             submissionInformation: Any? = deliverfile.submissionInformation,
+             submissionInformation: [String : Any]? = deliverfile.submissionInformation,
              teamId: Any? = deliverfile.teamId,
              teamName: Any? = deliverfile.teamName,
              devPortalTeamId: Any? = deliverfile.devPortalTeamId,
@@ -5343,7 +5343,7 @@ func println(message: String? = nil) {
    - sku: SKU Number (e.g. '1234')
    - platform: The platform to use (optional)
    - platforms: The platforms to use (optional)
-   - language: Primary Language (e.g. 'English', 'German')
+   - language: Primary Language (e.g. 'en-US', 'fr-FR')
    - companyName: The name of your company. Only required if it's the first app you create
    - skipItc: Skip the creation of the app on App Store Connect
    - itcUsers: Array of App Store Connect users. If provided, you can limit access to this newly created app for users with the App Manager, Developer, Marketer or Sales roles
@@ -6757,6 +6757,7 @@ func slackTrainStart(distance: Int = 5,
    - coberturaXml: Tell slather that it should output results as Cobertura XML format
    - sonarqubeXml: Tell slather that it should output results as SonarQube Generic XML format
    - llvmCov: Tell slather that it should output results as llvm-cov show format
+   - json: Tell slather that it should output results as static JSON report
    - html: Tell slather that it should output results as static HTML pages
    - show: Tell slather that it should open static html pages automatically
    - sourceDirectory: Tell slather the location of your source files
@@ -6791,6 +6792,7 @@ func slather(buildDirectory: String? = nil,
              coberturaXml: Bool? = nil,
              sonarqubeXml: Bool? = nil,
              llvmCov: Any? = nil,
+             json: Bool? = nil,
              html: Bool? = nil,
              show: Bool = false,
              sourceDirectory: String? = nil,
@@ -6821,6 +6823,7 @@ func slather(buildDirectory: String? = nil,
                                                                                          RubyCommand.Argument(name: "cobertura_xml", value: coberturaXml),
                                                                                          RubyCommand.Argument(name: "sonarqube_xml", value: sonarqubeXml),
                                                                                          RubyCommand.Argument(name: "llvm_cov", value: llvmCov),
+                                                                                         RubyCommand.Argument(name: "json", value: json),
                                                                                          RubyCommand.Argument(name: "html", value: html),
                                                                                          RubyCommand.Argument(name: "show", value: show),
                                                                                          RubyCommand.Argument(name: "source_directory", value: sourceDirectory),
@@ -7097,6 +7100,7 @@ func splunkmint(dsym: String? = nil,
    - packagePath: Change working directory before any other operation
    - xcconfig: Use xcconfig file to override swift package generate-xcodeproj defaults
    - configuration: Build with configuration (debug|release) [default: debug]
+   - disableSandbox: Disable using the sandbox when executing subprocesses
    - xcprettyOutput: Specifies the output type for xcpretty. eg. 'test', or 'simple'
    - xcprettyArgs: Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf'), requires xcpretty_output to be specified also
    - verbose: Increase verbosity of informational output
@@ -7106,6 +7110,7 @@ func spm(command: String = "build",
          packagePath: String? = nil,
          xcconfig: String? = nil,
          configuration: String? = nil,
+         disableSandbox: Bool = false,
          xcprettyOutput: String? = nil,
          xcprettyArgs: String? = nil,
          verbose: Bool = false) {
@@ -7114,6 +7119,7 @@ func spm(command: String = "build",
                                                                                      RubyCommand.Argument(name: "package_path", value: packagePath),
                                                                                      RubyCommand.Argument(name: "xcconfig", value: xcconfig),
                                                                                      RubyCommand.Argument(name: "configuration", value: configuration),
+                                                                                     RubyCommand.Argument(name: "disable_sandbox", value: disableSandbox),
                                                                                      RubyCommand.Argument(name: "xcpretty_output", value: xcprettyOutput),
                                                                                      RubyCommand.Argument(name: "xcpretty_args", value: xcprettyArgs),
                                                                                      RubyCommand.Argument(name: "verbose", value: verbose)])
@@ -8099,9 +8105,9 @@ func uploadSymbolsToSentry(apiHost: String = "https://app.getsentry.com/api/0",
    - itcProvider: The provider short name to be used with the iTMSTransporter to identify your team. This value will override the automatically detected provider short name. To get provider short name run `pathToXcode.app/Contents/Applications/Application\ Loader.app/Contents/itms/bin/iTMSTransporter -m provider -u 'USERNAME' -p 'PASSWORD' -account_type itunes_connect -v off`. The short names of providers should be listed in the second column
    - runPrecheckBeforeSubmit: Run precheck before submitting to app review
    - precheckDefaultRuleLevel: The default precheck rule level unless otherwise configured
-   - individualMetadataItems: An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
-   - appIcon: Metadata: The path to the app icon
-   - appleWatchAppIcon: Metadata: The path to the Apple Watch app icon
+   - individualMetadataItems: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow
+   - appIcon: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the app icon
+   - appleWatchAppIcon: **DEPRECATED!** Removed after the migration to the new App Store Connect API in June 2020 - Metadata: The path to the Apple Watch app icon
    - copyright: Metadata: The copyright notice
    - primaryCategory: Metadata: The english name of the primary category (e.g. `Business`, `Books`)
    - secondaryCategory: Metadata: The english name of the secondary category (e.g. `Business`, `Books`)
@@ -8159,7 +8165,7 @@ func uploadToAppStore(username: String,
                       resetRatings: Bool = false,
                       priceTier: Any? = nil,
                       appRatingConfigPath: String? = nil,
-                      submissionInformation: Any? = nil,
+                      submissionInformation: [String : Any]? = nil,
                       teamId: Any? = nil,
                       teamName: String? = nil,
                       devPortalTeamId: String? = nil,
@@ -8960,4 +8966,4 @@ let snapshotfile: Snapshotfile = Snapshotfile()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.71]
+// FastlaneRunnerAPIVersion [0.9.73]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.149.1
+// Generated with fastlane 2.150.2

data/fastlane/swift/SocketClient.swift

@@ -34,7 +34,7 @@ class SocketClient: NSObject {
     }
     
     static let connectTimeoutSeconds = 2
-    static let defaultCommandTimeoutSeconds = 3_600 // Hopefully 1 hr is enough ¯\_(ツ)_/¯
+    static let defaultCommandTimeoutSeconds = 10_800 // 3 hours
     static let doneToken = "done" // TODO: remove these
     static let cancelToken = "cancelFastlaneRun"
     
@@ -118,6 +118,7 @@ class SocketClient: NSObject {
     public func send(rubyCommand: RubyCommandable) {
         verbose(message: "sending: \(rubyCommand.json)")
         send(string: rubyCommand.json)
+        writeSemaphore.signal()
     }
     
     public func sendComplete() {

data/fastlane_core/lib/fastlane_core/ipa_file_analyser.rb

@@ -37,7 +37,6 @@ module FastlaneCore
 
     def self.fetch_info_plist_file(path)
       UI.user_error!("Could not find file at path '#{path}'") unless File.exist?(path)
-      Zip.validate_entry_sizes = true # https://github.com/rubyzip/rubyzip/releases/tag/v2.0.0
       Zip::File.open(path, "rb") do |zipfile|
         file = zipfile.glob('**/Payload/*.app/Info.plist').first
         return nil unless file

data/fastlane_core/lib/fastlane_core/provisioning_profile.rb

@@ -113,7 +113,7 @@ module FastlaneCore
           else
             # `security` only works on Mac, fallback to `openssl`
             # via https://stackoverflow.com/a/14379814/252627
-            decoded = `openssl smime -inform der -verify -noverify -in #{path} 2> #{err}`
+            decoded = `openssl smime -inform der -verify -noverify -in #{path.shellescape} 2> #{err}`
           end
           UI.error("Failure to decode #{path}. Exit: #{$?.exitstatus}: #{File.read(err)}") if $?.exitstatus != 0
           decoded

data/spaceship/lib/spaceship/connect_api.rb

@@ -40,7 +40,7 @@ require 'spaceship/connect_api/models/app_preview_set'
 require 'spaceship/connect_api/models/app_preview'
 require 'spaceship/connect_api/models/app_price'
 require 'spaceship/connect_api/models/app_price_tier'
-require 'spaceship/connect_api/models/app_review_attachment'
+require 'spaceship/connect_api/models/app_store_review_attachment'
 require 'spaceship/connect_api/models/app_store_review_detail'
 require 'spaceship/connect_api/models/app_store_version_submission'
 require 'spaceship/connect_api/models/app_screenshot_set'
@@ -50,6 +50,7 @@ require 'spaceship/connect_api/models/app_store_version_phased_release'
 require 'spaceship/connect_api/models/app_store_version'
 require 'spaceship/connect_api/models/idfa_declaration'
 require 'spaceship/connect_api/models/reset_ratings_request'
+require 'spaceship/connect_api/models/sandbox_tester'
 require 'spaceship/connect_api/models/territory'
 
 module Spaceship

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

@@ -78,7 +78,7 @@ module Spaceship
       # App Info
       #
 
-      def fetch_edit_app_info
+      def fetch_edit_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
           Spaceship::ConnectAPI::AppInfo::AppStoreState::DEVELOPER_REJECTED,
@@ -89,7 +89,7 @@ module Spaceship
         ]
 
         filter = { app: id }
-        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter)
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
         return resp.to_models.select do |model|
           states.include?(model.app_store_state)
         end.first
@@ -110,6 +110,26 @@ module Spaceship
       # App Store Versions
       #
 
+      def reject_version_if_possible!(platform: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          appStoreState: [
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::PENDING_DEVELOPER_RELEASE,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::IN_REVIEW,
+            Spaceship::ConnectAPI::AppStoreVersion::AppStoreState::WAITING_FOR_REVIEW
+          ].join(","),
+          platform: platform
+        }
+
+        # Get the latest version
+        version = get_app_store_versions(filter: filter, includes: "appStoreVersionSubmission")
+                  .sort_by { |v| Gem::Version.new(v.version_string) }
+                  .last
+
+        return false if version.nil?
+        return version.reject!
+      end
+
       # Will make sure the current edit_version matches the given version number
       # This will either create a new version or change the version number
       # from an existing version

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

@@ -9,8 +9,18 @@ module Spaceship
       attr_accessor :brazil_age_rating
       attr_accessor :kids_age_band
 
+      attr_accessor :primary_category
+      attr_accessor :primary_subcategory_one
+      attr_accessor :primary_subcategory_two
+      attr_accessor :secondary_category
+      attr_accessor :secondary_subcategory_one
+      attr_accessor :secondary_subcategory_two
+
       module AppStoreState
         READY_FOR_SALE = "READY_FOR_SALE"
+        PROCESSING_FOR_APP_STORE = "PROCESSING_FOR_APP_STORE"
+        PENDING_DEVELOPER_RELEASE = "PENDING_DEVELOPER_RELEASE"
+        IN_REVIEW = "IN_REVIEW"
         WAITING_FOR_REVIEW = "WAITING_FOR_REVIEW"
         DEVELOPER_REJECTED = "DEVELOPER_REJECTED"
         REJECTED = "REJECTED"
@@ -27,9 +37,25 @@ module Spaceship
         "appStoreState" => "app_store_state",
         "appStoreAgeRating" => "app_store_age_rating",
         "brazilAgeRating" => "brazil_age_rating",
-        "kidsAgeBand" => "kids_age_band"
+        "kidsAgeBand" => "kids_age_band",
+
+        "primaryCategory" => "primary_category",
+        "primarySubcategoryOne" => "primary_subcategory_one",
+        "primarySubcategoryTwo" => "primary_subcategory_two",
+        "secondaryCategory" => "secondary_category",
+        "secondarySubcategoryOne" => "secondary_subcategory_one",
+        "secondarySubcategoryTwo" => "secondary_subcategory_two"
       })
 
+      ESSENTIAL_INCLUDES = [
+        "primaryCategory",
+        "primarySubcategoryOne",
+        "primarySubcategoryTwo",
+        "secondaryCategory",
+        "secondarySubcategoryOne",
+        "secondarySubcategoryTwo"
+      ].join(",")
+
       def self.type
         return "appInfos"
       end
@@ -60,7 +86,8 @@ module Spaceship
       end
 
       def get_app_info_localizations(filter: {}, includes: nil, limit: nil, sort: nil)
-        return Spaceship::ConnectAPI.get_app_info_localizations(app_info_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
+        resp = Spaceship::ConnectAPI.get_app_info_localizations(app_info_id: id, filter: filter, includes: includes, limit: limit, sort: sort)
+        return resp.to_models
       end
     end
   end

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

@@ -54,7 +54,7 @@ module Spaceship
       # @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)
+      def self.create(app_preview_set_id: nil, path: nil, wait_for_processing: true, frame_time_code: nil)
         require 'faraday'
 
         filename = File.basename(path)
@@ -95,7 +95,8 @@ module Spaceship
         end
 
         # Poll for video processing completion to set still frame time
-        unless frame_time_code.nil?
+        wait_for_processing = true unless frame_time_code.nil?
+        if wait_for_processing
           loop do
             unless preview.video_url.nil?
               puts("Preview processing complete!") if Spaceship::Globals.verbose?

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

@@ -63,8 +63,37 @@ module Spaceship
         return resp.to_models
       end
 
-      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)
+      def self.get(app_preview_set_id: nil, includes: "appPreviews")
+        return Spaceship::ConnectAPI.get_app_preview_set(app_preview_set_id: app_preview_set_id, filter: nil, includes: includes, limit: nil, sort: nil).first
+      end
+
+      def upload_preview(path: nil, wait_for_processing: true, position: nil, frame_time_code: nil)
+        # Upload preview
+        preview = Spaceship::ConnectAPI::AppPreview.create(app_preview_set_id: id, path: path, wait_for_processing: wait_for_processing, frame_time_code: frame_time_code)
+
+        # Reposition (if specified)
+        unless position.nil?
+          # Get all app preview ids
+          set = AppPreviewSet.get(app_preview_set_id: id)
+          app_preview_ids = set.app_previews.map(&:id)
+
+          # Remove new uploaded preview
+          app_preview_ids.delete(preview.id)
+
+          # Insert preview at specified position
+          app_preview_ids = app_preview_ids.insert(position, preview.id).compact
+
+          # Reorder previews
+          reorder_previews(app_preview_ids: app_preview_ids)
+        end
+
+        return preview
+      end
+
+      def reorder_previews(app_preview_ids: nil)
+        Spaceship::ConnectAPI.patch_app_preview_set_previews(app_preview_set_id: id, app_preview_ids: app_preview_ids)
+
+        return Spaceship::ConnectAPI.get_app_preview_set(app_preview_set_id: id, includes: "appPreviews").first
       end
     end
   end