fastlane 2.203.0 → 2.204.0

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -320,7 +320,11 @@ module FastlaneCore
         UI.verbose("Uninstalling app '#{app_identifier}' from #{device_type}...")
 
         UI.message("Launch Simulator #{device_type}")
-        Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        if FastlaneCore::Helper.xcode_at_least?("13")
+          Helper.backticks("open -a Simulator.app --args -CurrentDeviceUDID #{device_udid} &> /dev/null")
+        else
+          Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        end
 
         UI.message("Uninstall application #{app_identifier}")
         Helper.backticks("xcrun simctl uninstall #{device_udid} #{app_identifier} &> /dev/null")

data/match/lib/match/nuke.rb

@@ -18,6 +18,7 @@ module Match
     attr_accessor :params
     attr_accessor :type
 
+    attr_accessor :safe_remove_certs
     attr_accessor :certs
     attr_accessor :profiles
     attr_accessor :files
@@ -70,6 +71,8 @@ module Match
                                          hide_keys: [:app_identifier],
                                              title: "Summary for match nuke #{Fastlane::VERSION}")
 
+      self.safe_remove_certs = params[:safe_remove_certs] || false
+
       prepare_list
       filter_by_cert
       print_tables
@@ -81,11 +84,13 @@ module Match
       if (self.certs + self.profiles + self.files).count > 0
         unless params[:skip_confirmation]
           UI.error("---")
-          UI.error("Are you sure you want to completely delete and revoke all the")
-          UI.error("certificates and provisioning profiles listed above? (y/n)")
+          remove_or_revoke_message = self.safe_remove_certs ? "remove" : "revoke"
+          UI.error("Are you sure you want to completely delete and #{remove_or_revoke_message} all the")
+          UI.error("certificates and delete provisioning profiles listed above? (y/n)")
           UI.error("Warning: By nuking distribution, both App Store and Ad Hoc profiles will be deleted") if type == "distribution"
           UI.error("Warning: The :app_identifier value will be ignored - this will delete all profiles for all your apps!") if had_app_identifier
           UI.error("---")
+          print_safe_remove_certs_hint
         end
         if params[:skip_confirmation] || UI.confirm("Do you really want to nuke everything listed above?")
           nuke_it_now!
@@ -119,10 +124,12 @@ module Match
       if Spaceship::ConnectAPI.client.in_house? && (type == "distribution" || type == "enterprise")
         UI.error("---")
         UI.error("⚠️ Warning: This seems to be an Enterprise account!")
-        UI.error("By nuking your account's distribution, all your apps deployed via ad-hoc will stop working!") if type == "distribution"
-        UI.error("By nuking your account's enterprise, all your in-house apps will stop working!") if type == "enterprise"
+        unless self.safe_remove_certs
+          UI.error("By nuking your account's distribution, all your apps deployed via ad-hoc will stop working!") if type == "distribution"
+          UI.error("By nuking your account's enterprise, all your in-house apps will stop working!") if type == "enterprise"
+        end
         UI.error("---")
-
+        print_safe_remove_certs_hint
         UI.user_error!("Enterprise account nuke cancelled") unless UI.confirm("Do you really want to nuke your Enterprise account?")
       end
     end
@@ -168,7 +175,7 @@ module Match
         keys += self.storage.list_files(file_name: ct.to_s, file_ext: "p12")
       end
 
-      # Finds all the iOS and macOS profofiles in the file storage
+      # Finds all the iOS and macOS profiles in the file storage
       profiles = []
       prov_types.each do |prov_type|
         profiles += self.storage.list_files(file_name: prov_type.to_s, file_ext: "mobileprovision")
@@ -190,7 +197,7 @@ module Match
         [i + 1, cert.name, cert.id, cert.class.to_s.split("::").last, cert_expiration]
       end
       puts(Terminal::Table.new({
-        title: "Certificates that can be revoked".green,
+        title: "Certificates that can be #{removed_or_revoked_message}".green,
         headings: ["Option", "Name", "ID", "Type", "Expires"],
         rows: FastlaneCore::PrintTable.transform_output(rows)
       }))
@@ -259,7 +266,7 @@ module Match
           [cert.name, cert.id, cert.class.to_s.split("::").last, cert_expiration]
         end
         puts(Terminal::Table.new({
-          title: "Certificates that are going to be revoked".green,
+          title: "Certificates that are going to be #{removed_or_revoked_message}".green,
           headings: ["Name", "ID", "Type", "Expires"],
           rows: FastlaneCore::PrintTable.transform_output(rows)
         }))
@@ -313,8 +320,14 @@ module Match
         UI.success("Successfully deleted profile")
       end
 
