Merge branch 'main' into deployment-target-macOS-15

F1248 · Aug 24, 2024 · 50a83b6 · 50a83b6
2 parents 9ebf729 + dfb6c60
commit 50a83b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/Build-Genius.yml b/.github/workflows/Build-Genius.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Select Xcode version
         run: |
           /usr/bin/sudo /usr/bin/xcode-select --switch /Applications/Xcode_16.1.app
-          /bin/echo "$(/usr/bin/xcodebuild -version | /usr/bin/tr "\n" " ")selected" 
+          /bin/echo "$(/usr/bin/xcodebuild -version | /usr/bin/tr "\n" " ")selected"
 
       - name: Build Genius
         run: |

diff --git a/Genius.xcodeproj/project.pbxproj b/Genius.xcodeproj/project.pbxproj
@@ -143,7 +143,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/zsh;
-			shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    if which swiftformat >/dev/null; then\n        swiftformat --lint .\n    else\n        echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\n    fi\nfi\n";
+			shellScript = "if [ \"${CONFIGURATION}\" = \"Debug\" ]; then\n    if /usr/bin/which -s swiftformat; then\n        swiftformat --lint .\n    else\n        echo \"warning: SwiftFormat is not installed, see https://github.com/nicklockwood/SwiftFormat#command-line-tool for installation instructions\"\n    fi\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */