fastlane 2.237.0 → 2.239.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b25f32992804c871d4846acd7d3661e7549ed5012323d93b02ea4d545e57513
-  data.tar.gz: db58ec0cdc765c9ca09fde8b45771de859a1e752f30607495a008e957ea4ec95
+  metadata.gz: bc5b46c829520975d6ad2871bf94e7bc3df0f4d2863dcbed323e2b22c2205931
+  data.tar.gz: 98f468374c8356ba200173ef637157a9e33747d4a46f3b89b70d4bc407367c47
 SHA512:
-  metadata.gz: 3e6e654e96e3c57b1e93f624e0bffb0e93a5e7e984578c4e32d2c6831ebe54982e7d4d5c1752e47451f6d15be37e71b23a59eb6db98861206697bb98c1636bdb
-  data.tar.gz: eee3973f328a2de3105a650295ecca9c0dd682c551fe28580ff8c8cc610e9988fa17fd09188e4895145b9c822964a09a13a4e92b70c60d15fc519f6ec202be46
+  metadata.gz: c03a7a56e6229a7c03f053340e74c8f146c1e4b0149dc0523d75370fa5d755f77c571e0c7a974c955c42fab6fd8d1668823dde0cd031a573e2b1340105c76f69
+  data.tar.gz: bc86b7ea3505cf0fd59c0d22ab2ae3324f16b77170abfa4fffcae1cce948d561ea4c436b92cca599d67838e3d6ab59328e42a418be04f4abef90a1d9378b5a26

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='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/ibotpeaches'>Connor Tumbleson</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='matthew-ellis'>
-<a href='https://github.com/matthewellis'>
-<img src='https://github.com/matthewellis.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/mellis1995'>Matthew Ellis</a></h4>
+<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
 </td>
 <td id='josh-holtz'>
 <a href='https://github.com/joshdholtz'>
@@ -60,57 +48,31 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</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='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='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='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='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='luka-mirosevic'>
-<a href='https://github.com/lmirosevic'>
-<img src='https://github.com/lmirosevic.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/lmirosevic'>Luka Mirosevic</a></h4>
+<h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></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='stefan-natchev'>
-<a href='https://github.com/snatchev'>
-<img src='https://github.com/snatchev.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/snatchev'>Stefan Natchev</a></h4>
+<h4 align='center'><a href='https://twitter.com/rogerluan_'>Roger Oba</a></h4>
 </td>
 <td id='max-ott'>
 <a href='https://github.com/max-ott'>
@@ -118,95 +80,133 @@ 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>
-<td id='roger-oba'>
-<a href='https://github.com/rogerluan'>
-<img src='https://github.com/rogerluan.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/rogerluan_'>Roger Oba</a></h4>
+<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</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='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/lacostej'>Jérôme Lacoste</a></h4>
+<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
 </td>
-</tr>
-<tr>
 <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>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.png' width='140px;'>
+</tr>
+<tr>
+<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/getaaron'>Aaron Brager</a></h4>
+<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
 </td>
-<td id='daniel-jankowski'>
-<a href='https://github.com/mollyIV'>
-<img src='https://github.com/mollyIV.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/mollyIV'>Daniel Jankowski</a></h4>
+<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
 </td>
-<td id='manish-rathi'>
-<a href='https://github.com/crazymanish'>
-<img src='https://github.com/crazymanish.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/iammanishrathi'>Manish Rathi</a></h4>
+<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
 </td>
-<td id='danielle-tomlinson'>
-<a href='https://github.com/endocrimes'>
-<img src='https://github.com/endocrimes.png' width='140px;'>
+<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/endocrimes'>Danielle Tomlinson</a></h4>
+<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</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>
 </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>
 <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>
-<td id='helmut-januschka'>
-<a href='https://github.com/hjanuschka'>
-<img src='https://github.com/hjanuschka.png' width='140px;'>
+<td id='łukasz-grabowski'>
+<a href='https://github.com/lucgrabowski'>
+<img src='https://github.com/lucgrabowski.png' width='140px;'>
 </a>
-<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
+<h4 align='center'>Łukasz Grabowski</h4>
 </td>
-<td id='andrew-mcburney'>
-<a href='https://github.com/armcburney'>
-<img src='https://github.com/armcburney.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/armcburney'>Andrew McBurney</a></h4>
+<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
 </td>
