fastlane 2.201.2 → 2.204.1

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/options.rb

@@ -328,6 +328,11 @@ module Scan
                                      default_value: false),
 
         # concurrency
+        FastlaneCore::ConfigItem.new(key: :parallel_testing,
+                                     type: Boolean,
+                                     env_name: "SCAN_PARALLEL_TESTING",
+                                     description: "Optionally override the per-target setting in the scheme for running tests in parallel. Equivalent to -parallel-testing-enabled",
+                                     optional: true),
         FastlaneCore::ConfigItem.new(key: :concurrent_workers,
                                      type: Integer,
                                      env_name: "SCAN_CONCURRENT_WORKERS",

data/scan/lib/scan/runner.rb

@@ -21,7 +21,7 @@ module Scan
 
     def run
       @xcresults_before_run = find_xcresults_in_derived_data
-      handle_results(test_app)
+      return handle_results(test_app)
     end
 
     def test_app
@@ -175,6 +175,8 @@ module Scan
 
     def find_xcresults_in_derived_data
       derived_data_path = Scan.config[:derived_data_path]
+      return [] if derived_data_path.nil? # Swift packages might not have derived data
+
       xcresults_path = File.join(derived_data_path, "Logs", "Test", "*.xcresult")
       return Dir[xcresults_path]
     end
@@ -185,7 +187,9 @@ module Scan
       results = {
         number_of_tests: 0,
         number_of_failures: 0,
-        number_of_retries: 0
+        number_of_retries: 0,
+        number_of_tests_excluding_retries: 0,
+        number_of_failures_excluding_retries: 0
       }
 
       result_bundle_path = Scan.cache[:result_bundle_path]
@@ -242,8 +246,10 @@ module Scan
 
       resulting_paths = Trainer::TestParser.auto_convert(params)
       resulting_paths.each do |path, data|
-        results[:number_of_tests] += data[:number_of_tests_excluding_retries]
-        results[:number_of_failures] += data[:number_of_failures_excluding_retries]
+        results[:number_of_tests] += data[:number_of_tests]
+        results[:number_of_failures] += data[:number_of_failures]
+        results[:number_of_tests_excluding_retries] += data[:number_of_tests_excluding_retries]
+        results[:number_of_failures_excluding_retries] += data[:number_of_failures_excluding_retries]
         results[:number_of_retries] += data[:number_of_retries]
       end
 
@@ -251,13 +257,17 @@ module Scan
     end
 
     def handle_results(tests_exit_status)
-      return if Scan.config[:build_for_testing]
+      copy_simulator_logs
+      zip_build_products
+      copy_xctestrun
+
+      return nil if Scan.config[:build_for_testing]
 
       results = trainer_test_results
 
       number_of_retries = results[:number_of_retries]
-      number_of_tests = results[:number_of_tests]
-      number_of_failures = results[:number_of_failures]
+      number_of_tests = results[:number_of_tests_excluding_retries]
+      number_of_failures = results[:number_of_failures_excluding_retries]
 
       SlackPoster.new.run({
         tests: number_of_tests,
@@ -288,10 +298,6 @@ module Scan
       }))
       puts("")
 
-      copy_simulator_logs
-      zip_build_products
-      copy_xctestrun
-
       if number_of_failures > 0
         open_report
 
@@ -303,6 +309,7 @@ module Scan
       end
 
       open_report
+      return results
     end
 
     def open_report

data/scan/lib/scan/test_command_generator.rb

@@ -55,6 +55,7 @@ module Scan
       end
       options << "-resultBundlePath '#{result_bundle_path(true)}'" if config[:result_bundle]
       if FastlaneCore::Helper.xcode_at_least?(10)
+        options << "-parallel-testing-enabled #{config[:parallel_testing] ? 'YES' : 'NO'}" unless config[:parallel_testing].nil?
         options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
         options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
         options << "-disable-concurrent-testing" if config[:disable_concurrent_testing]

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}'")

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -78,7 +78,17 @@ module Spaceship
 
       def self.find(bundle_id, client: nil)
         client ||= Spaceship::ConnectAPI
-        return all(client: client, filter: { bundleId: bundle_id }).find do |app|
+
+        # On 2022/2/2, filtering by bundle identifier started to fail for identifiers longer than 25 characters
+        # Temporarily removing this filter and filtering locally until this is fixed
+        #
+        # Also go uncomment the tests in spaceship/spec/connectapi/models/app_spec.rb when this is fixed
+        #
+        # return all(client: client, filter: { bundleId: bundle_id }).find do |app|
+        #   app.bundle_id == bundle_id
+        # end
+
+        return all(client: client).find do |app|
           app.bundle_id == bundle_id
         end
       end
@@ -435,7 +445,8 @@ module Spaceship
         client ||= Spaceship::ConnectAPI
         filter = {
           state: [
-            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::WAITING_FOR_REVIEW,
+            Spaceship::ConnectAPI::ReviewSubmission::ReviewSubmissionState::IN_REVIEW
           ].join(","),
           platform: platform
         }

metadata

@@ -1,39 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.201.2
+  version: 2.204.1
 platform: ruby
 authors:
-- Manish Rathi
-- Max Ott
-- Olivier Halligon
-- Jimmy Dee
-- Josh Holtz
-- Aaron Brager
-- Luka Mirosevic
 - Iulian Onofrei
-- Matthew Ellis
-- Jérôme Lacoste
-- Felix Krause
-- Fumiya Nakamura
-- Maksym Grebenets
-- Danielle Tomlinson
-- Daniel Jankowski
+- Joshua Liebowitz
+- Aaron Brager
+- Helmut Januschka
+- Manish Rathi
 - Łukasz Grabowski
-- Manu Wallner
 - Andrew McBurney
-- Stefan Natchev
-- Jan Piotrowski
-- Joshua Liebowitz
 - Jorge Revuelta H
-- Satoshi Namai
-- Roger Oba
+- Jan Piotrowski
+- Maksym Grebenets
+- Matthew Ellis
+- Felix Krause
 - Kohki Miki
-- Helmut Januschka
+- Manu Wallner
+- Daniel Jankowski
+- Danielle Tomlinson
+- Fumiya Nakamura
+- Jimmy Dee
+- Max Ott
+- Luka Mirosevic
+- Roger Oba
+- Olivier Halligon
+- Satoshi Namai
+- Stefan Natchev
+- Josh Holtz
+- Jérôme Lacoste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-02-03 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
@@ -1620,7 +1621,6 @@ files:
 - snapshot/lib/assets/SnapshotHelper.swift
 - snapshot/lib/assets/SnapshotHelperXcode8.swift
 - snapshot/lib/snapshot.rb
-- snapshot/lib/snapshot/.options.rb.swp
 - snapshot/lib/snapshot/collector.rb
 - snapshot/lib/snapshot/commands_generator.rb
 - snapshot/lib/snapshot/dependency_checker.rb
@@ -1661,6 +1661,7 @@ files:
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/file_uploader.rb
 - spaceship/lib/spaceship/connect_api/model.rb
+- spaceship/lib/spaceship/connect_api/models/.app.rb.swp
 - spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb
 - spaceship/lib/spaceship/connect_api/models/app.rb
 - spaceship/lib/spaceship/connect_api/models/app_category.rb