fastlane 2.196.0 → 2.212.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470f259a547c6b79dcb0015c1688edcdedd67fce63d7a53d5fe47caee659b233
-  data.tar.gz: 0dfac1fb999ccf2b25ebfd301dcd1347c9d6f67b469b8d785424fa8b26f9a0fb
+  metadata.gz: 698222da63360e54a4d41e791a7ab1b2ac9331b348ef8626831d61a7261872de
+  data.tar.gz: c89309b1a27610bd6f51dfad0b471ac908bbec30e981edf7b56485e5f83738f4
 SHA512:
-  metadata.gz: 8a7e5dec51ab3c6baebc067b7549429947bf471e112251a8eadbee68ac4f2ea79c096e4664321f54e614184d2303d2163e339d2b6d8856c807ed382bf8620d47
-  data.tar.gz: 66090dc209412cce666bf4b29a0bf2f7103ed1dcec60097e01607f46e812d278c70c288a6ba615e891bc857f6ca0dda340e02d882849ab3e642aabd5a9013016
+  metadata.gz: fc46b26354a94f87f630a434fcb0f8387f9d84661da4b01aa9ea72f565a97f864d6fb6f2124a7a9342ae91c3f3c59657452f99c255bf0c418ae5da33d821af32
+  data.tar.gz: 7198cdb4e60bf1c3c5b495307306a2888be696dd924a0e63aae7d787bdbfa5b4468d8a7f661f8fc741b79740801efcc603b32f912d9940a35373ec7230da5bd3

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 The Fastlane Authors
+Copyright (c) 2015-2022 The Fastlane Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -35,23 +35,29 @@ 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='stefan-natchev'>
-<a href='https://github.com/snatchev'>
-<img src='https://github.com/snatchev.png' width='140px;'>
+<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/snatchev'>Stefan Natchev</a></h4>
+<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</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='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/minuscorp'>Jorge Revuelta H</a></h4>
+<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
 </td>
-<td id='jérôme-lacoste'>
-<a href='https://github.com/lacostej'>
-<img src='https://github.com/lacostej.png' width='140px;'>
+<td id='josh-holtz'>
+<a href='https://github.com/joshdholtz'>
+<img src='https://github.com/joshdholtz.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
+<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;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
 </td>
 <td id='olivier-halligon'>
 <a href='https://github.com/AliSoftware'>
@@ -59,25 +65,13 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</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>
 <tr>
-<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='manish-rathi'>
-<a href='https://github.com/crazymanish'>
-<img src='https://github.com/crazymanish.png' width='140px;'>
+<td id='matthew-ellis'>
+<a href='https://github.com/matthewellis'>
+<img src='https://github.com/matthewellis.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/iammanishrathi'>Manish Rathi</a></h4>
+<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
 </td>
 <td id='helmut-januschka'>
 <a href='https://github.com/hjanuschka'>
@@ -85,11 +79,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
 </td>
-<td id='matthew-ellis'>
-<a href='https://github.com/matthewellis'>
-<img src='https://github.com/matthewellis.png' width='140px;'>
+<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/mellis1995'>Matthew Ellis</a></h4>
+<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</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>
+<td id='łukasz-grabowski'>
+<a href='https://github.com/lucgrabowski'>
+<img src='https://github.com/lucgrabowski.png' width='140px;'>
+</a>
+<h4 align='center'>Łukasz Grabowski</h4>
+</td>
+</tr>
+<tr>
+<td id='jan-piotrowski'>
+<a href='https://github.com/janpio'>
+<img src='https://github.com/janpio.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
 </td>
 <td id='kohki-miki'>
 <a href='https://github.com/giginet'>
@@ -97,14 +111,26 @@ 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>
-</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='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/mollyIV'>Daniel Jankowski</a></h4>
 </td>
+<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/minuscorp'>Jorge Revuelta H</a></h4>
+</td>
+</tr>
+<tr>
 <td id='danielle-tomlinson'>
 <a href='https://github.com/endocrimes'>
 <img src='https://github.com/endocrimes.png' width='140px;'>
@@ -117,83 +143,64 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
 </td>
