fastlane 2.236.1 → 2.238.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78572beb07948c1146ef8121ee4c3f8bcdb2ef13c8361e9e14fbf2e041372f8c
-  data.tar.gz: 286509c211c9afab401cc2d6dbf951c59af85385ecad675bca954ed0e5a298b0
+  metadata.gz: b83a11ad4335b1a3c678c4a6d0f1aea9f6eb7ccd2fdda1392621a24be1ebc1b9
+  data.tar.gz: 40445027ea32c6b0a7d7c761f3aaa148ada6ac0d868f9d1212e68b1c0ff99940
 SHA512:
-  metadata.gz: 770641af71fdf6943d8d38c2a52fef164e79ae180faa4c136c2a16c925b6ddceb3e819d616bafb570a9067b49a0d03e4d6ff37337f5ea77fb70255e378d9eadc
-  data.tar.gz: 4ca991f3156f0b07e179a052cbd522a9963167e46d4569feb13a8972a76ea4f6cde50f888683f4b825b8619f4dc02757c77cf9f7267b9c2af127fb43bc301b35
+  metadata.gz: 915bb8bfd75b4e65b00c6213c861261aaa0b7e3b4ec5aaadc2c4029d90386d8682240628434983ec8891f5399798e584be4410ed1f37a11deb22d24cf61549e4
+  data.tar.gz: 206b83080b67e0feadc08b65e59e577ee63be8972826a17dc80ac102aeede7da6b11fe67f9b9c53c2ec6052ded492ae2850b78baecb8faa321dbe8904d079e74

data/README.md

@@ -36,23 +36,11 @@ 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='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;'>
+<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/iammanishrathi'>Manish Rathi</a></h4>
+<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
 </td>
 <td id='helmut-januschka'>
 <a href='https://github.com/hjanuschka'>
@@ -60,51 +48,75 @@ 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='manu-wallner'>
-<a href='https://github.com/milch'>
-<img src='https://github.com/milch.png' width='140px;'>
+<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/acrooow'>Manu Wallner</a></h4>
+<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</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='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>
 </tr>
 <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='ł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>
 <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='jimmy-dee'>
-<a href='https://github.com/jdee'>
-<img src='https://github.com/jdee.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'>Jimmy Dee</h4>
+<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
 </td>
-<td id='danielle-tomlinson'>
-<a href='https://github.com/endocrimes'>
-<img src='https://github.com/endocrimes.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/endocrimes'>Danielle Tomlinson</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;'>
+</tr>
+<tr>
+<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/Sujan'>Jan Piotrowski</a></h4>
+<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
 </td>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.png' width='140px;'>
+<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/getaaron'>Aaron Brager</a></h4>
+<h4 align='center'><a href='https://twitter.com/iammanishrathi'>Manish Rathi</a></h4>
 </td>
-</tr>
-<tr>
-<td id='satoshi-namai'>
-<a href='https://github.com/ainame'>
-<img src='https://github.com/ainame.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/ainame'>Satoshi Namai</a></h4>
+<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
 </td>
 <td id='matthew-ellis'>
 <a href='https://github.com/matthewellis'>
@@ -112,31 +124,37 @@ 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='felix-krause'>
-<a href='https://github.com/KrauseFx'>
-<img src='https://github.com/KrauseFx.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/KrauseFx'>Felix Krause</a></h4>
+<h4 align='center'><a href='https://twitter.com/ainame'>Satoshi Namai</a></h4>
 </td>
-<td id='connor-tumbleson'>
-<a href='https://github.com/ibotpeaches'>
-<img src='https://github.com/ibotpeaches.png' width='140px;'>
+</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'><a href='https://twitter.com/ibotpeaches'>Connor Tumbleson</a></h4>
+<h4 align='center'>Jimmy Dee</h4>
 </td>
-<td id='roger-oba'>
-<a href='https://github.com/rogerluan'>
-<img src='https://github.com/rogerluan.png' width='140px;'>
+<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/rogerluan_'>Roger Oba</a></h4>
+<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
 </td>
