fastlane 2.196.0 → 2.199.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 470f259a547c6b79dcb0015c1688edcdedd67fce63d7a53d5fe47caee659b233
-  data.tar.gz: 0dfac1fb999ccf2b25ebfd301dcd1347c9d6f67b469b8d785424fa8b26f9a0fb
+  metadata.gz: fcbdda77dc3e29ac8d1ce7440033a3f95f610e367bbffb6cd9156899993b8311
+  data.tar.gz: 7eb108144336aa3038db856ae2ac36894095db6e8bf57b1dceb39b2b2e079abd
 SHA512:
-  metadata.gz: 8a7e5dec51ab3c6baebc067b7549429947bf471e112251a8eadbee68ac4f2ea79c096e4664321f54e614184d2303d2163e339d2b6d8856c807ed382bf8620d47
-  data.tar.gz: 66090dc209412cce666bf4b29a0bf2f7103ed1dcec60097e01607f46e812d278c70c288a6ba615e891bc857f6ca0dda340e02d882849ab3e642aabd5a9013016
+  metadata.gz: 666df49eb19bb007a66bb4105ceb30330c609bd3d1105ed4a6ce295b48a7bdc01335199ec0a59d50fc75ff166d6f66155dbc336f4cfe71b65798a95f330b044c
+  data.tar.gz: a451304146470f1a8da8c2cdec8329a02b73bba9262641161eb0b884581d48b9cae404ad01e08bdf32d9ab58314bdaf4b645a61c4e50cc8aedf5d9113d2aa015

data/README.md

@@ -35,55 +35,17 @@ 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;'>
-</a>
-<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</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>
-<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='olivier-halligon'>
-<a href='https://github.com/AliSoftware'>
-<img src='https://github.com/AliSoftware.png' width='140px;'>
-</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;'>
 </a>
 <h4 align='center'><a href='https://twitter.com/iammanishrathi'>Manish Rathi</a></h4>
 </td>
-<td id='helmut-januschka'>
-<a href='https://github.com/hjanuschka'>
-<img src='https://github.com/hjanuschka.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/hjanuschka'>Helmut Januschka</a></h4>
+<h4 align='center'><a href='https://twitter.com/ainame'>Satoshi Namai</a></h4>
 </td>
 <td id='matthew-ellis'>
 <a href='https://github.com/matthewellis'>
@@ -91,51 +53,63 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
 </td>
-<td id='kohki-miki'>
-<a href='https://github.com/giginet'>
-<img src='https://github.com/giginet.png' width='140px;'>
+<td id='helmut-januschka'>
+<a href='https://github.com/hjanuschka'>
+<img src='https://github.com/hjanuschka.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
+<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
+</td>
+<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/Revolt666'>Iulian Onofrei</a></h4>
 </td>
 </tr>
 <tr>
-<td id='daniel-jankowski'>
-<a href='https://github.com/mollyIV'>
-<img src='https://github.com/mollyIV.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/mollyIV'>Daniel Jankowski</a></h4>
+<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
 </td>
-<td id='danielle-tomlinson'>
-<a href='https://github.com/endocrimes'>
-<img src='https://github.com/endocrimes.png' width='140px;'>
+<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/endocrimes'>Danielle Tomlinson</a></h4>
+<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
 </td>
-<td id='fumiya-nakamura'>
-<a href='https://github.com/nafu'>
-<img src='https://github.com/nafu.png' width='140px;'>
+<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/nafu003'>Fumiya Nakamura</a></h4>
+<h4 align='center'><a href='https://twitter.com/mollyIV'>Daniel Jankowski</a></h4>
 </td>
-<td id='jan-piotrowski'>
-<a href='https://github.com/janpio'>
-<img src='https://github.com/janpio.png' width='140px;'>
+<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/Sujan'>Jan Piotrowski</a></h4>
+<h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
 </td>
-<td id='satoshi-namai'>
-<a href='https://github.com/ainame'>
-<img src='https://github.com/ainame.png' width='140px;'>
+<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/ainame'>Satoshi Namai</a></h4>
+<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
 </td>
 </tr>
 <tr>
-<td id='luka-mirosevic'>
-<a href='https://github.com/lmirosevic'>
-<img src='https://github.com/lmirosevic.png' width='140px;'>
+<td id='olivier-halligon'>
+<a href='https://github.com/AliSoftware'>
+<img src='https://github.com/AliSoftware.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
+<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
+</td>
+<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='felix-krause'>
 <a href='https://github.com/KrauseFx'>
@@ -143,17 +117,25 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/KrauseFx'>Felix Krause</a></h4>
 </td>