-<td id='olivier-halligon'>
-<a href='https://github.com/AliSoftware'>
-<img src='https://github.com/AliSoftware.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/aligatr'>Olivier Halligon</a></h4>
+<h4 align='center'><a href='https://twitter.com/iammanishrathi'>Manish Rathi</a></h4>
 </td>
-<td id='jimmy-dee'>
-<a href='https://github.com/jdee'>
-<img src='https://github.com/jdee.png' width='140px;'>
+</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'>Jimmy Dee</h4>
+<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;'>
+</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>
+<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='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/ibotpeaches'>Connor Tumbleson</a></h4>
 </td>
 </tr>
 <tr>
-<td id='fumiya-nakamura'>
-<a href='https://github.com/nafu'>
-<img src='https://github.com/nafu.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/nafu003'>Fumiya Nakamura</a></h4>
+<h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
 </td>
-<td id='łukasz-grabowski'>
-<a href='https://github.com/lucgrabowski'>
-<img src='https://github.com/lucgrabowski.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'>Łukasz Grabowski</h4>
+<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</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/bin/fastlane

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-if RUBY_VERSION < '3.0.0'
-  abort("fastlane requires Ruby 3.0.0 or higher")
+if RUBY_VERSION < '3.1.0'
+  abort("fastlane requires Ruby 3.1.0 or higher")
 end
 
 def self.windows?

data/deliver/lib/deliver/html_generator.rb

@@ -24,7 +24,7 @@ module Deliver
       UI.important("Verifying the upload via the HTML file can be disabled by either adding")
       UI.important("`force true` to your Deliverfile or using `fastlane deliver --force`")
 
-      system("open '#{html_path}'")
+      system("open", html_path)
       okay = UI.confirm("Does the Preview on path '#{html_path}' look okay for you?")
 
       if okay

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),
@@ -420,6 +420,14 @@ module Deliver
                                      env_name: "DELIVER_APP_REVIEW_ATTACHMENT_FILE",
                                      description: "Metadata: Path to the app review attachment file",
                                      optional: true),