-</tr>
-<tr>
-<td id='łukasz-grabowski'>
-<a href='https://github.com/lucgrabowski'>
-<img src='https://github.com/lucgrabowski.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'>Łukasz Grabowski</h4>
+<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</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='jorge-revuelta-h'>
 <a href='https://github.com/minuscorp'>
@@ -144,37 +162,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</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='iulian-onofrei'>
-<a href='https://github.com/revolter'>
-<img src='https://github.com/revolter.png' width='140px;'>
+</tr>
+<tr>
+<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/Revolt666'>Iulian Onofrei</a></h4>
+<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
 </td>
-<td id='fumiya-nakamura'>
-<a href='https://github.com/nafu'>
-<img src='https://github.com/nafu.png' width='140px;'>
+<td id='connor-tumbleson'>
+<a href='https://github.com/ibotpeaches'>
+<img src='https://github.com/ibotpeaches.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/ibotpeaches'>Connor Tumbleson</a></h4>
 </td>
-</tr>
-<tr>
-<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='maksym-grebenets'>
-<a href='https://github.com/mgrebenets'>
-<img src='https://github.com/mgrebenets.png' width='140px;'>
+<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/mgrebenets'>Maksym Grebenets</a></h4>
+<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
 </td>
 <td id='max-ott'>
 <a href='https://github.com/max-ott'>
@@ -182,31 +194,19 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
 </td>
+</tr>
+<tr>
 <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='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>
-</tr>
-<tr>
-<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='daniel-jankowski'>
-<a href='https://github.com/mollyIV'>
-<img src='https://github.com/mollyIV.png' width='140px;'>
+<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/mollyIV'>Daniel Jankowski</a></h4>
+<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
 </td>
 </table>
 
@@ -226,6 +226,13 @@ _fastlane_ tracks a few key metrics to understand how developers are using the t
 
 * The number of _fastlane_ runs
 * A salted hash of the app identifier or package name, which helps us anonymously identify unique usage of _fastlane_
+* How _fastlane_ is executed (Swift vs Ruby)
+* The _fastlane_ version
+* How _fastlane_ was installed (Homebrew, gem, bundler, etc)
+* The Ruby version
+* The Operating System in use
+* The Xcode version
+* Whether it was run in non-interactively or interactively
 
 You can easily opt-out of metrics collection by adding `opt_out_usage` at the top of your `Fastfile` or by setting the environment variable `FASTLANE_OPT_OUT_USAGE`. [Check out the metrics code on GitHub](https://github.com/fastlane/fastlane/tree/master/fastlane_core/lib/fastlane_core/analytics)
 

data/deliver/lib/deliver/options.rb

@@ -326,7 +326,7 @@ module Deliver
         # rubocop:disable Layout/LineLength
         FastlaneCore::ConfigItem.new(key: :itc_provider,
                                      env_name: "DELIVER_ITC_PROVIDER",
-                                     description: "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",
+                                     description: "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 `xcrun 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",
                                      optional: true,
                                      code_gen_sensitive: true,
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:itc_provider),

data/fastlane/lib/fastlane/actions/deploygate.rb

@@ -15,13 +15,14 @@ module Fastlane
 
       def self.upload_build(api_token, user_name, binary, options)
         require 'faraday'
-        require 'faraday_middleware'
+        require 'faraday/multipart'
+        require 'faraday/follow_redirects'
 
         connection = Faraday.new(url: DEPLOYGATE_URL_BASE, request: { timeout: 120 }) do |builder|
           builder.request(:multipart)
           builder.request(:json)
           builder.response(:json, content_type: /\bjson$/)
-          builder.use(FaradayMiddleware::FollowRedirects)
+          builder.response(:follow_redirects)
           builder.adapter(:net_http)
         end
 

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

@@ -414,9 +414,9 @@ apple_watch_app_icon('./AppleWatchAppIcon.png')
 
 The platform of your application (a.e. ios, osx).
 
-This option is optional. The default value is "ios" and deliver should be able to figure out the platform from your binary.
+This option is optional. The default value is "ios" and deliver will ignore this option and figure out the platform from your binary if exactly one binary is present.
 
-However, in the case if multiple binaries present, you can specify a platform which you want to deliver explicitly.
+However, in the cases of no binaries or multiple binaries being present, you can specify a platform which you want to deliver explicitly.
 
 The available options:
 
@@ -697,6 +697,8 @@ Key | Editable While Live | Directory | Filename
 - `profanityOrCrudeHumor`
 - `sexualContentGraphicAndNudity`
 - `sexualContentOrNudity`
+- `socialMedia`
+- `socialMediaAgeRestricted`
 - `violenceCartoonOrFantasy`
 - `violenceRealistic`
 - `violenceRealisticProlongedGraphicOrSadistic`
@@ -817,7 +819,9 @@ 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)`, `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.
+For fastlane 2.230.0 and later, screenshots with the shared 12.9-inch iPad Pro resolution are treated as 3rd generation (and later) by default. To upload to the 2nd generation slot, include either `APP_IPAD_PRO_129` or both `12.9` and `2nd generation` in the filename.
+
+> Note: For fastlane versions earlier than 2.230.0, 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/hockey.rb

