From 216e9fb850f71592c4c2c4e2d3d9c92cec511851 Mon Sep 17 00:00:00 2001 From: Hzao <53562907+Hzao@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:52:52 +0800 Subject: [PATCH] Ensure Swift scripts are compiled before execution for Xcode 15 compatibility This commit updates the build scripts to compile PropertyListModifier.swift into executables before running them. This change addresses the issue(#17) introduced in Xcode 15, where running Swift scripts directly can lead to errors due to the updated execution environment handling. By compiling Swift scripts first, we ensure compatibility with Xcode 15 and later versions, while also reducing potential environmental discrepancies. --- BuildScripts/PropertyListModifier.swift | 1 - SwiftAuthorizationSample.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BuildScripts/PropertyListModifier.swift b/BuildScripts/PropertyListModifier.swift index dc633d6..e662414 100755 --- a/BuildScripts/PropertyListModifier.swift +++ b/BuildScripts/PropertyListModifier.swift @@ -1,4 +1,3 @@ -#!/usr/bin/env xcrun --sdk macosx swift // // PropertyListModifier.swift // SwiftAuthorizationSample diff --git a/SwiftAuthorizationSample.xcodeproj/project.pbxproj b/SwiftAuthorizationSample.xcodeproj/project.pbxproj index 3ea4e92..c2764b6 100644 --- a/SwiftAuthorizationSample.xcodeproj/project.pbxproj +++ b/SwiftAuthorizationSample.xcodeproj/project.pbxproj @@ -310,7 +310,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}\"/BuildScripts/PropertyListModifier.swift satisfy-job-bless-requirements\n"; + shellScript = "swiftc \"${SRCROOT}\"/BuildScripts/PropertyListModifier.swift -o \"${SRCROOT}\"/BuildScripts/PropertyListModifier\n\"${SRCROOT}\"/BuildScripts/PropertyListModifier satisfy-job-bless-requirements\n"; }; 99F409F0272303D10010500C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -327,7 +327,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}\"/BuildScripts/PropertyListModifier.swift cleanup-job-bless-requirements\n"; + shellScript = "\"${SRCROOT}\"/BuildScripts/PropertyListModifier cleanup-job-bless-requirements\nrm \"${SRCROOT}\"/BuildScripts/PropertyListModifier\n"; }; 99F409F1272303E00010500C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -344,7 +344,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}\"/BuildScripts/PropertyListModifier.swift satisfy-job-bless-requirements specify-mach-services auto-increment-version\n\n"; + shellScript = "swiftc \"${SRCROOT}\"/BuildScripts/PropertyListModifier.swift -o \"${SRCROOT}\"/BuildScripts/PropertyListModifier\n\"${SRCROOT}\"/BuildScripts/PropertyListModifier satisfy-job-bless-requirements specify-mach-services auto-increment-version\n"; }; 99F409F2272303F20010500C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -361,7 +361,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}\"/BuildScripts/PropertyListModifier.swift cleanup-job-bless-requirements cleanup-mach-services\n"; + shellScript = "\"${SRCROOT}\"/BuildScripts/PropertyListModifier cleanup-job-bless-requirements cleanup-mach-services\nrm \"${SRCROOT}\"/BuildScripts/PropertyListModifier\n"; }; /* End PBXShellScriptBuildPhase section */