-<td id='jan-piotrowski'>
-<a href='https://github.com/janpio'>
-<img src='https://github.com/janpio.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
-</td>
-<td id='satoshi-namai'>
-<a href='https://github.com/ainame'>
-<img src='https://github.com/ainame.png' width='140px;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/ainame'>Satoshi Namai</a></h4>
-</td>
-</tr>
-<tr>
-<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='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='josh-holtz'>
-<a href='https://github.com/joshdholtz'>
-<img src='https://github.com/joshdholtz.png' width='140px;'>
+<td id='satoshi-namai'>
+<a href='https://github.com/ainame'>
+<img src='https://github.com/ainame.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</a></h4>
+<h4 align='center'><a href='https://twitter.com/ainame'>Satoshi Namai</a></h4>
 </td>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.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/getaaron'>Aaron Brager</a></h4>
+<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</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>
-</tr>
-<tr>
-<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/ott_max'>Max Ott</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='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='jérôme-lacoste'>
+<a href='https://github.com/lacostej'>
+<img src='https://github.com/lacostej.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</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='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='iulian-onofrei'>
-<a href='https://github.com/revolter'>
-<img src='https://github.com/revolter.png' width='140px;'>
+</tr>
+<tr>
+<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/Revolt666'>Iulian Onofrei</a></h4>
+<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
 </td>