@@ -9,7 +9,8 @@ module Fastlane
     class HockeyAction < Action
       def self.connection(options)
         require 'faraday'
-        require 'faraday_middleware'
+        require 'faraday/multipart'
+        require 'faraday/follow_redirects'
 
         base_url = options.delete(:bypass_cdn) ? "https://rink.hockeyapp.net" : "https://upload.hockeyapp.net"
         foptions = {
@@ -19,7 +20,7 @@ module Fastlane
           builder.request(:multipart)
           builder.request(:url_encoded)
           builder.response(:json, content_type: /\bjson$/)
-          builder.use(FaradayMiddleware::FollowRedirects)
+          builder.response(:follow_redirects)
           builder.adapter(:net_http)
         end
       end

data/fastlane/lib/fastlane/actions/installr.rb

@@ -23,14 +23,15 @@ module Fastlane
 
       def self.upload_build(params)
         require 'faraday'
-        require 'faraday_middleware'
+        require 'faraday/multipart'
+        require 'faraday/follow_redirects'
 
         url = INSTALLR_API
         connection = Faraday.new(url) do |builder|
           builder.request(:multipart)
           builder.request(:url_encoded)
           builder.response(:json, content_type: /\bjson$/)
-          builder.use(FaradayMiddleware::FollowRedirects)
+          builder.response(:follow_redirects)
           builder.adapter(:net_http)
         end
 

data/fastlane/lib/fastlane/actions/mailgun.rb

@@ -137,6 +137,7 @@ module Fastlane
           params.store(:attachment, attachments)
         end
 
+        require 'faraday/multipart'
         conn = Faraday.new(url: "https://api:#{options[:apikey]}@api.mailgun.net") do |f|
           f.request(:multipart)
           f.request(:url_encoded)

data/fastlane/lib/fastlane/actions/notarize.rb

@@ -4,7 +4,6 @@ module Fastlane
       # rubocop:disable Metrics/PerceivedComplexity
       def self.run(params)
         package_path = params[:package]
-        bundle_id = params[:bundle_id]
         skip_stapling = params[:skip_stapling]
         print_log = params[:print_log]
         verbose = params[:verbose]
@@ -15,7 +14,7 @@ module Fastlane
         end
         api_key = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path])
 
-        # Compress and read bundle identifier only for .app bundle.
+        # Compress only if .app bundle
         compressed_package_path = nil
         if File.extname(package_path) == '.app'
           compressed_package_path = "#{package_path}.zip"
@@ -23,22 +22,12 @@ module Fastlane
             "ditto -c -k --rsrc --keepParent \"#{package_path}\" \"#{compressed_package_path}\"",
             log: verbose
           )
-
-          unless bundle_id
-            info_plist_path = File.join(package_path, 'Contents', 'Info.plist')
-            bundle_id = Actions.sh(
-              "/usr/libexec/PlistBuddy -c \"Print :CFBundleIdentifier\" \"#{info_plist_path}\"",
-              log: verbose
-            ).strip
-          end
         end
 
