diff --git a/.gitmodules b/.gitmodules index 82b79895..30be057f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "Dependencies/Roxas"] path = Dependencies/Roxas url = https://github.com/rileytestut/Roxas.git -[submodule "Dependencies/AltSign"] - path = Dependencies/AltSign - url = https://github.com/SideStore/AltSign.git [submodule "Dependencies/libimobiledevice"] path = Dependencies/libimobiledevice url = https://github.com/SideStore/libimobiledevice.git 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..bbec1566 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -8,6 +8,8 @@ /* Begin PBXBuildFile section */ 19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */; }; + 4879A95F2861046500FC1BBD /* AltSign in Frameworks */ = {isa = PBXBuildFile; productRef = 4879A95E2861046500FC1BBD /* AltSign */; }; + 4879A9622861049C00FC1BBD /* OpenSSL in Frameworks */ = {isa = PBXBuildFile; productRef = 4879A9612861049C00FC1BBD /* OpenSSL */; }; B3146ED2284F581E00BBC3FD /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3146ECD284F580500BBC3FD /* Roxas.framework */; }; B3146ED3284F581E00BBC3FD /* Roxas.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B3146ECD284F580500BBC3FD /* Roxas.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B39575F5284F29E20080B4FF /* Roxas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B39575F4284F29E20080B4FF /* Roxas.framework */; }; @@ -21,13 +23,6 @@ BF0241AA22F29CCD00129732 /* UserDefaults+AltServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0241A922F29CCD00129732 /* UserDefaults+AltServer.swift */; }; BF08858322DE795100DE9F1E /* MyAppsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF08858222DE795100DE9F1E /* MyAppsViewController.swift */; }; BF08858522DE7EC800DE9F1E /* UpdateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF08858422DE7EC800DE9F1E /* UpdateCollectionViewCell.swift */; }; - BF088D0F25019ABA008082D9 /* AltSign-Static in Frameworks */ = {isa = PBXBuildFile; productRef = BF088D0E25019ABA008082D9 /* AltSign-Static */; }; - BF088D332501A4FF008082D9 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF088D322501A4FF008082D9 /* OpenSSL.xcframework */; }; - BF088D342501A4FF008082D9 /* OpenSSL.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF088D322501A4FF008082D9 /* OpenSSL.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - BF088D362501A821008082D9 /* AltSign-Dynamic in Frameworks */ = {isa = PBXBuildFile; productRef = BF088D352501A821008082D9 /* AltSign-Dynamic */; }; - BF088D372501A821008082D9 /* AltSign-Dynamic in Embed Frameworks */ = {isa = PBXBuildFile; productRef = BF088D352501A821008082D9 /* AltSign-Dynamic */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - BF088D382501A833008082D9 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF088D322501A4FF008082D9 /* OpenSSL.xcframework */; }; - BF088D392501A833008082D9 /* OpenSSL.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = BF088D322501A4FF008082D9 /* OpenSSL.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; BF0C4EBD22A1BD8B009A2DD7 /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0C4EBC22A1BD8B009A2DD7 /* AppManager.swift */; }; BF0DCA662433BDF500E3A595 /* AnalyticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF0DCA652433BDF500E3A595 /* AnalyticsManager.swift */; }; BF10EB34248730750055E6DB /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF10EB33248730750055E6DB /* main.swift */; }; @@ -52,8 +47,6 @@ BF41B806233423AE00C593A3 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF41B805233423AE00C593A3 /* TabBarController.swift */; }; BF41B808233433C100C593A3 /* LoadingState.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF41B807233433C100C593A3 /* LoadingState.swift */; }; BF42345A25101C35006D1EB2 /* WidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF42345825101C1D006D1EB2 /* WidgetView.swift */; }; - BF42345C251024B0006D1EB2 /* AltSign-Static in Frameworks */ = {isa = PBXBuildFile; productRef = BF42345B251024B0006D1EB2 /* AltSign-Static */; }; - BF42345D25102688006D1EB2 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF088D322501A4FF008082D9 /* OpenSSL.xcframework */; }; BF44EEF0246B08BA002A52F2 /* BackupController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF44EEEF246B08BA002A52F2 /* BackupController.swift */; }; BF44EEF3246B3A17002A52F2 /* AltBackup.ipa in Resources */ = {isa = PBXBuildFile; fileRef = BF44EEF2246B3A17002A52F2 /* AltBackup.ipa */; }; BF44EEFC246B4550002A52F2 /* RemoveAppOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF44EEFB246B4550002A52F2 /* RemoveAppOperation.swift */; }; @@ -438,8 +431,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - BF088D392501A833008082D9 /* OpenSSL.xcframework in Embed Frameworks */, - BF088D372501A821008082D9 /* AltSign-Dynamic in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -452,7 +443,6 @@ files = ( B3146ED3284F581E00BBC3FD /* Roxas.framework in Embed Frameworks */, BF1614F2250822F100767AEA /* Roxas.framework in Embed Frameworks */, - BF088D342501A4FF008082D9 /* OpenSSL.xcframework in Embed Frameworks */, BF66EE862501AE50007EE018 /* AltStoreCore.framework in Embed Frameworks */, ); name = "Embed Frameworks"; @@ -493,7 +483,6 @@ /* Begin PBXFileReference section */ 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = ""; }; - B3146EC5284F57EF00BBC3FD /* AltSign */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = AltSign; path = Dependencies/AltSign; sourceTree = ""; }; B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Roxas.xcodeproj; path = Dependencies/Roxas/Roxas.xcodeproj; sourceTree = ""; }; B39575F4284F29E20080B4FF /* Roxas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Roxas.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B3C39606284F4C8400DA9E2F /* CodeSigning.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = CodeSigning.xcconfig; sourceTree = ""; }; @@ -509,7 +498,6 @@ BF0241A922F29CCD00129732 /* UserDefaults+AltServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+AltServer.swift"; sourceTree = ""; }; BF08858222DE795100DE9F1E /* MyAppsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyAppsViewController.swift; sourceTree = ""; }; BF08858422DE7EC800DE9F1E /* UpdateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateCollectionViewCell.swift; sourceTree = ""; }; - BF088D322501A4FF008082D9 /* OpenSSL.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/OpenSSL.xcframework; sourceTree = ""; }; BF0C4EBC22A1BD8B009A2DD7 /* AppManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; BF0DCA652433BDF500E3A595 /* AnalyticsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsManager.swift; sourceTree = ""; }; BF10EB33248730750055E6DB /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; @@ -877,7 +865,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - BF088D0F25019ABA008082D9 /* AltSign-Static in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -887,11 +874,9 @@ files = ( D58D5F2E26DFE68E00E55E38 /* LaunchAtLogin in Frameworks */, B3C395FF284F3C0900DA9E2F /* STPrivilegedTask in Frameworks */, - BF088D382501A833008082D9 /* OpenSSL.xcframework in Frameworks */, BF4588882298DD3F00BD7491 /* libxml2.tbd in Frameworks */, B3C395FC284F3B2400DA9E2F /* Sparkle in Frameworks */, BF4588472298D4B000BD7491 /* libimobiledevice.a in Frameworks */, - BF088D362501A821008082D9 /* AltSign-Dynamic in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -915,9 +900,8 @@ buildActionMask = 2147483647; files = ( B3C395F1284F2DE700DA9E2F /* KeychainAccess in Frameworks */, - BF42345D25102688006D1EB2 /* OpenSSL.xcframework in Frameworks */, + 4879A95F2861046500FC1BBD /* AltSign in Frameworks */, B39575F5284F29E20080B4FF /* Roxas.framework in Frameworks */, - BF42345C251024B0006D1EB2 /* AltSign-Static in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -937,10 +921,10 @@ D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */, B3C395F9284F362400DA9E2F /* AppCenterCrashes in Frameworks */, D533E8BE2727BBF800A9B5DD /* libcurl.a in Frameworks */, + 4879A9622861049C00FC1BBD /* OpenSSL in Frameworks */, B3C395F4284F35DD00DA9E2F /* Nuke in Frameworks */, BF1614F1250822F100767AEA /* Roxas.framework in Frameworks */, B3C395F7284F362400DA9E2F /* AppCenterAnalytics in Frameworks */, - BF088D332501A4FF008082D9 /* OpenSSL.xcframework in Frameworks */, D533E8BC2727BBEE00A9B5DD /* libfragmentzip.a in Frameworks */, BF66EE852501AE50007EE018 /* AltStoreCore.framework in Frameworks */, ); @@ -956,14 +940,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - B3146EC4284F57EF00BBC3FD /* Packages */ = { - isa = PBXGroup; - children = ( - B3146EC5284F57EF00BBC3FD /* AltSign */, - ); - name = Packages; - sourceTree = ""; - }; B3146EC7284F580500BBC3FD /* Products */ = { isa = PBXGroup; children = ( @@ -1548,7 +1524,6 @@ BF98916C250AABF3002ACF50 /* AltWidget */, BFF7C905257844C900E55F36 /* AltXPC */, BFD247852284BB3300981D42 /* Frameworks */, - B3146EC4284F57EF00BBC3FD /* Packages */, B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */, BFD2476B2284B9A500981D42 /* Products */, ); @@ -1607,7 +1582,6 @@ children = ( B39575F4284F29E20080B4FF /* Roxas.framework */, D533E8B62727841800A9B5DD /* libAppleArchive.tbd */, - BF088D322501A4FF008082D9 /* OpenSSL.xcframework */, BF580497246A3D19008AE704 /* UIKit.framework */, BF4588872298DD3F00BD7491 /* libxml2.tbd */, BFD247862284BB3B00981D42 /* Roxas.framework */, @@ -1909,7 +1883,6 @@ ); name = AltDaemon; packageProductDependencies = ( - BF088D0E25019ABA008082D9 /* AltSign-Static */, ); productName = AltDaemon; productReference = BF18BFE724857D7900DD5981 /* AltDaemon */; @@ -1923,8 +1896,6 @@ BF45868B229872EA00BD7491 /* Resources */, BF4588462298D4AA00BD7491 /* Frameworks */, BF0201BC22C2EFA3000B93E4 /* Embed Frameworks */, - BF7FDA2C23203B6B00B5D3A4 /* Copy Launcher App */, - BF914C242383659400E713BA /* Sign Frameworks */, BFF7C910257844C900E55F36 /* Embed XPC Services */, ); buildRules = ( @@ -1935,7 +1906,6 @@ ); name = AltServer; packageProductDependencies = ( - BF088D352501A821008082D9 /* AltSign-Dynamic */, D58D5F2D26DFE68E00E55E38 /* LaunchAtLogin */, B3C395FB284F3B2400DA9E2F /* Sparkle */, B3C395FE284F3C0900DA9E2F /* STPrivilegedTask */, @@ -2011,8 +1981,8 @@ ); name = AltStoreCore; packageProductDependencies = ( - BF42345B251024B0006D1EB2 /* AltSign-Static */, B3C395F0284F2DE700DA9E2F /* KeychainAccess */, + 4879A95E2861046500FC1BBD /* AltSign */, ); productName = AltStoreCore; productReference = BF66EE7E2501AE50007EE018 /* AltStoreCore.framework */; @@ -2057,6 +2027,7 @@ B3C395F3284F35DD00DA9E2F /* Nuke */, B3C395F6284F362400DA9E2F /* AppCenterAnalytics */, B3C395F8284F362400DA9E2F /* AppCenterCrashes */, + 4879A9612861049C00FC1BBD /* OpenSSL */, ); productName = AltStore; productReference = BFD2476A2284B9A500981D42 /* AltStore.app */; @@ -2156,6 +2127,8 @@ B3C395F5284F362400DA9E2F /* XCRemoteSwiftPackageReference "appcenter-sdk-apple" */, B3C395FA284F3B2400DA9E2F /* XCRemoteSwiftPackageReference "Sparkle" */, B3C395FD284F3C0900DA9E2F /* XCRemoteSwiftPackageReference "STPrivilegedTask" */, + 4879A95D2861046500FC1BBD /* XCRemoteSwiftPackageReference "AltSign" */, + 4879A9602861049C00FC1BBD /* XCRemoteSwiftPackageReference "OpenSSL" */, ); productRefGroup = BFD2476B2284B9A500981D42 /* Products */; projectDirPath = ""; @@ -2278,45 +2251,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 +2742,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 +2792,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, @@ -3169,11 +3095,7 @@ CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/iossimulator", - "$(PROJECT_DIR)/Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/ios", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = AltWidget/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -3203,11 +3125,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/iossimulator", - "$(PROJECT_DIR)/Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/ios", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = AltWidget/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -3366,7 +3284,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 +3319,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", @@ -3578,6 +3496,22 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ + 4879A95D2861046500FC1BBD /* XCRemoteSwiftPackageReference "AltSign" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/SideStore/AltSign"; + requirement = { + branch = master; + kind = branch; + }; + }; + 4879A9602861049C00FC1BBD /* XCRemoteSwiftPackageReference "OpenSSL" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/krzyzanowskim/OpenSSL"; + requirement = { + kind = upToNextMinorVersion; + minimumVersion = 1.1.180; + }; + }; B3C395EF284F2DE700DA9E2F /* XCRemoteSwiftPackageReference "KeychainAccess" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git"; @@ -3629,6 +3563,16 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 4879A95E2861046500FC1BBD /* AltSign */ = { + isa = XCSwiftPackageProductDependency; + package = 4879A95D2861046500FC1BBD /* XCRemoteSwiftPackageReference "AltSign" */; + productName = AltSign; + }; + 4879A9612861049C00FC1BBD /* OpenSSL */ = { + isa = XCSwiftPackageProductDependency; + package = 4879A9602861049C00FC1BBD /* XCRemoteSwiftPackageReference "OpenSSL" */; + productName = OpenSSL; + }; B3C395F0284F2DE700DA9E2F /* KeychainAccess */ = { isa = XCSwiftPackageProductDependency; package = B3C395EF284F2DE700DA9E2F /* XCRemoteSwiftPackageReference "KeychainAccess" */; @@ -3659,18 +3603,6 @@ package = B3C395FD284F3C0900DA9E2F /* XCRemoteSwiftPackageReference "STPrivilegedTask" */; productName = STPrivilegedTask; }; - BF088D0E25019ABA008082D9 /* AltSign-Static */ = { - isa = XCSwiftPackageProductDependency; - productName = "AltSign-Static"; - }; - BF088D352501A821008082D9 /* AltSign-Dynamic */ = { - isa = XCSwiftPackageProductDependency; - productName = "AltSign-Dynamic"; - }; - BF42345B251024B0006D1EB2 /* AltSign-Static */ = { - isa = XCSwiftPackageProductDependency; - productName = "AltSign-Static"; - }; D58D5F2D26DFE68E00E55E38 /* LaunchAtLogin */ = { isa = XCSwiftPackageProductDependency; package = D58D5F2C26DFE68E00E55E38 /* XCRemoteSwiftPackageReference "LaunchAtLogin" */; diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 5c4dff3d..ce2c36c6 100644 --- a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,70 +1,86 @@ { - "object": { - "pins": [ - { - "package": "AppCenter", - "repositoryURL": "https://github.com/microsoft/appcenter-sdk-apple.git", - "state": { - "branch": null, - "revision": "8354a50fe01a7e54e196d3b5493b5ab53dd5866a", - "version": "4.4.2" - } - }, - { - "package": "KeychainAccess", - "repositoryURL": "https://github.com/kishikawakatsumi/KeychainAccess.git", - "state": { - "branch": null, - "revision": "84e546727d66f1adc5439debad16270d0fdd04e7", - "version": "4.2.2" - } - }, - { - "package": "LaunchAtLogin", - "repositoryURL": "https://github.com/sindresorhus/LaunchAtLogin.git", - "state": { - "branch": null, - "revision": "e8171b3e38a2816f579f58f3dac1522aa39efe41", - "version": "4.2.0" - } - }, - { - "package": "Nuke", - "repositoryURL": "https://github.com/kean/Nuke.git", - "state": { - "branch": null, - "revision": "9318d02a8a6d20af56505c9673261c1fd3b3aebe", - "version": "7.6.3" - } - }, - { - "package": "PLCrashReporter", - "repositoryURL": "https://github.com/microsoft/PLCrashReporter.git", - "state": { - "branch": null, - "revision": "6b27393cad517c067dceea85fadf050e70c4ceaa", - "version": "1.10.1" - } - }, - { - "package": "Sparkle", - "repositoryURL": "https://github.com/sparkle-project/Sparkle.git", - "state": { - "branch": null, - "revision": "286edd1fa22505a9e54d170e9fd07d775ea233f2", - "version": "2.1.0" - } - }, - { - "package": "STPrivilegedTask", - "repositoryURL": "https://github.com/JoeMatt/STPrivilegedTask.git", - "state": { - "branch": "master", - "revision": "10a9150ef32d444af326beba76356ae9af95a3e7", - "version": null - } + "pins" : [ + { + "identity" : "altsign", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SideStore/AltSign", + "state" : { + "branch" : "master", + "revision" : "7e0e7edcf8fbc44ac1e35da3e9030a297aa18b84" } - ] - }, - "version": 1 + }, + { + "identity" : "appcenter-sdk-apple", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/appcenter-sdk-apple.git", + "state" : { + "revision" : "8354a50fe01a7e54e196d3b5493b5ab53dd5866a", + "version" : "4.4.2" + } + }, + { + "identity" : "keychainaccess", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kishikawakatsumi/KeychainAccess.git", + "state" : { + "revision" : "84e546727d66f1adc5439debad16270d0fdd04e7", + "version" : "4.2.2" + } + }, + { + "identity" : "launchatlogin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sindresorhus/LaunchAtLogin.git", + "state" : { + "revision" : "e8171b3e38a2816f579f58f3dac1522aa39efe41", + "version" : "4.2.0" + } + }, + { + "identity" : "nuke", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kean/Nuke.git", + "state" : { + "revision" : "9318d02a8a6d20af56505c9673261c1fd3b3aebe", + "version" : "7.6.3" + } + }, + { + "identity" : "openssl", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/OpenSSL", + "state" : { + "revision" : "033fcb41dac96b1b6effa945ca1f9ade002370b2", + "version" : "1.1.1501" + } + }, + { + "identity" : "plcrashreporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/PLCrashReporter.git", + "state" : { + "revision" : "6b27393cad517c067dceea85fadf050e70c4ceaa", + "version" : "1.10.1" + } + }, + { + "identity" : "sparkle", + "kind" : "remoteSourceControl", + "location" : "https://github.com/sparkle-project/Sparkle.git", + "state" : { + "revision" : "286edd1fa22505a9e54d170e9fd07d775ea233f2", + "version" : "2.1.0" + } + }, + { + "identity" : "stprivilegedtask", + "kind" : "remoteSourceControl", + "location" : "https://github.com/JoeMatt/STPrivilegedTask.git", + "state" : { + "branch" : "master", + "revision" : "10a9150ef32d444af326beba76356ae9af95a3e7" + } + } + ], + "version" : 2 } 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 deleted file mode 160000 index 18c03405..00000000 --- a/Dependencies/AltSign +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18c03405e35ef9f67cb0adf1805f183d6276a102 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 diff --git a/README.md b/README.md index 87e52aaf..5e8817dd 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ SideStore is a alternative to AltStore and is a sandboxed iOS application like A [Netmuxd](https://github.com/jkcoxson/netmuxd) is a program that replaces Usbmuxd to be able to connect over a VPN reliably. It is programmed in the Rust programming language and it is open source. ### Roxas -Roxas is Riley Testut's internal framework from AltStore used across many of their iOS projects, developed to simplify a variety of common tasks used in iOS development. For more info, check the [Roxas repo](https://github.com/rileytestut/roxas). +[Roxas](https://github.com/rileytestut/roxas) is Riley Testut's internal framework from AltStore used across many of their iOS projects, developed to simplify a variety of common tasks used in iOS development. ## Compilation Instructions AltStore and AltServer are both fairly straightforward to compile and run if you're already an iOS or macOS developer. To compile AltStore and/or AltServer: