diff --git a/AltBackup/Info.plist b/AltBackup/Info.plist index 7a5e62dd..038e8ed6 100644 --- a/AltBackup/Info.plist +++ b/AltBackup/Info.plist @@ -4,6 +4,7 @@ ALTAppGroups + group.$(APP_GROUP_IDENTIFIER) group.com.rileytestut.AltStore ALTBundleIdentifier diff --git a/AltServer/AltServer.entitlements b/AltServer/AltServer.entitlements index 0c67376e..53b24dcc 100644 --- a/AltServer/AltServer.entitlements +++ b/AltServer/AltServer.entitlements @@ -1,5 +1,11 @@ - + + com.apple.security.temporary-exception.mach-lookup.global-name + + $(PRODUCT_BUNDLE_IDENTIFIER)-spks + $(PRODUCT_BUNDLE_IDENTIFIER)-spki + + diff --git a/AltServer/AppDelegate.swift b/AltServer/AppDelegate.swift index 90ac42a1..0fdbfa92 100644 --- a/AltServer/AppDelegate.swift +++ b/AltServer/AppDelegate.swift @@ -44,7 +44,8 @@ class AppDelegate: NSObject, NSApplicationDelegate { @IBOutlet private var installMailPluginMenuItem: NSMenuItem! @IBOutlet private var installAltStoreMenuItem: NSMenuItem! @IBOutlet private var sideloadAppMenuItem: NSMenuItem! - + @IBOutlet private var checkForUpdatesMenuItem: NSMenuItem! + private weak var authenticationAppleIDTextField: NSTextField? private weak var authenticationPasswordTextField: NSSecureTextField? @@ -56,23 +57,18 @@ class AppDelegate: NSObject, NSApplicationDelegate { private var isAltPluginUpdateAvailable = false - func applicationDidFinishLaunching(_ aNotification: Notification) - { + @IBOutlet private var updaterController: SPUStandardUpdaterController! = { + return SPUStandardUpdaterController(startingUpdater: true, updaterDelegate: nil, userDriverDelegate: nil) + }() + + func applicationDidFinishLaunching(_ aNotification: Notification) { UserDefaults.standard.registerDefaults() UNUserNotificationCenter.current().delegate = self ServerConnectionManager.shared.start() ALTDeviceManager.shared.start() - - #if STAGING - let feedURL: String = Bundle.main.infoDictionary!["SUFeedURL"]! as! String - #else - let feedURL: String = Bundle.main.infoDictionary!["SUFeedURL"]! as! String - #endif - - SUUpdater.shared().feedURL = URL(string: feedURL) - + let item = NSStatusBar.system.statusItem(withLength: -1) item.menu = self.appMenu item.button?.image = NSImage(named: "MenuBarIcon") @@ -610,3 +606,12 @@ extension AppDelegate: UNUserNotificationCenterDelegate completionHandler([.alert, .sound, .badge]) } } + +// MARK: - Sparkle +//extension AppDelegate: SPUUpdaterDelegate { +// +//} +// +//extension AppDelegate: SPUStandardUserDriverDelegate { +// +//} diff --git a/AltServer/Base.lproj/Main.storyboard b/AltServer/Base.lproj/Main.storyboard index d01f7ec6..061518b9 100644 --- a/AltServer/Base.lproj/Main.storyboard +++ b/AltServer/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -61,6 +61,7 @@ + @@ -68,9 +69,10 @@ + - + @@ -132,7 +134,7 @@ - + diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index f7c01e0f..9d8f4d88 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -1923,8 +1923,6 @@ BF45868B229872EA00BD7491 /* Resources */, BF4588462298D4AA00BD7491 /* Frameworks */, BF0201BC22C2EFA3000B93E4 /* Embed Frameworks */, - BF7FDA2C23203B6B00B5D3A4 /* Copy Launcher App */, - BF914C242383659400E713BA /* Sign Frameworks */, BFF7C910257844C900E55F36 /* Embed XPC Services */, ); buildRules = ( @@ -2278,45 +2276,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - BF7FDA2C23203B6B00B5D3A4 /* Copy Launcher App */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Copy Launcher App"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${BUILT_PRODUCTS_DIR}/LaunchAtLogin_LaunchAtLogin.bundle/Contents/Resources/copy-helper-swiftpm.sh\"\n"; - }; - BF914C242383659400E713BA /* Sign Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Sign Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#LOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\n#IDENTITY=${EXPANDED_CODE_SIGN_IDENTITY_NAME}\n#\n#codesign --verbose --force --deep -o runtime --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A/Resources/AutoUpdate.app\"\n#codesign --verbose --force -o runtime --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A\"\n"; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ BF18BFE324857D7900DD5981 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -2808,10 +2767,6 @@ CURRENT_PROJECT_VERSION = 66; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", HAVE_OPENSSL, @@ -2862,10 +2817,6 @@ CURRENT_PROJECT_VERSION = 66; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_HARDENED_RUNTIME = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/Mac", - ); GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", HAVE_OPENSSL, @@ -3366,7 +3317,7 @@ DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = AltStore/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3401,7 +3352,7 @@ DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = AltStore/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/AltStore/AppDelegate.swift b/AltStore/AppDelegate.swift index 49be4e2a..ed2458d1 100644 --- a/AltStore/AppDelegate.swift +++ b/AltStore/AppDelegate.swift @@ -33,10 +33,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - @available(iOS 14, *) - private lazy var intentHandler = IntentHandler() - - @available(iOS 14, *) + private lazy var intentHandler = IntentHandler() private lazy var viewAppIntentHandler = ViewAppIntentHandler() func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool diff --git a/AltStore/Info.plist b/AltStore/Info.plist index 172e6199..a35b771d 100644 --- a/AltStore/Info.plist +++ b/AltStore/Info.plist @@ -4,8 +4,8 @@ ALTAppGroups + group.$(APP_GROUP_IDENTIFIER) group.com.rileytestut.AltStore - $(APP_GROUP_IDENTIFIER) ALTDeviceID 00008110-000A68390A82801E diff --git a/AltWidget/Info.plist b/AltWidget/Info.plist index 2f1663e7..e6228c88 100644 --- a/AltWidget/Info.plist +++ b/AltWidget/Info.plist @@ -4,8 +4,8 @@ ALTAppGroups + group.$(APP_GROUP_IDENTIFIER) group.com.rileytestut.AltStore - $(APP_GROUP_IDENTIFIER) CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) diff --git a/Dependencies/AltSign b/Dependencies/AltSign index 18c03405..03580f72 160000 --- a/Dependencies/AltSign +++ b/Dependencies/AltSign @@ -1 +1 @@ -Subproject commit 18c03405e35ef9f67cb0adf1805f183d6276a102 +Subproject commit 03580f72582fa6f81a1cbb92e2d7aa8935d2ec4f diff --git a/Dependencies/libimobiledevice b/Dependencies/libimobiledevice index 9b98387d..1d555f6f 160000 --- a/Dependencies/libimobiledevice +++ b/Dependencies/libimobiledevice @@ -1 +1 @@ -Subproject commit 9b98387dd8c78a3db388f10d0ac9bf980bbab777 +Subproject commit 1d555f6f2c10b5a3dff946b745633c398a186935