-        UI.user_error!('Could not read bundle identifier, provide as a parameter') unless bundle_id
-
-        notarytool(params, package_path, bundle_id, skip_stapling, print_log, verbose, api_key, compressed_package_path)
+        notarytool(params, package_path, skip_stapling, print_log, verbose, api_key, compressed_package_path)
       end
 
-      def self.notarytool(params, package_path, bundle_id, skip_stapling, print_log, verbose, api_key, compressed_package_path)
+      def self.notarytool(params, package_path, skip_stapling, print_log, verbose, api_key, compressed_package_path)
         temp_file = nil
 
         # Create authorization part of command with either API Key or Apple ID
@@ -154,10 +143,6 @@ module Fastlane
                                        optional: true,
                                        default_value: false,
                                        type: Boolean),
-          FastlaneCore::ConfigItem.new(key: :bundle_id,
-                                       env_name: 'FL_NOTARIZE_BUNDLE_ID',
-                                       description: 'Bundle identifier to uniquely identify the package',
-                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: 'FL_NOTARIZE_USERNAME',
                                        description: 'Apple ID username',

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -11,6 +11,10 @@ module Fastlane
         ['Device ID', 'Device Name', 'Device Platform']
       end
 
+      def self.ignored_line?(row)
+        row.all? { |value| value.to_s.strip.empty? } || row.first.to_s.strip.start_with?('#')
+      end
+
       def self.run(params)
         platform = Spaceship::ConnectAPI::BundleIdPlatform.map(params[:platform])
 
@@ -22,6 +26,7 @@ module Fastlane
           require 'csv'
 
           devices_file = CSV.read(File.expand_path(File.join(params[:devices_file])), col_sep: "\t")
+          devices_file = devices_file.reject { |row| ignored_line?(row) }
           unless devices_file.first == file_column_headers.first(2) || devices_file.first == file_column_headers
             UI.user_error!("Please provide a file according to the Apple Sample UDID file (https://developer.apple.com/account/resources/downloads/Multiple-Upload-Samples.zip)")
           end
@@ -55,8 +60,14 @@ module Fastlane
         existing_devices = Spaceship::ConnectAPI::Device.all
 
         device_objs = new_devices.map do |device|
-          if existing_devices.map(&:udid).map(&:downcase).include?(device[0].downcase)
-            UI.verbose("UDID #{device[0]} already exists - Skipping...")
+          normalized_udid = device[0].tr("-", "")
+          existing_device = existing_devices.find do |ed|
+            ed.udid.tr("-", "").casecmp(normalized_udid).zero?
+          end
+
+          if existing_device
+            UI.verbose("UDID #{existing_device.udid} already exists - Skipping...")
+
             next
           end
 
@@ -74,8 +85,12 @@ module Fastlane
           try_create_device(name: device[1], platform: device_platform, udid: device[0])
         end
 
-        UI.success("Successfully registered new devices.")
-        return device_objs
+        if device_objs.compact.empty?
+          UI.success("No new devices to register")
+        else
+          UI.success("Successfully registered new devices.")
+        end
+        return device_objs.compact
       end
 
       def self.try_create_device(name: nil, platform: nil, udid: nil)
@@ -169,7 +184,8 @@ module Fastlane
         [
           "This will register iOS/Mac devices with the Developer Portal so that you can include them in your provisioning profiles.",
           "This is an optimistic action, in that it will only ever add new devices to the member center, and never remove devices. If a device which has already been registered within the member center is not passed to this action, it will be left alone in the member center and continue to work.",
-          "The action will connect to the Apple Developer Portal using the username you specified in your `Appfile` with `apple_id`, but you can override it using the `username` option, or by setting the env variable `ENV['DELIVER_USER']`."
+          "The action will connect to the Apple Developer Portal using the username you specified in your `Appfile` with `apple_id`, but you can override it using the `username` option, or by setting the env variable `ENV['DELIVER_USER']`.",
+          "When using `devices_file`, blank lines and lines starting with `#` are ignored, so you can group devices, add notes, or comment out a device row without removing it."
         ].join("\n")
       end
 

data/fastlane/lib/fastlane/actions/setup_ci.rb

@@ -41,7 +41,7 @@ module Fastlane
         UI.message("Creating temporary keychain: \"#{keychain_name}\".")
         Actions::CreateKeychainAction.run(
           name: keychain_name,
-          default_keychain: true,
+          default_keychain: params[:set_default_keychain],
           unlock: true,
           timeout: params[:timeout],
           lock_when_sleeps: true,
@@ -113,7 +113,12 @@ module Fastlane
                                        env_name: "FL_SETUP_CI_KEYCHAIN_NAME",
                                        description: "Set a custom keychain name",
                                        type: String,
-                                       default_value: "fastlane_tmp_keychain")
+                                       default_value: "fastlane_tmp_keychain"),
+          FastlaneCore::ConfigItem.new(key: :set_default_keychain,
+                                       env_name: "FL_SETUP_CI_SET_DEFAULT_KEYCHAIN",
+                                       description: "Set the temporary keychain as the system default",
+                                       type: Boolean,
+                                       default_value: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/spm.rb

@@ -10,6 +10,7 @@ module Fastlane
         cmd << "--package-path #{params[:package_path]}" if params[:package_path]
         cmd << "--configuration #{params[:configuration]}" if params[:configuration]
         cmd << "--disable-sandbox" if params[:disable_sandbox]
+        cmd << "--skip-update" if params[:skip_update]
         cmd << "--verbose" if params[:verbose]
         cmd << "--very-verbose" if params[:very_verbose]
         if params[:simulator]
@@ -113,6 +114,11 @@ module Fastlane
                                        description: "Pass in xcpretty additional command line arguments (e.g. '--test --no-color' or '--tap --no-utf'), requires xcpretty_output to be specified also",
                                        type: String,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :skip_update,
+                                       env_name: "FL_SPM_SKIP_UPDATE",
+                                       description: "Skip updating dependencies from their remote during a resolution",
+                                       type: Boolean,
+                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        short_option: "-v",
                                        env_name: "FL_SPM_VERBOSE",

data/fastlane/lib/fastlane/actions/swiftlint.rb

@@ -37,6 +37,8 @@ module Fastlane
           command << " --use-script-input-files"
         end
 
+        command << path_argument(params) if params[:path]
+
         command << " > #{params[:output_file].shellescape}" if params[:output_file]
 
         begin
@@ -49,7 +51,6 @@ module Fastlane
 
       def self.optional_flags(params)
         command = ""
-        command << " --path #{params[:path].shellescape}" if params[:path]
         command << supported_option_switch(params, :strict, "0.9.2", true)
         command << " --config #{params[:config_file].shellescape}" if params[:config_file]
         command << " --reporter #{params[:reporter]}" if params[:reporter]
@@ -61,6 +62,14 @@ module Fastlane
         return command
       end
 
+      def self.path_argument(params)
+        escaped_path = params[:path].shellescape
+        version = swiftlint_version(executable: params[:executable])
+        return " --path #{escaped_path}" if version < Gem::Version.new('0.48.0')
+
+        " #{escaped_path}"
+      end
+
       # Get current SwiftLint version
       def self.swiftlint_version(executable: nil)
         binary = executable || 'swiftlint'

data/fastlane/lib/fastlane/actions/testfairy.rb

@@ -9,16 +9,18 @@ module Fastlane
     class TestfairyAction < Action
       def self.upload_build(upload_url, ipa, options, timeout)
         require 'faraday'
-        require 'faraday_middleware'
+        require 'faraday/multipart'
+        require 'faraday/retry'
+        require 'faraday/follow_redirects'
 
         UI.success("Uploading to #{upload_url}...")
 
         connection = Faraday.new(url: upload_url) do |builder|
           builder.request(:multipart)
           builder.request(:url_encoded)
-          builder.request(:retry, max: 3, interval: 5)
+          builder.request(:retry, { max: 3, interval: 5 })
           builder.response(:json, content_type: /\bjson$/)
-          builder.use(FaradayMiddleware::FollowRedirects)
+          builder.response(:follow_redirects)
           builder.adapter(:net_http)
         end