-</tr>
 </table>
 
 Special thanks to all [contributors](https://github.com/fastlane/fastlane/graphs/contributors) for extending and improving _fastlane_.

data/cert/lib/cert/runner.rb

@@ -138,24 +138,35 @@ module Cert
     # All certificates of this type
     def certificates
       filter = {
-        certificateType: certificate_type
+        certificateType: certificate_types.join(",")
       }
       return Spaceship::ConnectAPI::Certificate.all(filter: filter)
     end
 
-    # The kind of certificate we're interested in
+    # The kind of certificate we're interested in (for creating)
     def certificate_type
+      return certificate_types.first
+    end
+
+    # The kind of certificates we're interested in (for listing)
+    def certificate_types
       if Cert.config[:type]
         case Cert.config[:type].to_sym
         when :mac_installer_distribution
-          return Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION
+          return [Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION]
         when :developer_id_application
-          return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+          return [
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2,
+            Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
+          ]
         when :developer_id_kext
-          return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_KEXT
+          return [Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_KEXT]
         when :developer_id_installer
-          raise "Cannot do with ASC API?"
-          # return Spaceship.certificate.developer_id_installer
+          if !Spaceship::ConnectAPI.token.nil?
+            raise "As of 2021-11-09, the App Store Connect API does not allow accessing DEVELOPER_ID_INSTALLER with the API Key. Please file an issue on GitHub if this has changed and needs to be updated"
+          else
+            return [Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_INSTALLER]
+          end
         else
           UI.user_error("Unaccepted value for :type - #{Cert.config[:type]}")
         end
@@ -179,7 +190,7 @@ module Cert
         end
       end
 
-      return cert_type
+      return [cert_type]
     end
 
     def create_certificate

data/deliver/lib/assets/ScreenshotsHelp

@@ -1,7 +1,30 @@
-Put all screenshots you want to use inside the folder of its language (e.g. en-US).
-The device type will automatically be recognized using the image resolution. Apple TV screenshots
-should be stored in a subdirectory named appleTV with language folders inside of it. iMessage
-screenshots, like Apple TV screenshots, should also be stored in a subdirectory named iMessage
-with language folders inside of it.
+## Screenshots Naming Rules
 
-The screenshots can be named whatever you want, but keep in mind they are sorted alphabetically.
+Put all screenshots you want to use inside the folder of its language (e.g. `en-US`).
+The device type will automatically be recognized using the image resolution.
+
+The screenshots can be named whatever you want, but keep in mind they are sorted
+alphabetically, in a human-friendly way. See https://github.com/fastlane/fastlane/pull/18200 for more details.
+
+### Exceptions
+
+#### iPad Pro (3rd Gen) 12.9"
+
+Since iPad Pro (3rd Gen) 12.9" and iPad Pro (2nd Gen) 12.9" have the same image
+resolution, screenshots of the iPad Pro (3rd gen) 12.9" must contain either the
+string `iPad Pro (12.9-inch) (3rd generation)`, `IPAD_PRO_3GEN_129`, or `ipadPro129`
+(App Store Connect's internal naming of the display family for the 3rd generation iPad Pro)
+in its filename to be assigned the correct display family and to be uploaded to
+the correct screenshot slot in your app's metadata.
+
+### Other Platforms
+
+#### Apple TV
+
+Apple TV screenshots should be stored in a subdirectory named `appleTV` with language
+folders inside of it.
+
+#### iMessage
+
+iMessage screenshots, like the Apple TV ones, should also be stored in a subdirectory
+named `iMessage`, with language folders inside of it.

data/deliver/lib/deliver/app_screenshot.rb

@@ -23,6 +23,8 @@ module Deliver
       IOS_61 = "iOS-6.1-in"
       # iPhone XS Max
       IOS_65 = "iOS-6.5-in"
+      # iPhone 14 Pro Max
+      IOS_67 = "iOS-6.7-in"
 
       # iPad
       IOS_IPAD = "iOS-iPad"
@@ -47,6 +49,8 @@ module Deliver
       IOS_61_MESSAGES = "iOS-6.1-in-messages"
       # iPhone XS Max iMessage
       IOS_65_MESSAGES = "iOS-6.5-in-messages"
+      # iPhone 14 Pro Max iMessage
+      IOS_67_MESSAGES = "iOS-6.7-in-messages"
 
       # iPad iMessage
       IOS_IPAD_MESSAGES = "iOS-iPad-messages"
@@ -63,6 +67,8 @@ module Deliver
       IOS_APPLE_WATCH = "iOS-Apple-Watch"
       # Apple Watch Series 4
       IOS_APPLE_WATCH_SERIES4 = "iOS-Apple-Watch-Series4"
+      # Apple Watch Series 7
+      IOS_APPLE_WATCH_SERIES7 = "iOS-Apple-Watch-Series7"
 
       # Apple TV
       APPLE_TV = "Apple-TV"
@@ -99,6 +105,7 @@ module Deliver
         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_67 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_IPHONE_67,
         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,
@@ -109,6 +116,7 @@ module Deliver
         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_67_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPHONE_67,
         ScreenSize::IOS_IPAD_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_97,
         ScreenSize::IOS_IPAD_PRO_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_PRO_129,
         ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::IMESSAGE_APP_IPAD_PRO_3GEN_129,
@@ -117,6 +125,7 @@ module Deliver
         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::IOS_APPLE_WATCH_SERIES7 => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_WATCH_SERIES_7,
         ScreenSize::APPLE_TV => Spaceship::ConnectAPI::AppScreenshotSet::DisplayType::APP_APPLE_TV
       }
       return matching[self.screen_size]
@@ -132,6 +141,7 @@ module Deliver
         ScreenSize::IOS_58 => "iPhone XS",
         ScreenSize::IOS_61 => "iPhone XR",
         ScreenSize::IOS_65 => "iPhone XS Max",
+        ScreenSize::IOS_67 => "iPhone 14 Pro Max",
         ScreenSize::IOS_IPAD => "iPad",
         ScreenSize::IOS_IPAD_10_5 => "iPad 10.5",
         ScreenSize::IOS_IPAD_11 => "iPad 11",
@@ -143,6 +153,7 @@ module Deliver
         ScreenSize::IOS_58_MESSAGES => "iPhone XS (iMessage)",
         ScreenSize::IOS_61_MESSAGES => "iPhone XR (iMessage)",
         ScreenSize::IOS_65_MESSAGES => "iPhone XS Max (iMessage)",
+        ScreenSize::IOS_67_MESSAGES => "iPhone 14 Pro Max (iMessage)",
         ScreenSize::IOS_IPAD_MESSAGES => "iPad (iMessage)",
         ScreenSize::IOS_IPAD_PRO_MESSAGES => "iPad Pro (iMessage)",
         ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES => "iPad Pro (12.9-inch) (3rd generation) (iMessage)",
@@ -151,6 +162,7 @@ module Deliver
         ScreenSize::MAC => "Mac",
         ScreenSize::IOS_APPLE_WATCH => "Watch",
         ScreenSize::IOS_APPLE_WATCH_SERIES4 => "Watch Series4",
+        ScreenSize::IOS_APPLE_WATCH_SERIES7 => "Watch Series7",
         ScreenSize::APPLE_TV => "Apple TV"
       }
       return matching[self.screen_size]