+<td id='danielle-tomlinson'>
+<a href='https://github.com/endocrimes'>
+<img src='https://github.com/endocrimes.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
+</td>
 <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/joshdholtz'>Josh Holtz</a></h4>
 </td>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.png' width='140px;'>
+</tr>
+<tr>
+<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/getaaron'>Aaron Brager</a></h4>
+<h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
 </td>
 <td id='jimmy-dee'>
 <a href='https://github.com/jdee'>
@@ -161,37 +143,55 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'>Jimmy Dee</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='kohki-miki'>
+<a href='https://github.com/giginet'>
+<img src='https://github.com/giginet.png' width='140px;'>
+</a>
+<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</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>
 </tr>
 <tr>
-<td id='max-ott'>
-<a href='https://github.com/max-ott'>
-<img src='https://github.com/max-ott.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/ott_max'>Max Ott</a></h4>
+<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
 </td>
-<td id='andrew-mcburney'>
-<a href='https://github.com/armcburney'>
-<img src='https://github.com/armcburney.png' width='140px;'>
+<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/armcburney'>Andrew McBurney</a></h4>
+<h4 align='center'><a href='https://twitter.com/rogerluan_'>Roger Oba</a></h4>
 </td>
-<td id='manu-wallner'>
-<a href='https://github.com/milch'>
-<img src='https://github.com/milch.png' width='140px;'>
+<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/acrooow'>Manu Wallner</a></h4>
+<h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
 </td>
-<td id='joshua-liebowitz'>
-<a href='https://github.com/taquitos'>
-<img src='https://github.com/taquitos.png' width='140px;'>
+<td id='fumiya-nakamura'>
+<a href='https://github.com/nafu'>
+<img src='https://github.com/nafu.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
+<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
 </td>
-<td id='iulian-onofrei'>
-<a href='https://github.com/revolter'>
-<img src='https://github.com/revolter.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/Revolt666'>Iulian Onofrei</a></h4>
+<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
 </td>
 </tr>
 </table>

data/cert/lib/cert/runner.rb

@@ -154,8 +154,11 @@ module Cert
         when :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

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

@@ -322,10 +322,11 @@ 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_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/runner.rb

@@ -186,7 +186,7 @@ module Deliver
       end
 
       transporter = transporter_for_selected_team
-      result = transporter.upload(package_path: package_path)
+      result = transporter.upload(package_path: package_path, asset_path: upload_ipa || upload_pkg)
 
       unless result
         transporter_errors = transporter.displayable_errors

data/deliver/lib/deliver/upload_screenshots.rb

@@ -157,7 +157,7 @@ module Deliver
 
       UI.verbose('Uploading jobs are completed')
 