+        FastlaneCore::ConfigItem.new(key: :routing_app_coverage_file,
+                                     env_name: "DELIVER_ROUTING_APP_COVERAGE_FILE",
+                                     description: "Metadata: Path to the routing app coverage file (`.geojson`) that is required for routing apps",
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Could not find routing app coverage file at path '#{File.expand_path(value)}'") unless File.exist?(value)
+                                       UI.user_error!("Routing app coverage file must be a .geojson file") unless File.extname(value).casecmp(".geojson").zero?
+                                     end),
         # Localised
         FastlaneCore::ConfigItem.new(key: :description,
                                      description: "Metadata: The localised app description",

data/deliver/lib/deliver/upload_metadata.rb

@@ -357,6 +357,7 @@ module Deliver
       review_information(version)
       app_clip_review_information(version)
       review_attachment_file(version)
+      routing_app_coverage_file(version)
       app_rating(app_info)
     end
 
@@ -766,6 +767,27 @@ module Deliver
       end
     end
 
+    def routing_app_coverage_file(version)
+      # Skip logic entirely if no coverage file passed. So status-quo stays the same.
+      return unless options[:routing_app_coverage_file]
+
+      routing_app_coverage =
+        begin
+          version.fetch_routing_app_coverage
+        rescue => error
+          UI.error("Error fetching routing app coverage - #{error.message}")
+          nil
+        end
+
+      if routing_app_coverage
+        UI.message("Removing previous routing app coverage file from App Store Connect")
+        routing_app_coverage.delete!
+      end
+
+      UI.message("Uploading routing app coverage file to App Store Connect")
+      version.upload_routing_app_coverage(path: options[:routing_app_coverage_file])
+    end
+
     def app_rating(app_info)
       return unless options[:app_rating_config_path]
 

data/deliver/lib/deliver/upload_screenshots.rb

@@ -171,13 +171,17 @@ module Deliver
     def wait_for_complete(iterator, timeout_seconds)
       start_time = Time.now
       loop do
+        # App Store Connect publishes a screenshot's `sourceFileChecksum` asynchronously,
+        # shortly after its state becomes COMPLETE. (#30094)
+        number_of_screenshots_missing_checksum = 0
         states = iterator.each_app_screenshot.map { |_, _, app_screenshot| app_screenshot }.each_with_object({}) do |app_screenshot, hash|
           state = app_screenshot.asset_delivery_state['state']
           hash[state] ||= 0
           hash[state] += 1
+          number_of_screenshots_missing_checksum += 1 if state == 'COMPLETE' && app_screenshot.source_file_checksum.nil?
         end
 
-        is_processing = states.fetch('UPLOAD_COMPLETE', 0) > 0
+        is_processing = states.fetch('UPLOAD_COMPLETE', 0) > 0 || number_of_screenshots_missing_checksum > 0
         return states unless is_processing
 
         if Time.now - start_time > timeout_seconds
@@ -185,7 +189,11 @@ module Deliver
           return states
         end
 
-        UI.verbose("There are still incomplete screenshots - #{states}")
+        if number_of_screenshots_missing_checksum > 0
+          UI.verbose("There are still incomplete screenshots - #{states}, missing checksum: #{number_of_screenshots_missing_checksum}")
+        else
+          UI.verbose("There are still incomplete screenshots - #{states}")
+        end
         sleep(5)
       end
     end
@@ -205,9 +213,9 @@ module Deliver
         UI.user_error!("Failed verification of all screenshots uploaded... #{incomplete_screenshot_count} incomplete screenshot(s) still exist")
       else
         UI.error("Failed to upload all screenshots... Tries remaining: #{tries}")
-        # Delete bad entries before retry
+        # Delete bad entries before retry (not complete OR missing checksum)
         iterator.each_app_screenshot do |_, _, app_screenshot|
-          app_screenshot.delete! unless app_screenshot.complete?
+          app_screenshot.delete! unless app_screenshot.complete? && !app_screenshot.source_file_checksum.nil?
         end
         upload_screenshots(localizations, screenshots_per_language, timeout_seconds, tries: tries)
       end

data/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb

@@ -37,9 +37,9 @@ module Fastlane
 
         Dir.chdir(params[:path]) do
           if params[:commits_count]
-            changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], merge_commit_filtering, params[:date_format], params[:ancestry_path], params[:app_path])
+            changelog = Actions.git_log_last_commits(params[:pretty], params[:commits_count], params[:matching_pattern], merge_commit_filtering, params[:date_format], params[:ancestry_path], params[:app_path])
           else
-            changelog = Actions.git_log_between(params[:pretty], from, to, merge_commit_filtering, params[:date_format], params[:ancestry_path], params[:app_path])
+            changelog = Actions.git_log_between(params[:pretty], from, to, params[:matching_pattern], merge_commit_filtering, params[:date_format], params[:ancestry_path], params[:app_path])
           end
 
           changelog = changelog.gsub("\n\n", "\n") if changelog # as there are duplicate newlines
@@ -104,6 +104,10 @@ module Fastlane
                                        description: 'The format applied to each commit while generating the collected value',
                                        optional: true,
                                        default_value: '%B'),
+          FastlaneCore::ConfigItem.new(key: :matching_pattern,
+                                       env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_MATCHING_PATTERN',
+                                       description: 'A regexp pattern to filter only the commits matching the pattern',
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :date_format,
                                        env_name: 'FL_CHANGELOG_FROM_GIT_COMMITS_DATE_FORMAT',
                                        description: 'The date format applied to each commit while generating the collected value',
@@ -179,6 +183,7 @@ module Fastlane
             pretty: "- (%ae) %s",                    # Optional, lets you provide a custom format to apply to each commit when generating the changelog text
             date_format: "short",                    # Optional, lets you provide an additional date format to dates within the pretty-formatted string
             match_lightweight_tag: false,            # Optional, lets you ignore lightweight (non-annotated) tags when searching for the last tag
+            matching_pattern: "[.*?].*",             # Optional, lets you filter out commits not matching the regex pattern
             merge_commit_filtering: "exclude_merges" # Optional, lets you filter out merge commits
           )'
         ]

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/get_push_certificate.md

@@ -74,6 +74,12 @@ If you want to generate a Website Push certificate:
 fastlane pem --website_push
 ```
 
+If you want to generate a VoIP Services certificate (the type PushKit requires):
+
+```no-highlight
+fastlane pem --voip_push
+```
+
 Set a password for your `p12` file:
 
 ```no-highlight

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`

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',