-      UI.header("Revoking #{self.certs.count} certificates...") unless self.certs.count == 0
+      removing_or_revoking_message = self.safe_remove_certs ? "Removing" : "Revoking"
+      UI.header("#{removing_or_revoking_message} #{self.certs.count} certificates...") unless self.certs.count == 0
       self.certs.each do |cert|
+        if self.safe_remove_certs
+          UI.message("Certificate '#{cert.name}' (#{cert.id}) will be removed from repository without revoking it")
+          next
+        end
+
         UI.message("Revoking certificate '#{cert.name}' (#{cert.id})...")
         begin
           cert.delete!
@@ -427,6 +440,17 @@ module Match
         raise "Unknown provisioning type '#{prov_type}'"
       end
     end
+
+    # Helpers for `safe_remove_certs`
+    def print_safe_remove_certs_hint
+      return if self.safe_remove_certs
+      UI.important("Hint: You can use --safe_remove_certs option to remove certificates")
+      UI.important("from repository without revoking them.")
+    end
+
+    def removed_or_revoked_message
+      self.safe_remove_certs ? "removed" : "revoked"
+    end
   end
   # rubocop:disable Metrics/ClassLength
 end

data/match/lib/match/options.rb

@@ -257,6 +257,11 @@ module Match
                                      description: "Disables confirmation prompts during nuke, answering them with yes",
                                      type: Boolean,
                                      default_value: false),
+        FastlaneCore::ConfigItem.new(key: :safe_remove_certs,
+                                     env_name: "MATCH_SAFE_REMOVE_CERTS",
+                                     description: "Remove certs from repository during nuke without revoking them on the developer portal",
+                                     type: Boolean,
+                                     default_value: false),
         FastlaneCore::ConfigItem.new(key: :skip_docs,
                                      env_name: "MATCH_SKIP_DOCS",
                                      description: "Skip generation of a README.md for the created git repository",

data/match/lib/match/storage/s3_storage.rb

@@ -168,10 +168,10 @@ module Match
       private
 
       def s3_object_path(file_name)
-        santized = sanitize_file_name(file_name)
-        return santized if santized.start_with?(s3_object_prefix)
+        sanitized = sanitize_file_name(file_name)
+        return sanitized if sanitized.start_with?(s3_object_prefix)
 
-        s3_object_prefix + santized
+        s3_object_prefix + sanitized
       end
 
       def strip_s3_object_prefix(object_path)

data/pilot/lib/pilot/build_manager.rb

@@ -18,6 +18,11 @@ module Pilot
 
       UI.user_error!("No ipa or pkg file given") if config[:ipa].nil? && config[:pkg].nil?
 
+      if config[:ipa] && config[:pkg]
+        UI.important("WARNING: Both `ipa` and `pkg` options are defined either explicitly or with default_value (build found in directory)")
+        UI.important("Uploading `ipa` is preferred by default. Set `app_platform` to `osx` to force uploading `pkg`")
+      end
+
       check_for_changelog_or_whats_new!(options)
 
       UI.success("Ready to upload new build to TestFlight (App: #{fetch_app_id})...")
@@ -25,24 +30,29 @@ module Pilot
       dir = Dir.mktmpdir
 
       platform = fetch_app_platform
-      if options[:ipa]
+      ipa_path = options[:ipa]
+      if ipa_path && platform != 'osx'
+        asset_path = ipa_path
         package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(app_id: fetch_app_id,
-                                                                      ipa_path: options[:ipa],
+                                                                      ipa_path: ipa_path,
                                                                   package_path: dir,
                                                                       platform: platform)
       else
+        pkg_path = options[:pkg]
+        asset_path = pkg_path
         package_path = FastlaneCore::PkgUploadPackageBuilder.new.generate(app_id: fetch_app_id,
-                                                                        pkg_path: options[:pkg],
+                                                                        pkg_path: pkg_path,
                                                                     package_path: dir,
                                                                         platform: platform)
       end
 
       transporter = transporter_for_selected_team(options)
-      result = transporter.upload(package_path: package_path, asset_path: options[:ipa] || options[:pkg])
+      result = transporter.upload(package_path: package_path, asset_path: asset_path)
 
       unless result
         transporter_errors = transporter.displayable_errors
-        UI.user_error!("Error uploading ipa file: \n #{transporter_errors}")
+        file_type = platform == "osx" ? "pkg" : "ipa"
+        UI.user_error!("Error uploading #{file_type} file: \n #{transporter_errors}")
       end
 
       UI.success("Successfully uploaded the new binary to App Store Connect")
@@ -98,7 +108,7 @@ module Pilot
 
     def wait_for_build_processing_to_be_complete(return_when_build_appears = false)
       platform = fetch_app_platform
-      if config[:ipa]
+      if config[:ipa] && platform != "osx"
         app_version = FastlaneCore::IpaFileAnalyser.fetch_app_version(config[:ipa])
         app_build = FastlaneCore::IpaFileAnalyser.fetch_app_build(config[:ipa])
       elsif config[:pkg]
@@ -410,7 +420,7 @@ module Pilot
       # This is where we could add a check to see if encryption is required and has been updated
       uploaded_build = set_export_compliance_if_needed(uploaded_build, options)
 
-      if options[:groups] || options[:distribute_external]
+      if options[:submit_beta_review] && (options[:groups] || options[:distribute_external])
         if uploaded_build.ready_for_beta_submission?
           uploaded_build.post_beta_app_review_submission
         else

data/pilot/lib/pilot/options.rb

@@ -324,7 +324,12 @@ module Pilot
                                      env_name: "PILOT_REJECT_PREVIOUS_BUILD",
                                      description: "Expire previous if it's 'waiting for review'",
                                      is_string: false,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :submit_beta_review,
+                                     env_name: "PILOT_DISTRIBUTE_EXTERNAL",
+                                     description: "Send the build for a beta review",
+                                     type: Boolean,
+                                     default_value: true)
       ]
     end
   end