-      Helper.show_loading_indicator("Waiting for all the screenshots processed...")
+      Helper.show_loading_indicator("Waiting for all the screenshots to finish being processed...")
       states = wait_for_complete(iterator)
       Helper.hide_loading_indicator
       retry_upload_screenshots_if_needed(iterator, states, total_number_of_screenshots, tries, localizations, screenshots_per_language)

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -694,7 +694,7 @@ In this case, default values for keywords, urls, name and release notes are used
 
 [Starting March 20, 2019 Apple's App Store](https://developer.apple.com/news/?id=03202019a) requires 12.9-inch iPad Pro (3rd generation) screenshots additionally to the iPad Pro 2nd generation [screenshots](https://help.apple.com/app-store-connect/#/devd274dd925). As fastlane historically uses the screenshot dimensions to determine the "display family" of a screenshot, this poses a problem as both use the same dimensions and are recognized as the same device family.
 
-To solve this a screenshot of a 12.9-inch iPad Pro (3rd generation) must contain either the string `iPad Pro (12.9-inch) (3rd generation)` or `ipadPro129` (Apple'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.
+To solve this a screenshot of a 12.9-inch iPad Pro (3rd generation) must contain either the string `iPad Pro (12.9-inch) (3rd generation)`, `IPAD_PRO_3GEN_129`, or `ipadPro129` (Apple'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.
 
 ## Automatically create screenshots
 

data/fastlane/lib/fastlane/actions/download_dsyms.rb

@@ -12,11 +12,18 @@ module Fastlane
         require 'net/http'
         require 'date'
 
-        # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
-        # Prompts select team if multiple teams and none specified
-        UI.message("Login to App Store Connect (#{params[:username]})")
-        Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true)
-        UI.message("Login successful")
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
+          UI.message("Creating authorization token for App Store Connect API")
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
+        else
+          # Team selection passed though FASTLANE_ITC_TEAM_ID and FASTLANE_ITC_TEAM_NAME environment variables
+          # Prompts select team if multiple teams and none specified
+          UI.message("Login to App Store Connect (#{params[:username]})")
+          Spaceship::ConnectAPI.login(params[:username], use_portal: false, use_tunes: true)
+          UI.message("Login successful")
+        end
 
         # Get App
         app = Spaceship::ConnectAPI::App.find(params[:app_identifier])
@@ -68,10 +75,11 @@ module Fastlane
 
         filter = { app: app.id }
         filter["preReleaseVersion.platform"] = platform
-        build_resps = Spaceship::ConnectAPI.get_builds(filter: filter, sort: "-uploadedDate", includes: "preReleaseVersion").all_pages
-        builds = build_resps.flat_map(&:to_models)
+        filter["preReleaseVersion.version"] = version if version
+        filter["version"] = build_number if build_number
+        build_resp = Spaceship::ConnectAPI.get_builds(filter: filter, sort: "-uploadedDate", includes: "preReleaseVersion,buildBundles")
 
-        builds.each do |build|
+        build_resp.all_pages_each do |build|
           asc_app_version = build.app_version
           asc_build_number = build.version
           uploaded_date = DateTime.parse(build.uploaded_date)
@@ -107,46 +115,37 @@ module Fastlane
           end
 
           UI.verbose("Build_version: #{asc_build_number} matches #{build_number}, grabbing dsym_url") if build_number
-          get_details_and_download_dsym(app: app, train: asc_app_version, build_number: asc_build_number, uploaded_date: uploaded_date, platform: itc_platform, wait_for_dsym_processing: wait_for_dsym_processing, wait_timeout: wait_timeout, output_directory: output_directory)
+          download_dsym(build: build, app: app, wait_for_dsym_processing: wait_for_dsym_processing, wait_timeout: wait_timeout, output_directory: output_directory)
         end
       end
 
-      def self.get_details_and_download_dsym(app: nil, train: nil, build_number: nil, uploaded_date: nil, platform: nil, wait_for_dsym_processing: nil, wait_timeout: nil, output_directory: nil)
+      def self.download_dsym(build: nil, app: nil, wait_for_dsym_processing: nil, wait_timeout: nil, output_directory: nil)
         start = Time.now
-        download_url = nil
+        dsym_urls = []
 
         loop do
-          begin
-            resp = Spaceship::Tunes.client.build_details(app_id: app.id, train: train, build_number: build_number, platform: platform)
-
-            resp['apple_id'] = app.id
-            build_details = Spaceship::Tunes::BuildDetails.factory(resp)
-
-            download_url = build_details.dsym_url
-            UI.verbose("dsym_url: #{download_url}")
-          rescue Spaceship::TunesClient::ITunesConnectError => ex
-            UI.error("Error accessing dSYM file for build\n\n#{build}\n\nException: #{ex}")
+          build_bundles = build.build_bundles.select { |b| b.includes_symbols == true }
+          dsym_urls = build_bundles.map(&:dsym_url).compact
+
+          break if build_bundles.count == dsym_urls.count
+
+          if !wait_for_dsym_processing || (Time.now - start) > wait_timeout
+            # In some cases, AppStoreConnect does not process the dSYMs, thus no error should be thrown.
+            UI.message("Could not find any dSYM for #{build.version} (#{build.app_version})")
+            break
+          else
+            UI.message("Waiting for dSYM file to appear...")
+            sleep(30) unless FastlaneCore::Helper.is_test?
+            build = Spaceship::ConnectAPI::Build.get(build_id: build.id)
           end
-
-          unless download_url
-            if !wait_for_dsym_processing || (Time.now - start) > wait_timeout
-              # In some cases, AppStoreConnect does not process the dSYMs, thus no error should be thrown.
-              UI.message("Could not find any dSYM for #{build_number} (#{train})")
-            else
-              UI.message("Waiting for dSYM file to appear...")
-              sleep(30)
-              next
-            end
-          end
-
-          break
         end
 
-        if download_url
-          self.download(download_url, app.bundle_id, train, build_number, uploaded_date, output_directory)
-          return if build_number
+        if dsym_urls.count == 0
+          UI.message("No dSYM URL for #{build.version} (#{build.app_version})")
         else
-          UI.message("No dSYM URL for #{build_number} (#{train})")
+          dsym_urls.each do |url|
+            self.download(url, build, app, output_directory)
+          end
         end
       end
       # rubocop:enable Metrics/PerceivedComplexity
@@ -154,7 +153,7 @@ module Fastlane
       def self.get_latest_build!(app_id: nil, platform: nil)
         filter = { app: app_id }
         filter["preReleaseVersion.platform"] = platform
-        latest_build = Spaceship::ConnectAPI.get_builds(filter: filter, sort: "-uploadedDate", includes: "preReleaseVersion").first
+        latest_build = Spaceship::ConnectAPI.get_builds(filter: filter, sort: "-uploadedDate", includes: "preReleaseVersion,buildBundles").first
 
         if latest_build.nil?
           UI.user_error!("Could not find any build for platform #{platform}") if platform
@@ -164,18 +163,18 @@ module Fastlane
         return latest_build
       end
 
-      def self.download(download_url, bundle_id, train_number, build_version, uploaded_date, output_directory)
+      def self.download(download_url, build, app, output_directory)
         result = self.download_file(download_url)
-        path   = write_dsym(result, bundle_id, train_number, build_version, output_directory)
-        UI.success("🔑  Successfully downloaded dSYM file for #{train_number} - #{build_version} to '#{path}'")
+        path   = write_dsym(result, app.bundle_id, build.app_version, build.version, output_directory)
+        UI.success("🔑  Successfully downloaded dSYM file for #{build.app_version} - #{build.version} to '#{path}'")
 
         Actions.lane_context[SharedValues::DSYM_PATHS] ||= []
         Actions.lane_context[SharedValues::DSYM_PATHS] << File.expand_path(path)
 
-        unless uploaded_date.nil?
-          Actions.lane_context[SharedValues::DSYM_LATEST_UPLOADED_DATE] ||= uploaded_date
+        unless build.uploaded_date.nil?
+          Actions.lane_context[SharedValues::DSYM_LATEST_UPLOADED_DATE] ||= build.uploaded_date
           current_latest = Actions.lane_context[SharedValues::DSYM_LATEST_UPLOADED_DATE]
-          Actions.lane_context[SharedValues::DSYM_LATEST_UPLOADED_DATE] = [current_latest, uploaded_date].max
+          Actions.lane_context[SharedValues::DSYM_LATEST_UPLOADED_DATE] = [current_latest, build.uploaded_date].max
           UI.verbose("Most recent build uploaded_date #{Actions.lane_context[SharedValues::DSYM_LATEST_UPLOADED_DATE]}")
         end
       end
@@ -234,6 +233,23 @@ module Fastlane
         user ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
 
         [
+          FastlaneCore::ConfigItem.new(key: :api_key_path,
+                                       env_names: ["DOWNLOAD_DSYMS_API_KEY_PATH", "APP_STORE_CONNECT_API_KEY_PATH"],
+                                       description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
+                                       optional: true,
+                                       conflicting_options: [:api_key],
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :api_key,
+                                       env_names: ["DOWNLOAD_DSYMS_API_KEY", "APP_STORE_CONNECT_API_KEY"],
+                                       description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
+                                       type: Hash,
+                                       default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+                                       default_value_dynamic: true,
+                                       optional: true,
+                                       sensitive: true,
+                                       conflicting_options: [:api_key_path]),
           FastlaneCore::ConfigItem.new(key: :username,
                                        short_option: "-u",
                                        env_name: "DOWNLOAD_DSYMS_USERNAME",

data/fastlane/lib/fastlane/actions/ensure_xcode_version.rb

@@ -75,7 +75,7 @@ module Fastlane
         [
           "If building your app requires a specific version of Xcode, you can invoke this command before using gym.",
           "For example, to ensure that a beta version of Xcode is not accidentally selected to build, which would make uploading to TestFlight fail.",
-          "You can either manually provide a specific version using `version: ` or you make use of the `.xcode-version` file.",
+          "You can either manually provide a specific version using `version:` or you make use of the `.xcode-version` file.",
           "Using the `strict` parameter, you can either verify the full set of version numbers strictly (i.e. `11.3.1`) or only a subset of them (i.e. `11.3` or `11`)."
         ].join("\n")
       end

data/fastlane/lib/fastlane/actions/get_push_certificate.rb

@@ -60,7 +60,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac].include?(platform)
       end
 
       def self.example_code

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -109,8 +109,10 @@ module Fastlane
           options = plist_files.keys
           selected = UI.select("What build configuration would you like to use?", options)
           plist_file = plist_files[selected]
-        else
+        elsif plist_files_count > 0
           plist_file = plist_files.values.first
+        else
+          return nil
         end
 
         # $(SRCROOT) is the path of where the XcodeProject is
@@ -131,6 +133,8 @@ module Fastlane
       end
 
       def self.get_version_number_from_plist!(plist_file)
+        return '$(MARKETING_VERSION)' if plist_file.nil?
+
         plist = Xcodeproj::Plist.read_from_path(plist_file)
         UI.user_error!("Unable to read plist: #{plist_file}") unless plist
 
@@ -146,7 +150,7 @@ module Fastlane
       end
 
       def self.details
-        "This action will return the current version number set on your project."
+        "This action will return the current version number set on your project. It first looks in the plist and then for '$(MARKETING_VERSION)' in the build settings."
       end
 
       def self.available_options