From c532ad77e8195ca06a7e06b12c80b28e53d8acb1 Mon Sep 17 00:00:00 2001 From: Chris Serra <789723+cbserra@users.noreply.github.com> Date: Wed, 25 May 2022 11:10:02 -0700 Subject: [PATCH 1/3] Accepted XCode suggestions; removed Carthage references to frameworks; fixed references to Fuse and Savana frameworks --- Boop/Boop.xcodeproj/project.pbxproj | 7 ++-- .../xcshareddata/swiftpm/Package.resolved | 42 +++++++++---------- .../xcshareddata/xcschemes/Boop.xcscheme | 2 +- Boop/Boop/System/Models/Script.swift | 2 +- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/Boop/Boop.xcodeproj/project.pbxproj b/Boop/Boop.xcodeproj/project.pbxproj index 7085f0a8..9a24d35f 100644 --- a/Boop/Boop.xcodeproj/project.pbxproj +++ b/Boop/Boop.xcodeproj/project.pbxproj @@ -138,7 +138,6 @@ 2C2066A121FE47090082570E /* PopoverViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverViewController.swift; sourceTree = ""; }; 2C2066A321FE47CE0082570E /* PopoverView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopoverView.swift; sourceTree = ""; }; 2C2066A521FE53870082570E /* SearchField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchField.swift; sourceTree = ""; }; - 2C3B003D22E3775300BBD4D0 /* SavannaKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SavannaKit.framework; path = ../../../Carthage/Build/Mac/SavannaKit.framework; sourceTree = ""; }; 2C53B6DF226D404E00DC6861 /* ScriptExecution.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptExecution.swift; sourceTree = ""; }; 2C5770D4249727A600B38470 /* BoopRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = BoopRelease.entitlements; sourceTree = ""; }; 2C5ED41D2357F67200322893 /* Preferences.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Preferences.storyboard; sourceTree = ""; }; @@ -154,7 +153,6 @@ 2C9761DE2214E46800AFF8CD /* Script.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Script.swift; sourceTree = ""; }; 2C9761E02214E68D00AFF8CD /* ScriptTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptTableViewCell.swift; sourceTree = ""; }; 2CA245DB224822EA00586DFD /* ScriptTableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptTableView.swift; sourceTree = ""; }; - 2CB9D7F024319BAC00135424 /* Fuse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Fuse.framework; path = ../../../Carthage/Build/Mac/Fuse.framework; sourceTree = ""; }; 2CC211C2236E3141007CECEE /* PreferencesTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesTabViewController.swift; sourceTree = ""; }; 2CC211C4236FB5C1007CECEE /* ScriptsSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScriptsSettingsViewController.swift; sourceTree = ""; }; 2CEC93F9249C2D600080B9B8 /* ThemeSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeSettingsViewController.swift; sourceTree = ""; }; @@ -411,7 +409,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1330; ORGANIZATIONNAME = OKatBest; TargetAttributes = { 2C17C66624271DDA005C911C = { @@ -654,6 +652,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -715,6 +714,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -845,6 +845,7 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = RLZ8XBTX7G; + ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Boop/Frameworks", diff --git a/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index b8edfad9..6bc5be8c 100644 --- a/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,25 +1,23 @@ { - "object": { - "pins": [ - { - "package": "Fuse", - "repositoryURL": "https://github.com/IvanMathy/fuse-swift", - "state": { - "branch": null, - "revision": "acb9a2ec2789ce1dcca4d01872a20da801e7ac55", - "version": "2.0.0" - } - }, - { - "package": "SavannaKit", - "repositoryURL": "https://github.com/IvanMathy/savannakit", - "state": { - "branch": null, - "revision": "bb51ee074152a7361e7085d10723f699c79fe673", - "version": "0.15.1" - } + "pins" : [ + { + "identity" : "fuse-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/IvanMathy/fuse-swift", + "state" : { + "revision" : "acb9a2ec2789ce1dcca4d01872a20da801e7ac55", + "version" : "2.0.0" } - ] - }, - "version": 1 + }, + { + "identity" : "savannakit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/IvanMathy/savannakit", + "state" : { + "revision" : "bb51ee074152a7361e7085d10723f699c79fe673", + "version" : "0.15.1" + } + } + ], + "version" : 2 } diff --git a/Boop/Boop.xcodeproj/xcshareddata/xcschemes/Boop.xcscheme b/Boop/Boop.xcodeproj/xcshareddata/xcschemes/Boop.xcscheme index 3a5f351d..4786df9e 100644 --- a/Boop/Boop.xcodeproj/xcshareddata/xcschemes/Boop.xcscheme +++ b/Boop/Boop.xcodeproj/xcshareddata/xcschemes/Boop.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 25 May 2022 14:27:18 -0700 Subject: [PATCH 2/3] Removed Framework paths from targets to suppress warning about Framework directory not existing --- Boop/Boop.xcodeproj/project.pbxproj | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Boop/Boop.xcodeproj/project.pbxproj b/Boop/Boop.xcodeproj/project.pbxproj index 9a24d35f..995cd3ea 100644 --- a/Boop/Boop.xcodeproj/project.pbxproj +++ b/Boop/Boop.xcodeproj/project.pbxproj @@ -239,8 +239,6 @@ 2C20668321FD62D00082570E /* Frameworks */ = { isa = PBXGroup; children = ( - 2CB9D7F024319BAC00135424 /* Fuse.framework */, - 2C3B003D22E3775300BBD4D0 /* SavannaKit.framework */, ); path = Frameworks; sourceTree = ""; @@ -753,11 +751,6 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 14; DEVELOPMENT_TEAM = RLZ8XBTX7G; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Boop/Frameworks", - "$(PROJECT_DIR)", - ); INFOPLIST_FILE = Boop/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -784,11 +777,6 @@ CURRENT_PROJECT_VERSION = 14; DEVELOPMENT_TEAM = ""; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Boop/Frameworks", - "$(PROJECT_DIR)", - ); INFOPLIST_FILE = Boop/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -814,11 +802,6 @@ COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Boop/Frameworks", - "$(PROJECT_DIR)", - ); INFOPLIST_FILE = Boop/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -846,11 +829,6 @@ CURRENT_PROJECT_VERSION = 21; DEVELOPMENT_TEAM = RLZ8XBTX7G; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Boop/Frameworks", - "$(PROJECT_DIR)", - ); INFOPLIST_FILE = Boop/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", From b036f04864a8a5bfb2e5ee25079ca896e44030d9 Mon Sep 17 00:00:00 2001 From: Chris Serra <789723+cbserra@users.noreply.github.com> Date: Wed, 25 May 2022 14:47:27 -0700 Subject: [PATCH 3/3] Removed Package.resolved file to see if CI build passes --- .../xcshareddata/swiftpm/Package.resolved | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 6bc5be8c..00000000 --- a/Boop/Boop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,23 +0,0 @@ -{ - "pins" : [ - { - "identity" : "fuse-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/IvanMathy/fuse-swift", - "state" : { - "revision" : "acb9a2ec2789ce1dcca4d01872a20da801e7ac55", - "version" : "2.0.0" - } - }, - { - "identity" : "savannakit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/IvanMathy/savannakit", - "state" : { - "revision" : "bb51ee074152a7361e7085d10723f699c79fe673", - "version" : "0.15.1" - } - } - ], - "version" : 2 -}