@@ -171,6 +183,7 @@ module Deliver
         ScreenSize::IOS_55_MESSAGES,
         ScreenSize::IOS_58_MESSAGES,
         ScreenSize::IOS_65_MESSAGES,
+        ScreenSize::IOS_67_MESSAGES,
         ScreenSize::IOS_IPAD_MESSAGES,
         ScreenSize::IOS_IPAD_PRO_MESSAGES,
         ScreenSize::IOS_IPAD_PRO_12_9_MESSAGES,
@@ -183,6 +196,10 @@ module Deliver
       # This list does not include iPad Pro 12.9-inch (3rd generation)
       # because it has same resoluation as IOS_IPAD_PRO and will clobber
       return {
+        ScreenSize::IOS_67_MESSAGES => [
+          [1290, 2796],
+          [2796, 1290]
+        ],
         ScreenSize::IOS_65_MESSAGES => [
           [1242, 2688],
           [2688, 1242],
@@ -243,6 +260,10 @@ module Deliver
       # This list does not include iPad Pro 12.9-inch (3rd generation)
       # because it has same resoluation as IOS_IPAD_PRO and will clobber
       return {
+        ScreenSize::IOS_67 => [
+          [1290, 2796],
+          [2796, 1290]
+        ],
         ScreenSize::IOS_65 => [
           [1242, 2688],
           [2688, 1242],
@@ -313,6 +334,9 @@ module Deliver
         ScreenSize::IOS_APPLE_WATCH_SERIES4 => [
           [368, 448]
         ],
+        ScreenSize::IOS_APPLE_WATCH_SERIES7 => [
+          [396, 484]
+        ],
         ScreenSize::APPLE_TV => [
           [1920, 1080],
           [3840, 2160]
@@ -322,10 +346,12 @@ module Deliver
 
     def self.resolve_ipadpro_conflict_if_needed(screen_size, filename)
       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,
-        "3GEN" # downloaded screenshots name from App Store Connect API has this
+        "iPad Pro (12.9-inch) (3rd generation)", # Default simulator has this name
+        "iPad Pro (12.9-inch) (4th generation)", # Default simulator has this name
+        "iPad Pro (12.9-inch) (5th generation)", # Default simulator has this name
+        "iPad Pro (12.9-inch) (6th generation)", # Default simulator has this name
+        "IPAD_PRO_3GEN_129", # Screenshots downloaded from App Store Connect has this name
+        "ipadPro129" # Legacy: screenshots downloaded from iTunes Connect used to have this name
       ].any? { |key| filename.include?(key) }
       if is_3rd_gen
         if screen_size == ScreenSize::IOS_IPAD_PRO

data/deliver/lib/deliver/app_screenshot_iterator.rb

@@ -80,7 +80,7 @@ module Deliver
         screenshots_per_display_type = screenshots_for_language.reject { |screenshot| screenshot.device_type.nil? }.group_by(&:device_type)
 
         screenshots_per_display_type.each do |display_type, screenshots|
-          # create AppScreenshotSet for given display_type if it doesn't exsit
+          # create AppScreenshotSet for given display_type if it doesn't exist
           app_screenshot_set = (app_screenshot_set_per_locale_and_display_type[language] || {})[display_type]
           app_screenshot_set ||= localization.create_app_screenshot_set(attributes: { screenshotDisplayType: display_type })
 

data/deliver/lib/deliver/options.rb

@@ -164,8 +164,7 @@ module Deliver
                                      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",
+                                     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,
@@ -173,6 +172,11 @@ module Deliver
                                      description: "Submit the new version for Review after uploading everything",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :verify_only,
+                                     env_name: "DELIVER_VERIFY_ONLY",
+                                     description: "Verifies archive with App Store Connect without uploading",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :reject_if_possible,
                                      env_name: "DELIVER_REJECT_IF_POSSIBLE",
                                      description: "Rejects the previously submitted build if it's in a state where it's possible",