data/scan/lib/scan/runner.rb

@@ -257,6 +257,10 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
+      copy_simulator_logs
+      zip_build_products
+      copy_xctestrun
+
       return nil if Scan.config[:build_for_testing]
 
       results = trainer_test_results
@@ -294,10 +298,6 @@ module Scan
       }))
       puts("")
 
-      copy_simulator_logs
-      zip_build_products
-      copy_xctestrun
-
       if number_of_failures > 0
         open_report
 

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -94,7 +94,11 @@ module Snapshot
         device_udid = TestCommandGenerator.device_udid(device_type)
 
         UI.message("Launch Simulator #{device_type}")
-        Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        if FastlaneCore::Helper.xcode_at_least?("13")
+          Helper.backticks("open -a Simulator.app --args -CurrentDeviceUDID #{device_udid} &> /dev/null")
+        else
+          Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
+        end
 
         paths.each do |path|
           UI.message("Adding '#{path}'")

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.203.0
+  version: 2.204.0
 platform: ruby
 authors:
-- Jimmy Dee
-- Felix Krause
-- Maksym Grebenets
-- Fumiya Nakamura
-- Matthew Ellis
-- Jérôme Lacoste
+- Roger Oba
 - Iulian Onofrei
 - Kohki Miki
+- Maksym Grebenets
+- Luka Mirosevic
+- Josh Holtz
+- Max Ott
+- Aaron Brager
+- Danielle Tomlinson
 - Olivier Halligon
-- Roger Oba
-- Helmut Januschka
-- Łukasz Grabowski
 - Andrew McBurney
+- Jan Piotrowski
+- Jimmy Dee
 - Manu Wallner
+- Jérôme Lacoste
+- Helmut Januschka
+- Łukasz Grabowski
 - Stefan Natchev
+- Fumiya Nakamura
+- Felix Krause
+- Jorge Revuelta H
 - Joshua Liebowitz
-- Manish Rathi
 - Satoshi Namai
-- Josh Holtz
-- Jorge Revuelta H
-- Max Ott
-- Aaron Brager
+- Matthew Ellis
+- Manish Rathi
 - Daniel Jankowski
-- Danielle Tomlinson
-- Luka Mirosevic
-- Jan Piotrowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -1354,6 +1354,7 @@ files:
 - fastlane/swift/Actions.swift
 - fastlane/swift/Appfile.swift
 - fastlane/swift/ArgumentProcessor.swift
+- fastlane/swift/Atomic.swift
 - fastlane/swift/ControlCommand.swift
 - fastlane/swift/Deliverfile.swift
 - fastlane/swift/DeliverfileProtocol.swift
@@ -1395,7 +1396,6 @@ files:
 - fastlane_core/README.md
 - fastlane_core/lib/assets/XMLTemplate.xml.erb
 - fastlane_core/lib/fastlane_core.rb
-- fastlane_core/lib/fastlane_core/.helper.rb.swp
 - fastlane_core/lib/fastlane_core/analytics/action_completion_context.rb
 - fastlane_core/lib/fastlane_core/analytics/action_launch_context.rb
 - fastlane_core/lib/fastlane_core/analytics/analytics_event_builder.rb
@@ -1578,8 +1578,6 @@ files:
 - scan/lib/assets/ScanfileTemplate
 - scan/lib/assets/ScanfileTemplate.swift
 - scan/lib/scan.rb
-- scan/lib/scan/.detect_values.rb.swp
-- scan/lib/scan/.runner.rb.swp
 - scan/lib/scan/commands_generator.rb
 - scan/lib/scan/detect_values.rb
 - scan/lib/scan/error_handler.rb