[scan] improve performance by change order of checks in `building_mac…

…_catalyst_for_mac` function (fastlane#20898) * Change order of checks in building_mac_catalyst_for_mac func * fix: run brew update to mitigate outdated brew error --------- Co-authored-by: Tomasz Lizer <[email protected]> Co-authored-by: TomaszLizer <[email protected]>
MichalSznajder · Sep 9, 2024 · 2de8c84 · 2de8c84
1 parent e1ab951
commit 2de8c84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/fastlane/swift/formatting/Rakefile b/fastlane/swift/formatting/Rakefile
@@ -8,6 +8,7 @@ task(:brew) do
   raise '`brew` is required. Please install brew. https://brew.sh/' unless system('which brew')
 
   puts('➡️  Brew')
+  sh('brew update')
   sh('brew bundle')
 end
 

diff --git a/scan/lib/scan/module.rb b/scan/lib/scan/module.rb
@@ -24,7 +24,7 @@ def scanfile_name
 
     def building_mac_catalyst_for_mac?
       return false unless Scan.project
-      Scan.project.supports_mac_catalyst? && Scan.config[:catalyst_platform] == "macos"
+      Scan.config[:catalyst_platform] == "macos" && Scan.project.supports_mac_catalyst?
     end
   end
 

diff --git a/scan/spec/detect_values_spec.rb b/scan/spec/detect_values_spec.rb
@@ -212,7 +212,7 @@
       context "catalyst" do
         it "ios", requires_xcodebuild: true do
           options = { project: "./scan/examples/standard/app.xcodeproj" }
-          expect_any_instance_of(FastlaneCore::Project).to receive(:supports_mac_catalyst?).and_return(true)
+          expect_any_instance_of(FastlaneCore::Project).not_to receive(:supports_mac_catalyst?)
           Scan.config = FastlaneCore::Configuration.create(Scan::Options.available_options, options)
           expect(Scan.config[:destination].first).to match(/platform=iOS/)
         end