From 80fae70083d38c99f6ea3a8eed8136cb3397d06c Mon Sep 17 00:00:00 2001 From: Marcel Dierkes Date: Wed, 29 Dec 2021 11:02:49 +0100 Subject: [PATCH 1/3] Removed Sparkle build script and Vendor directory --- Vendor/.gitignore | 2 -- Vendor/Makefile | 35 ----------------------------------- 2 files changed, 37 deletions(-) delete mode 100644 Vendor/.gitignore delete mode 100644 Vendor/Makefile diff --git a/Vendor/.gitignore b/Vendor/.gitignore deleted file mode 100644 index fdfc20bb..00000000 --- a/Vendor/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -Sparkle diff --git a/Vendor/Makefile b/Vendor/Makefile deleted file mode 100644 index ea26541e..00000000 --- a/Vendor/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -BUILD_DIR = build -REPO_DIR = $(BUILD_DIR)/Sparkle -DIST_DIR = Sparkle - -CODESIGN_IDENTITY = Developer ID Application -CODESIGN_CMD = codesign --verbose --force -o runtime --sign "$(CODESIGN_IDENTITY)" - -SPARKLE_COMMIT = 2f9c7217196b1f5d3202ae63bb8682d6e01052a2 # ui-separation-and-xpc - -default: $(DIST_DIR) - -clean: - $(RM) -r $(BUILD_DIR) - $(RM) -r $(DIST_DIR) - -$(REPO_DIR): - mkdir -p $(BUILD_DIR) - git clone git@github.com:sparkle-project/Sparkle.git $(REPO_DIR) - cd $(REPO_DIR) && git checkout $(SPARKLE_COMMIT) - -$(DIST_DIR): $(REPO_DIR) - mkdir -p $(DIST_DIR) - cd $(REPO_DIR) && xcodebuild \ - -scheme Distribution \ - -configuration Release \ - -derivedDataPath "../$(BUILD_DIR)" \ - build - cd $(DIST_DIR) && tar xfvj ../$(BUILD_DIR)/build/Build/Products/Release/Sparkle-*.tar.bz2 - - # Remove Redundant Updater Binaries - $(RM) $(DIST_DIR)/Sparkle.framework/Versions/A/Resources/Autoupdate - $(RM) -r $(DIST_DIR)/Sparkle.framework/Versions/A/Resources/Updater.app - - # Codesign XPC Services - $(DIST_DIR)/bin/codesign_embedded_executable "$(CODESIGN_IDENTITY)" $(DIST_DIR)/XPCServices/*.xpc From df4d557e7794ebcf8550f758df1dd01f8de496e0 Mon Sep 17 00:00:00 2001 From: Marcel Dierkes Date: Wed, 29 Dec 2021 11:03:01 +0100 Subject: [PATCH 2/3] Integrated Sparkle 2 Swift Package --- .gitignore | 3 - CHANGELOG.md | 1 + KeepingYouAwake.xcodeproj/project.pbxproj | 136 +++++++++--------- .../xcshareddata/swiftpm/Package.resolved | 16 +++ KeepingYouAwake/Info.plist | 4 + KeepingYouAwake/KeepingYouAwake.entitlements | 5 + 6 files changed, 96 insertions(+), 69 deletions(-) create mode 100644 KeepingYouAwake.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.gitignore b/.gitignore index 0fd8c9ef..bb557c57 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,3 @@ xcuserdata build dist - -# Carthage -Carthage/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 4227f521..5f695ed0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - updated the Danish translation ([#171](https://github.com/newmarcel/KeepingYouAwake/pull/171)) - *Thank you [JacobSchriver](https://github.com/JacobSchriver)!* +- updated the [Sparkle](https://github.com/sparkle-project/Sparkle) update framework to version 2.0 ### v1.6.1 ### diff --git a/KeepingYouAwake.xcodeproj/project.pbxproj b/KeepingYouAwake.xcodeproj/project.pbxproj index 278abcb4..705a2d69 100644 --- a/KeepingYouAwake.xcodeproj/project.pbxproj +++ b/KeepingYouAwake.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ @@ -90,7 +90,6 @@ DAD3CF6C271186720006CA14 /* KYAPreferencesContentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2CCD5E26F8754C00568BDD /* KYAPreferencesContentViewController.m */; }; DAD3CF6D271186720006CA14 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA637B3E19F14693004C8838 /* main.m */; }; DAD3CF6E271186720006CA14 /* KYAStatusItemController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA173B361F65B41B00932CE0 /* KYAStatusItemController.m */; }; - DAD3CF70271186720006CA14 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0ADE6521CBFC5800D34B9D /* Sparkle.framework */; }; DAD3CF71271186720006CA14 /* KYAKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA19F0B12610810E001A6AA6 /* KYAKit.framework */; }; DAD3CF73271186720006CA14 /* KYAAdvancedPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA4835F226F8CF100073A062 /* KYAAdvancedPreferencesViewController.xib */; }; DAD3CF74271186720006CA14 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = DA54C1331D69CA0000AF9E9D /* InfoPlist.strings */; }; @@ -107,13 +106,8 @@ DAD3CF7F271186720006CA14 /* KYAGeneralPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD982FA26F8849A00234FB8 /* KYAGeneralPreferencesViewController.xib */; }; DAD3CF80271186720006CA14 /* KYAPreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD983C526F9C82900234FB8 /* KYAPreferencesWindowController.xib */; }; DAD3CF81271186720006CA14 /* KYADurationCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAB0700B22EC795F004D5BCA /* KYADurationCell.xib */; }; - DAD3CF83271186720006CA14 /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA0ADE6521CBFC5800D34B9D /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DAD3CF84271186720006CA14 /* KYAKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DA19F0B12610810E001A6AA6 /* KYAKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DAD3CF86271186720006CA14 /* KeepingYouAwake Launcher.app in Embed Launcher */ = {isa = PBXBuildFile; fileRef = DA658E6B21CE907B0049F4C1 /* KeepingYouAwake Launcher.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DAD3CF88271186720006CA14 /* org.sparkle-project.Downloader.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = DA0ADE6A21CBFC9700D34B9D /* org.sparkle-project.Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DAD3CF89271186720006CA14 /* org.sparkle-project.InstallerConnection.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = DA0ADE6B21CBFC9700D34B9D /* org.sparkle-project.InstallerConnection.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DAD3CF8A271186720006CA14 /* org.sparkle-project.InstallerLauncher.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = DA0ADE6C21CBFC9700D34B9D /* org.sparkle-project.InstallerLauncher.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - DAD3CF8B271186720006CA14 /* org.sparkle-project.InstallerStatus.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = DA0ADE6D21CBFC9700D34B9D /* org.sparkle-project.InstallerStatus.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; DAD982F826F8849A00234FB8 /* KYAGeneralPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD982FA26F8849A00234FB8 /* KYAGeneralPreferencesViewController.xib */; }; DAD9831926F8883E00234FB8 /* KYAPreferences.strings in Resources */ = {isa = PBXBuildFile; fileRef = DAD9831B26F8883E00234FB8 /* KYAPreferences.strings */; }; DAD9834926F8A9AE00234FB8 /* KYAAboutPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD9834826F8A9AE00234FB8 /* KYAAboutPreferencesViewController.xib */; }; @@ -121,6 +115,7 @@ DAD9838A26F9037900234FB8 /* KYADurationPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD9838C26F9037900234FB8 /* KYADurationPreferencesViewController.xib */; }; DAD983A726F9C46600234FB8 /* KYAAddDurationPreferencesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD983A926F9C46600234FB8 /* KYAAddDurationPreferencesViewController.xib */; }; DAD983C626F9C82900234FB8 /* KYAPreferencesWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DAD983C526F9C82900234FB8 /* KYAPreferencesWindowController.xib */; }; + DAEF160C277C67D800EA9478 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = DAEF160B277C67D800EA9478 /* Sparkle */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -197,7 +192,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - DAD3CF83271186720006CA14 /* Sparkle.framework in Embed Frameworks */, DAD3CF84271186720006CA14 /* KYAKit.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -214,20 +208,6 @@ name = "Embed Launcher"; runOnlyForDeploymentPostprocessing = 0; }; - DAD3CF87271186720006CA14 /* Embed XPC Services */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices"; - dstSubfolderSpec = 16; - files = ( - DAD3CF88271186720006CA14 /* org.sparkle-project.Downloader.xpc in Embed XPC Services */, - DAD3CF89271186720006CA14 /* org.sparkle-project.InstallerConnection.xpc in Embed XPC Services */, - DAD3CF8A271186720006CA14 /* org.sparkle-project.InstallerLauncher.xpc in Embed XPC Services */, - DAD3CF8B271186720006CA14 /* org.sparkle-project.InstallerStatus.xpc in Embed XPC Services */, - ); - name = "Embed XPC Services"; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -238,11 +218,6 @@ 8F6945C81DB7A87D0059C386 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = ""; }; 8F6945C91DB7A87D0059C386 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/MainMenu.strings; sourceTree = ""; }; DA085D0F21D6BAB6003D9B1B /* container-migration.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "container-migration.plist"; sourceTree = ""; }; - DA0ADE6521CBFC5800D34B9D /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Vendor/Sparkle/Sparkle.framework; sourceTree = ""; }; - DA0ADE6A21CBFC9700D34B9D /* org.sparkle-project.Downloader.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.Downloader.xpc"; path = "Vendor/Sparkle/XPCServices/org.sparkle-project.Downloader.xpc"; sourceTree = ""; }; - DA0ADE6B21CBFC9700D34B9D /* org.sparkle-project.InstallerConnection.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerConnection.xpc"; path = "Vendor/Sparkle/XPCServices/org.sparkle-project.InstallerConnection.xpc"; sourceTree = ""; }; - DA0ADE6C21CBFC9700D34B9D /* org.sparkle-project.InstallerLauncher.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerLauncher.xpc"; path = "Vendor/Sparkle/XPCServices/org.sparkle-project.InstallerLauncher.xpc"; sourceTree = ""; }; - DA0ADE6D21CBFC9700D34B9D /* org.sparkle-project.InstallerStatus.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerStatus.xpc"; path = "Vendor/Sparkle/XPCServices/org.sparkle-project.InstallerStatus.xpc"; sourceTree = ""; }; DA0CA9FE21D0111600879C8B /* KeepingYouAwake.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KeepingYouAwake.entitlements; sourceTree = ""; }; DA13771925E969FF00FB0FAD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; DA173B351F65B41B00932CE0 /* KYAStatusItemController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KYAStatusItemController.h; sourceTree = ""; }; @@ -505,8 +480,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DAD3CF70271186720006CA14 /* Sparkle.framework in Frameworks */, DAD3CF71271186720006CA14 /* KYAKit.framework in Frameworks */, + DAEF160C277C67D800EA9478 /* Sparkle in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -702,7 +677,6 @@ DA658E6C21CE907B0049F4C1 /* KYALauncher */, DA19F0B22610810E001A6AA6 /* KYAKit */, DA19F0BF2610810E001A6AA6 /* KYAKitTests */, - DA66CF9F1A12A7D700336CDC /* Frameworks */, DA637B3A19F14693004C8838 /* Products */, ); sourceTree = ""; @@ -753,18 +727,6 @@ path = KYALauncher; sourceTree = ""; }; - DA66CF9F1A12A7D700336CDC /* Frameworks */ = { - isa = PBXGroup; - children = ( - DA0ADE6521CBFC5800D34B9D /* Sparkle.framework */, - DA0ADE6A21CBFC9700D34B9D /* org.sparkle-project.Downloader.xpc */, - DA0ADE6B21CBFC9700D34B9D /* org.sparkle-project.InstallerConnection.xpc */, - DA0ADE6C21CBFC9700D34B9D /* org.sparkle-project.InstallerLauncher.xpc */, - DA0ADE6D21CBFC9700D34B9D /* org.sparkle-project.InstallerStatus.xpc */, - ); - name = Frameworks; - sourceTree = ""; - }; DA82560E22FB5B31005ECB3A /* KYAActivationDurationsMenuController */ = { isa = PBXGroup; children = ( @@ -978,7 +940,6 @@ DAD3CF72271186720006CA14 /* Resources */, DAD3CF82271186720006CA14 /* Embed Frameworks */, DAD3CF85271186720006CA14 /* Embed Launcher */, - DAD3CF87271186720006CA14 /* Embed XPC Services */, ); buildRules = ( ); @@ -987,6 +948,9 @@ DAD3CF59271186720006CA14 /* PBXTargetDependency */, ); name = "KeepingYouAwake (Direct)"; + packageProductDependencies = ( + DAEF160B277C67D800EA9478 /* Sparkle */, + ); productName = KeepingYouAwake; productReference = DAD3CF8F271186720006CA14 /* KeepingYouAwake.app */; productType = "com.apple.product-type.application"; @@ -1064,6 +1028,9 @@ ru, ); mainGroup = DA637B3019F14693004C8838; + packageReferences = ( + DAEF160A277C67D800EA9478 /* XCRemoteSwiftPackageReference "Sparkle" */, + ); productRefGroup = DA637B3A19F14693004C8838 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -1506,7 +1473,11 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = KYAKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); LOCALIZED_STRING_MACRO_NAMES = ( "$(inherited)", KYA_LOCALIZED_STRING, @@ -1542,7 +1513,11 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = KYAKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/Frameworks", + ); LOCALIZED_STRING_MACRO_NAMES = ( "$(inherited)", KYA_LOCALIZED_STRING, @@ -1571,7 +1546,11 @@ DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 5KESHV9W85; INFOPLIST_FILE = KYAKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "info.marcel-dierkes.KYAKitTests"; @@ -1595,7 +1574,11 @@ COPY_PHASE_STRIP = NO; DEVELOPMENT_TEAM = 5KESHV9W85; INFOPLIST_FILE = KYAKitTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + "@loader_path/../Frameworks", + ); MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "info.marcel-dierkes.KYAKitTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1746,12 +1729,11 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 5KESHV9W85; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( + INFOPLIST_FILE = KeepingYouAwake/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Vendor/Sparkle", + "@executable_path/../Frameworks", ); - INFOPLIST_FILE = KeepingYouAwake/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -1767,12 +1749,11 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 5KESHV9W85; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( + INFOPLIST_FILE = KeepingYouAwake/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/Vendor/Sparkle", + "@executable_path/../Frameworks", ); - INFOPLIST_FILE = KeepingYouAwake/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; OTHER_CODE_SIGN_FLAGS = "$(inherited) --timestamp"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1797,7 +1778,10 @@ DEVELOPMENT_TEAM = 5KESHV9W85; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = KYALauncher/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "info.marcel-dierkes.KeepingYouAwake.Launcher"; @@ -1827,7 +1811,10 @@ DEVELOPMENT_TEAM = 5KESHV9W85; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = KYALauncher/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); MTL_FAST_MATH = YES; OTHER_CODE_SIGN_FLAGS = "$(inherited) --timestamp"; PRODUCT_BUNDLE_IDENTIFIER = "info.marcel-dierkes.KeepingYouAwake.Launcher"; @@ -1847,17 +1834,16 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 5KESHV9W85; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Vendor/Sparkle", - ); GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "KYA_APP_UPDATER_ENABLED=1", "$(inherited)", ); INFOPLIST_FILE = KeepingYouAwake/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); PRODUCT_NAME = KeepingYouAwake; PROVISIONING_PROFILE_SPECIFIER = ""; }; @@ -1874,16 +1860,15 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 5KESHV9W85; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Vendor/Sparkle", - ); GCC_PREPROCESSOR_DEFINITIONS = ( "KYA_APP_UPDATER_ENABLED=1", "$(inherited)", ); INFOPLIST_FILE = KeepingYouAwake/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); OTHER_CODE_SIGN_FLAGS = "$(inherited) --timestamp"; PRODUCT_NAME = KeepingYouAwake; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1948,6 +1933,25 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + DAEF160A277C67D800EA9478 /* XCRemoteSwiftPackageReference "Sparkle" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/sparkle-project/Sparkle"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.0.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + DAEF160B277C67D800EA9478 /* Sparkle */ = { + isa = XCSwiftPackageProductDependency; + package = DAEF160A277C67D800EA9478 /* XCRemoteSwiftPackageReference "Sparkle" */; + productName = Sparkle; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = DA637B3119F14693004C8838 /* Project object */; } diff --git a/KeepingYouAwake.xcworkspace/xcshareddata/swiftpm/Package.resolved b/KeepingYouAwake.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..c13b8393 --- /dev/null +++ b/KeepingYouAwake.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "Sparkle", + "repositoryURL": "https://github.com/sparkle-project/Sparkle", + "state": { + "branch": null, + "revision": "85d3fa2e0e2b7871866eb1a92231847cff4162fd", + "version": "2.0.0" + } + } + ] + }, + "version": 1 +} diff --git a/KeepingYouAwake/Info.plist b/KeepingYouAwake/Info.plist index afe86063..be0b4dcf 100644 --- a/KeepingYouAwake/Info.plist +++ b/KeepingYouAwake/Info.plist @@ -51,5 +51,9 @@ SUEnableAutomaticChecks + SUEnableInstallerLauncherService + + SUEnableDownloaderService + diff --git a/KeepingYouAwake/KeepingYouAwake.entitlements b/KeepingYouAwake/KeepingYouAwake.entitlements index 852fa1a4..22c90dbb 100644 --- a/KeepingYouAwake/KeepingYouAwake.entitlements +++ b/KeepingYouAwake/KeepingYouAwake.entitlements @@ -2,6 +2,11 @@ + com.apple.security.temporary-exception.mach-lookup.global-name + + $(PRODUCT_BUNDLE_IDENTIFIER)-spks + $(PRODUCT_BUNDLE_IDENTIFIER)-spki + com.apple.security.app-sandbox From 60126c0aba73198418d19c2bad4f59508afa06d6 Mon Sep 17 00:00:00 2001 From: Marcel Dierkes Date: Sat, 29 Jan 2022 10:49:02 +0100 Subject: [PATCH 3/3] Incremented version to 1.6.2beta1 --- Configuration.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Configuration.xcconfig b/Configuration.xcconfig index 8fab4bf2..0766ed35 100644 --- a/Configuration.xcconfig +++ b/Configuration.xcconfig @@ -9,7 +9,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.12 PRODUCT_BUNDLE_IDENTIFIER = info.marcel-dierkes.KeepingYouAwake -MARKETING_VERSION = 1.6.2 -CURRENT_PROJECT_VERSION = 1060202 +MARKETING_VERSION = 1.6.2beta1 +CURRENT_PROJECT_VERSION = 1060203 KYA_COPYRIGHT_TEXT = Copyright © 2014 – 2022 Marcel Dierkes. All rights reserved.