fastlane 2.65.0.beta.20171110010003 → 2.65.0.beta.20171111010004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab7e53e94f57acd454bc9c01442108ff81a7a626
-  data.tar.gz: 942b6862bb8bbf52c7c4647679b94eaa60b00bfd
+  metadata.gz: cc309a3a6e156156ac2c7f5eb97992af2a4c5bfa
+  data.tar.gz: 96521fa1a163eb7cfe387974003cfcf6f2f3f5fc
 SHA512:
-  metadata.gz: d6de51e352b2885e35a62b305ead0c50f668dfdb638f5fb5b799ab88bc0957a65cb21076d47396c4ba7fde2305d08cd807769356eddc98e0bf8aebc0d0c9e3ec
-  data.tar.gz: 1700dd8e547ed4c38fb96e60d23008148274039d59b7a459061d267130102e9187e10535ad344f8876b0e0a1bc841fe738eb1379afaa46255afe09cdc4e41ec6
+  metadata.gz: f391a1d799434dce282c01171f7a9b959bab25f3908b8c855bbfb38a418ad987be55d38d8c0bf87b30b4d16ab4d0072c25247c357ae5f1b413c44b3ea47c9796
+  data.tar.gz: 50809f813761f17bd7f2f171896ab5ab0dfc37d72fa9c3c68db9ce1b4372b3e3836437d554082c87fa697f5d92e21a82e85eea7b183422c38a1b566b53bb28e5

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.65.0.beta.20171110010003'.freeze
+  VERSION = '2.65.0.beta.20171111010004'.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/spaceship/lib/spaceship/du/du_client.rb

@@ -19,7 +19,7 @@ module Spaceship
     end
 
     def upload_purchase_review_screenshot(app_id, upload_file, content_provider_id, sso_token_for_image)
-      upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: 'MZPFT.SortedScreenShot')
+      upload_file(app_id: app_id, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: get_picture_type(upload_file))
     end
 
     def upload_large_icon(app_version, upload_file, content_provider_id, sso_token_for_image)
@@ -42,6 +42,16 @@ module Spaceship
       upload_file(app_version: app_version, upload_file: upload_file, path: '/upload/image', content_provider_id: content_provider_id, sso_token: sso_token_for_image, du_validation_rule_set: screenshot_picture_type(device, nil))
     end
 
+    def get_picture_type(upload_file)
+      resolution = Utilities.resolution(upload_file.file_path)
+      result = device_resolution_map.find do |key, resolutions|
+        resolutions.include? resolution
+      end
+      raise "Unknown device for screen resolution #{resolution}" if result.nil?
+
+      picture_type_map[result[0]]
+    end
+
     private
 
     def upload_file(app_version: nil, upload_file: nil, path: nil, content_provider_id: nil, sso_token: nil, du_validation_rule_set: nil, app_id: nil)
@@ -113,6 +123,21 @@ module Spaceship
       }
     end
 
+    def device_resolution_map
+      # rubocop:enable Layout/ExtraSpacing
+      {
+        watch:        [[312, 390]],
+        ipad:         [[1024, 748], [1024, 768], [2048, 1496], [2048, 1536], [768, 1004], [768, 1024], [1536, 2008], [1536, 2048]],
+        ipadPro:      [[2048, 2732], [2732, 2048]],
+        iphone6:      [[750, 1334], [1334, 750]],
+        iphone6Plus:  [[1242, 2208], [2208, 1242]],
+        iphone4:      [[640, 1096], [640, 1136], [1136, 600], [1136, 640]],
+        iphone35:     [[640, 960], [640, 920], [960, 600], [960, 640]],
+        appleTV:      [[1920, 1080]],
+        desktop:      [[1280, 800], [1440, 900], [2560, 1600], [2880, 1800]]
+      }
+    end
+
     def screenshot_picture_type(device, is_messages)
       map = is_messages ? messages_picture_type_map : picture_type_map
       device = device.to_sym

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -186,20 +186,7 @@ module Spaceship
           # Upload Screenshot
           upload_file = UploadFile.from_path @review_screenshot
           screenshot_data = client.upload_purchase_review_screenshot(application.apple_id, upload_file)
-          new_screenshot = {
-            "value" => {
-              "assetToken" => screenshot_data["token"],
-              "sortOrder" => 0,
-              "type" => "SortedScreenShot",
-              "originalFileName" => upload_file.file_name,
-              "size" => screenshot_data["length"],
-              "height" => screenshot_data["height"],
-              "width" => screenshot_data["width"],
-              "checksum" => screenshot_data["md5"]
-            }
-          }
-
-          raw_data["versions"][0]["reviewScreenshot"] = new_screenshot
+          raw_data["versions"][0]["reviewScreenshot"] = screenshot_data
         end
         # Update the Purchase
         client.update_iap!(app_id: application.apple_id, purchase_id: self.purchase_id, data: raw_data)

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -662,9 +662,21 @@ module Spaceship
     # Uploads an In-App-Purchase Review screenshot
     # @param app_id (AppId): The id of the app
     # @param upload_image (UploadFile): The icon to upload
-    # @return [JSON] the response
+    # @return [JSON] the screenshot data, ready to be added to an In-App-Purchase
     def upload_purchase_review_screenshot(app_id, upload_image)
-      du_client.upload_purchase_review_screenshot(app_id, upload_image, content_provider_id, sso_token_for_image)
+      data = du_client.upload_purchase_review_screenshot(app_id, upload_image, content_provider_id, sso_token_for_image)
+      {
+          "value" => {
+              "assetToken" => data["token"],
+              "sortOrder" => 0,
+              "type" => du_client.get_picture_type(upload_image),
+              "originalFileName" => upload_image.file_name,
+              "size" => data["length"],
+              "height" => data["height"],
+              "width" => data["width"],
+              "checksum" => data["md5"]
+          }
+      }
     end
 
     # Uploads a screenshot
@@ -1148,20 +1160,7 @@ module Spaceship
         # Upload Screenshot:
         upload_file = UploadFile.from_path review_screenshot
         screenshot_data = upload_purchase_review_screenshot(app_id, upload_file)
-        new_screenshot = {
-          "value" => {
-            "assetToken" => screenshot_data["token"],
-            "sortOrder" => 0,
-            "type" => "SortedScreenShot",
-            "originalFileName" => upload_file.file_name,
-            "size" => screenshot_data["length"],
-            "height" => screenshot_data["height"],
-            "width" => screenshot_data["width"],
-            "checksum" => screenshot_data["md5"]
-          }
-        }
-
-        data["versions"][0]["reviewScreenshot"] = new_screenshot
+        data["versions"][0]["reviewScreenshot"] = screenshot_data
       end
 
       # Now send back the modified hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.65.0.beta.20171110010003
+  version: 2.65.0.beta.20171111010004
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier