From 850214b103584ff6a5142a7771afe174fe757c51 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 05:20:24 -0400 Subject: [PATCH 1/7] Use XCConfig files for codesign and bundle ids Signed-off-by: Joseph Mattello --- AltServer.xcconfig | 1 + AltStore.xcconfig | 3 ++ AltStore.xcodeproj/project.pbxproj | 44 ++++++++++++++++++++++++------ AltStore/Info.plist | 1 + AltStoreCore.xcconfig | 3 ++ AltWidget/Info.plist | 1 + AltWidgetExtension.xcconfig | 3 ++ AltXPC.xcconfig | 1 + Build.xcconfig | 23 ++++++++++++++++ CodeSigning.xcconfig.sample | 39 ++++++++++++++++++++++++++ 10 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 AltServer.xcconfig create mode 100644 AltStore.xcconfig create mode 100644 AltStoreCore.xcconfig create mode 100644 AltWidgetExtension.xcconfig create mode 100644 AltXPC.xcconfig create mode 100644 Build.xcconfig create mode 100644 CodeSigning.xcconfig.sample diff --git a/AltServer.xcconfig b/AltServer.xcconfig new file mode 100644 index 00000000..7816cc9a --- /dev/null +++ b/AltServer.xcconfig @@ -0,0 +1 @@ +#include "Build.xcconfig" diff --git a/AltStore.xcconfig b/AltStore.xcconfig new file mode 100644 index 00000000..f8172a13 --- /dev/null +++ b/AltStore.xcconfig @@ -0,0 +1,3 @@ +#include "Build.xcconfig" + +PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).AltStore diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index 33c593e4..c2e80392 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -470,6 +470,14 @@ /* Begin PBXFileReference section */ 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; 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 = ""; }; + B3C39607284F4C8400DA9E2F /* Build.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Build.xcconfig; sourceTree = ""; }; + B3C39608284F4C8400DA9E2F /* CodeSigning.xcconfig.sample */ = {isa = PBXFileReference; lastKnownFileType = text; path = CodeSigning.xcconfig.sample; sourceTree = ""; }; + B3C39609284F4C9800DA9E2F /* AltServer.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltServer.xcconfig; sourceTree = ""; }; + B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltStore.xcconfig; sourceTree = ""; }; + B3C3960C284F4CDC00DA9E2F /* AltXPC.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltXPC.xcconfig; sourceTree = ""; }; + B3C3960D284F4E4B00DA9E2F /* AltWidgetExtension.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltWidgetExtension.xcconfig; sourceTree = ""; }; + B3C3960E284F4F9100DA9E2F /* AltStoreCore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltStoreCore.xcconfig; sourceTree = ""; }; BF02419522F2199300129732 /* RefreshAttemptsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshAttemptsViewController.swift; sourceTree = ""; }; 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 = ""; }; @@ -1474,6 +1482,14 @@ BFD247612284B9A500981D42 = { isa = PBXGroup; children = ( + B3C39607284F4C8400DA9E2F /* Build.xcconfig */, + B3C39606284F4C8400DA9E2F /* CodeSigning.xcconfig */, + B3C39608284F4C8400DA9E2F /* CodeSigning.xcconfig.sample */, + B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */, + B3C39609284F4C9800DA9E2F /* AltServer.xcconfig */, + B3C3960C284F4CDC00DA9E2F /* AltXPC.xcconfig */, + B3C3960D284F4E4B00DA9E2F /* AltWidgetExtension.xcconfig */, + B3C3960E284F4F9100DA9E2F /* AltStoreCore.xcconfig */, BFD2476C2284B9A500981D42 /* AltStore */, BF66EE7F2501AE50007EE018 /* AltStoreCore */, BF45868E229872EA00BD7491 /* AltServer */, @@ -2702,6 +2718,7 @@ }; BF45869B229872EA00BD7491 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C39609284F4C9800DA9E2F /* AltServer.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -2755,6 +2772,7 @@ }; BF45869C229872EA00BD7491 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C39609284F4C9800DA9E2F /* AltServer.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -2985,6 +3003,7 @@ }; BF66EE872501AE50007EE018 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960E284F4F9100DA9E2F /* AltStoreCore.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -3006,7 +3025,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltStoreCore; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; @@ -3021,6 +3040,7 @@ }; BF66EE882501AE50007EE018 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960E284F4F9100DA9E2F /* AltStoreCore.xcconfig */; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -3041,7 +3061,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltStoreCore; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; @@ -3056,6 +3076,7 @@ }; BF989179250AABF4002ACF50 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960D284F4E4B00DA9E2F /* AltWidgetExtension.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; @@ -3079,7 +3100,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltStore.AltWidget; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -3090,6 +3111,7 @@ }; BF98917A250AABF4002ACF50 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960D284F4E4B00DA9E2F /* AltWidgetExtension.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; @@ -3112,7 +3134,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltStore.AltWidget; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; @@ -3122,6 +3144,7 @@ }; BFD2477C2284B9A700981D42 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C39607284F4C8400DA9E2F /* Build.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3189,6 +3212,7 @@ }; BFD2477D2284B9A700981D42 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C39607284F4C8400DA9E2F /* Build.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3250,6 +3274,7 @@ }; BFD2477F2284B9A700981D42 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -3257,7 +3282,7 @@ CODE_SIGN_ENTITLEMENTS = AltStore/AltStore.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = AltStore/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.2; @@ -3271,7 +3296,7 @@ "$(PROJECT_DIR)/Dependencies/libcurl", ); MARKETING_VERSION = 1.5.1b; - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltStore; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -3284,6 +3309,7 @@ }; BFD247802284B9A700981D42 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -3291,7 +3317,7 @@ CODE_SIGN_ENTITLEMENTS = AltStore/AltStore.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = AltStore/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.2; @@ -3305,7 +3331,7 @@ "$(PROJECT_DIR)/Dependencies/libcurl", ); MARKETING_VERSION = 1.5.1b; - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltStore; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -3317,6 +3343,7 @@ }; BFF7C911257844C900E55F36 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960C284F4CDC00DA9E2F /* AltXPC.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -3347,6 +3374,7 @@ }; BFF7C912257844C900E55F36 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960C284F4CDC00DA9E2F /* AltXPC.xcconfig */; buildSettings = { CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; diff --git a/AltStore/Info.plist b/AltStore/Info.plist index 8b17b705..172e6199 100644 --- a/AltStore/Info.plist +++ b/AltStore/Info.plist @@ -5,6 +5,7 @@ ALTAppGroups group.com.rileytestut.AltStore + $(APP_GROUP_IDENTIFIER) ALTDeviceID 00008110-000A68390A82801E diff --git a/AltStoreCore.xcconfig b/AltStoreCore.xcconfig new file mode 100644 index 00000000..c5c159b0 --- /dev/null +++ b/AltStoreCore.xcconfig @@ -0,0 +1,3 @@ +#include "Build.xcconfig" + +PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltStoreCore diff --git a/AltWidget/Info.plist b/AltWidget/Info.plist index b0b95893..2f1663e7 100644 --- a/AltWidget/Info.plist +++ b/AltWidget/Info.plist @@ -5,6 +5,7 @@ ALTAppGroups group.com.rileytestut.AltStore + $(APP_GROUP_IDENTIFIER) CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) diff --git a/AltWidgetExtension.xcconfig b/AltWidgetExtension.xcconfig new file mode 100644 index 00000000..906558e4 --- /dev/null +++ b/AltWidgetExtension.xcconfig @@ -0,0 +1,3 @@ +#include "Build.xcconfig" + +PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltWidget diff --git a/AltXPC.xcconfig b/AltXPC.xcconfig new file mode 100644 index 00000000..7816cc9a --- /dev/null +++ b/AltXPC.xcconfig @@ -0,0 +1 @@ +#include "Build.xcconfig" diff --git a/Build.xcconfig b/Build.xcconfig new file mode 100644 index 00000000..10a40aa9 --- /dev/null +++ b/Build.xcconfig @@ -0,0 +1,23 @@ +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +MARKETING_VERSION = 1.5.1b +CURRENT_PROJECT_VERSION = 2780 + +// Vars to be overwritten by `CodeSigning.xcconfig` if exists +DEVELOPMENT_TEAM = S32Z3HMYVQ +ORG_IDENTIFIER = com.joemattiello + +// Codesigning settings defined optionally, see `CodeSigning.xcconfig.example` +#include? "CodeSigning.xcconfig" + +ORG_PREFIX = $(ORG_IDENTIFIER) + +PRODUCT_NAME = AltStore +//PRODUCT_NAME[configuration=Debug] = Prov Debug + +PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME) +//PRODUCT_BUNDLE_IDENTIFIER[configuration=Debug] = $(ORG_PREFIX).$(PROJECT_NAME:lower)-debug + +APP_GROUP_IDENTIFIER = group.$(ORG_PREFIX).$(PROJECT_NAME) +ICLOUD_CONTAINER_IDENTIFIER = iCloud.$(ORG_PREFIX).$(PROJECT_NAME) diff --git a/CodeSigning.xcconfig.sample b/CodeSigning.xcconfig.sample new file mode 100644 index 00000000..3133e24a --- /dev/null +++ b/CodeSigning.xcconfig.sample @@ -0,0 +1,39 @@ +// Your Team ID. +// If you have a paid Apple Developer account, you can find your Team ID at +// https://developer.apple.com/account/#/membership +DEVELOPMENT_TEAM = XYZ0123456 + +// Prefix of unique bundle IDs registered to you in Apple Developer Portal. +// You need to register: +// - com.myuniquename.provenance +// - com.myuniquename.provenance.spotlight +// - com.myuniquename.provenance.topshelf +ORG_IDENTIFIER = com.myuniquename + +// Set to YES if you have a valid paid Apple Developer account +DEVELOPER_ACCOUNT_PAID = NO + +// Name of the iOS development signing certificate, you probably do not need +// to change this. +CODE_SIGN_IDENTITY_IOS = Apple Development + +// Name of the iOS development signing certificate, you probably do not need +// to change this. +CODE_SIGN_IDENTITY_TVOS = Apple Development + +// The values below are specific to macOS development. If you do not define +// these keys, the build will default to ad-hoc signing. You will need to +// follow `Documentation/MacDevelopment.md` to disable library verification and +// remove unsupported entitlements. + +// Name of the macOS development signing certificate. Comment out this line to +// use ad-hoc signing. +CODE_SIGN_IDENTITY_MAC = Apple Development + +// Create a Mac provisioning profile for com.myuniquename.UTM with the +// Hypervisor entitlements and get its UUID. If you do not have access to these +// entitlements, comment out the line and delete the following entitlements +// - com.apple.vm.device-access +// from the following file +// - Provenance/macOS.entitlements +PROVISIONING_PROFILE_SPECIFIER_MAC = 00000000-1111-2222-3333-444444444444 From e1e395023d990c54f2c7b46485cebc55c412b7e0 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 05:39:01 -0400 Subject: [PATCH 2/7] AltStore & AltServer builds with XCConfig Signed-off-by: Joseph Mattello --- AltBackup.xcconfig | 3 +++ AltBackup/AltBackup.entitlements | 2 +- AltBackup/Info.plist | 2 +- AltDaemon/AltDaemon.entitlements | 2 +- AltStore.xcodeproj/project.pbxproj | 32 +++++++++++++---------- AltStore/AltStore.entitlements | 2 +- AltWidget/AltWidgetExtension.entitlements | 2 +- Build.xcconfig | 2 +- 8 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 AltBackup.xcconfig diff --git a/AltBackup.xcconfig b/AltBackup.xcconfig new file mode 100644 index 00000000..2780fd96 --- /dev/null +++ b/AltBackup.xcconfig @@ -0,0 +1,3 @@ +#include "Build.xcconfig" + +PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).AltBackup diff --git a/AltBackup/AltBackup.entitlements b/AltBackup/AltBackup.entitlements index 099f1e39..95af4a86 100644 --- a/AltBackup/AltBackup.entitlements +++ b/AltBackup/AltBackup.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.com.rileytestut.AltStore + group.$(APP_GROUP_IDENTIFIER) diff --git a/AltBackup/Info.plist b/AltBackup/Info.plist index 63d01c06..7a5e62dd 100644 --- a/AltBackup/Info.plist +++ b/AltBackup/Info.plist @@ -7,7 +7,7 @@ group.com.rileytestut.AltStore ALTBundleIdentifier - com.rileytestut.AltBackup + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable diff --git a/AltDaemon/AltDaemon.entitlements b/AltDaemon/AltDaemon.entitlements index 3dfaef0b..0e9e5703 100644 --- a/AltDaemon/AltDaemon.entitlements +++ b/AltDaemon/AltDaemon.entitlements @@ -3,7 +3,7 @@ application-identifier - 6XVY5G3U44.com.rileytestut.AltDaemon + $(DEVELOPMENT_TEAM).$(ORG_IDENTIFIER).AltDaemon get-task-allow platform-application diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index c2e80392..b964bd95 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -478,6 +478,7 @@ B3C3960C284F4CDC00DA9E2F /* AltXPC.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltXPC.xcconfig; sourceTree = ""; }; B3C3960D284F4E4B00DA9E2F /* AltWidgetExtension.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltWidgetExtension.xcconfig; sourceTree = ""; }; B3C3960E284F4F9100DA9E2F /* AltStoreCore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltStoreCore.xcconfig; sourceTree = ""; }; + B3C3960F284F53E900DA9E2F /* AltBackup.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AltBackup.xcconfig; sourceTree = ""; }; BF02419522F2199300129732 /* RefreshAttemptsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshAttemptsViewController.swift; sourceTree = ""; }; 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 = ""; }; @@ -1486,6 +1487,7 @@ B3C39606284F4C8400DA9E2F /* CodeSigning.xcconfig */, B3C39608284F4C8400DA9E2F /* CodeSigning.xcconfig.sample */, B3C3960B284F4C9800DA9E2F /* AltStore.xcconfig */, + B3C3960F284F53E900DA9E2F /* AltBackup.xcconfig */, B3C39609284F4C9800DA9E2F /* AltServer.xcconfig */, B3C3960C284F4CDC00DA9E2F /* AltXPC.xcconfig */, B3C3960D284F4E4B00DA9E2F /* AltWidgetExtension.xcconfig */, @@ -2640,7 +2642,7 @@ CODE_SIGN_ENTITLEMENTS = AltDaemon/AltDaemon.entitlements; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; EXECUTABLE_EXTENSION = ""; @@ -2682,7 +2684,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CODE_SIGN_ENTITLEMENTS = AltDaemon/AltDaemon.entitlements; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; DYLIB_COMPATIBILITY_VERSION = ""; DYLIB_CURRENT_VERSION = ""; EXECUTABLE_EXTENSION = ""; @@ -2727,7 +2729,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 66; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2781,7 +2783,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 66; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2828,7 +2830,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -2866,7 +2868,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; EXECUTABLE_PREFIX = lib; GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_RTTI = YES; @@ -2901,19 +2903,20 @@ }; BF58048C246A28F9008AE704 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960F284F53E900DA9E2F /* AltBackup.xcconfig */; buildSettings = { CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CODE_SIGN_ENTITLEMENTS = AltBackup/AltBackup.entitlements; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; INFOPLIST_FILE = AltBackup/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.2; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltBackup; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -2922,18 +2925,19 @@ }; BF58048D246A28F9008AE704 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B3C3960F284F53E900DA9E2F /* AltBackup.xcconfig */; buildSettings = { CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CODE_SIGN_ENTITLEMENTS = AltBackup/AltBackup.entitlements; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; INFOPLIST_FILE = AltBackup/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.2; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.rileytestut.AltBackup; + PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -3087,7 +3091,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/iossimulator", @@ -3121,7 +3125,7 @@ CODE_SIGN_ENTITLEMENTS = AltWidget/AltWidgetExtension.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Dependencies/AltSign/Dependencies/OpenSSL/Frameworks/iossimulator", @@ -3353,7 +3357,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = AltXPC/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -3383,7 +3387,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 6XVY5G3U44; + DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = AltXPC/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/AltStore/AltStore.entitlements b/AltStore/AltStore.entitlements index 9f0dbc01..2a941d95 100644 --- a/AltStore/AltStore.entitlements +++ b/AltStore/AltStore.entitlements @@ -8,7 +8,7 @@ com.apple.security.application-groups - group.com.rileytestut.AltStore + group.$(APP_GROUP_IDENTIFIER) diff --git a/AltWidget/AltWidgetExtension.entitlements b/AltWidget/AltWidgetExtension.entitlements index 099f1e39..95af4a86 100644 --- a/AltWidget/AltWidgetExtension.entitlements +++ b/AltWidget/AltWidgetExtension.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.com.rileytestut.AltStore + group.$(APP_GROUP_IDENTIFIER) diff --git a/Build.xcconfig b/Build.xcconfig index 10a40aa9..6a56fe97 100644 --- a/Build.xcconfig +++ b/Build.xcconfig @@ -19,5 +19,5 @@ PRODUCT_NAME = AltStore PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME) //PRODUCT_BUNDLE_IDENTIFIER[configuration=Debug] = $(ORG_PREFIX).$(PROJECT_NAME:lower)-debug -APP_GROUP_IDENTIFIER = group.$(ORG_PREFIX).$(PROJECT_NAME) +APP_GROUP_IDENTIFIER = $(ORG_PREFIX).$(PROJECT_NAME) ICLOUD_CONTAINER_IDENTIFIER = iCloud.$(ORG_PREFIX).$(PROJECT_NAME) From 03235203892af1b36352874ae0072bc60fb28297 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 05:57:45 -0400 Subject: [PATCH 3/7] Remove workspace requirement for xcodeproj Signed-off-by: Joseph Mattello --- AltStore.xcodeproj/project.pbxproj | 77 +++++++++++++++++++ .../contents.xcworkspacedata | 2 +- .../xcshareddata/swiftpm/Package.resolved | 68 ++++++++++++++++ AltStore.xcworkspace/contents.xcworkspacedata | 13 ---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -- .../xcshareddata/swiftpm/Package.resolved | 70 ----------------- 6 files changed, 146 insertions(+), 92 deletions(-) create mode 100644 AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 AltStore.xcworkspace/contents.xcworkspacedata delete mode 100644 AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index b964bd95..dc292adb 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 */; }; + 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 */; }; B3C395F1284F2DE700DA9E2F /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F0284F2DE700DA9E2F /* KeychainAccess */; }; B3C395F4284F35DD00DA9E2F /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = B3C395F3284F35DD00DA9E2F /* Nuke */; }; @@ -371,6 +373,27 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + B3146ECC284F580500BBC3FD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BFADAFF819AE7BB70050CF31; + remoteInfo = Roxas; + }; + B3146ECE284F580500BBC3FD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BF8624801BB742E700C12EEE; + remoteInfo = RoxasTV; + }; + B3146ED0284F580500BBC3FD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = BFADB00319AE7BB80050CF31; + remoteInfo = RoxasTests; + }; BF4588442298D48B00BD7491 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFD247622284B9A500981D42 /* Project object */; @@ -427,6 +450,7 @@ dstPath = ""; dstSubfolderSpec = 10; 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 */, @@ -469,6 +493,8 @@ /* 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 = ""; }; B3C39607284F4C8400DA9E2F /* Build.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Build.xcconfig; sourceTree = ""; }; @@ -907,6 +933,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B3146ED2284F581E00BBC3FD /* Roxas.framework in Frameworks */, D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */, B3C395F9284F362400DA9E2F /* AppCenterCrashes in Frameworks */, D533E8BE2727BBF800A9B5DD /* libcurl.a in Frameworks */, @@ -929,6 +956,24 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + B3146EC4284F57EF00BBC3FD /* Packages */ = { + isa = PBXGroup; + children = ( + B3146EC5284F57EF00BBC3FD /* AltSign */, + ); + name = Packages; + sourceTree = ""; + }; + B3146EC7284F580500BBC3FD /* Products */ = { + isa = PBXGroup; + children = ( + B3146ECD284F580500BBC3FD /* Roxas.framework */, + B3146ECF284F580500BBC3FD /* Roxas.framework */, + B3146ED1284F580500BBC3FD /* RoxasTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; BF055B4A233B528B0086DEA9 /* Extensions */ = { isa = PBXGroup; children = ( @@ -1503,6 +1548,8 @@ BF98916C250AABF3002ACF50 /* AltWidget */, BFF7C905257844C900E55F36 /* AltXPC */, BFD247852284BB3300981D42 /* Frameworks */, + B3146EC4284F57EF00BBC3FD /* Packages */, + B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */, BFD2476B2284B9A500981D42 /* Products */, ); sourceTree = ""; @@ -2112,6 +2159,12 @@ ); productRefGroup = BFD2476B2284B9A500981D42 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = B3146EC7284F580500BBC3FD /* Products */; + ProjectRef = B3146EC6284F580500BBC3FD /* Roxas.xcodeproj */; + }, + ); projectRoot = ""; targets = ( BFD247692284B9A500981D42 /* AltStore */, @@ -2127,6 +2180,30 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + B3146ECD284F580500BBC3FD /* Roxas.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Roxas.framework; + remoteRef = B3146ECC284F580500BBC3FD /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B3146ECF284F580500BBC3FD /* Roxas.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Roxas.framework; + remoteRef = B3146ECE284F580500BBC3FD /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + B3146ED1284F580500BBC3FD /* RoxasTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = RoxasTests.xctest; + remoteRef = B3146ED0284F580500BBC3FD /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ BF45868B229872EA00BD7491 /* Resources */ = { isa = PBXResourcesBuildPhase; diff --git a/AltStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/AltStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 7b573426..919434a6 100644 --- a/AltStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/AltStore.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 00000000..fa9a9cd1 --- /dev/null +++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,68 @@ +{ + "pins" : [ + { + "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" : "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.xcworkspace/contents.xcworkspacedata b/AltStore.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index ef0df931..00000000 --- a/AltStore.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - diff --git a/AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/AltStore.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 5c4dff3d..00000000 --- a/AltStore.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,70 +0,0 @@ -{ - "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 - } - } - ] - }, - "version": 1 -} From 8dc097e23c662d0586da74b4362da3361f135b27 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 05:59:15 -0400 Subject: [PATCH 4/7] AltSign remove warning Signed-off-by: Joseph Mattello --- Dependencies/AltSign | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dependencies/AltSign b/Dependencies/AltSign index 6c3b16ec..18c03405 160000 --- a/Dependencies/AltSign +++ b/Dependencies/AltSign @@ -1 +1 @@ -Subproject commit 6c3b16ec8608a4c729991981509ddf7a36e7a8ee +Subproject commit 18c03405e35ef9f67cb0adf1805f183d6276a102 From a56a48145bf9b84557a38ed5bc61378376b77ffc Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 06:01:23 -0400 Subject: [PATCH 5/7] spm touches Signed-off-by: Joseph Mattello --- .../xcshareddata/swiftpm/Package.resolved | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index fa9a9cd1..1588591d 100644 --- a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,23 +1,5 @@ { "pins" : [ - { - "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", @@ -26,42 +8,6 @@ "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" : "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 From 2b3d41d9821b2f59a6692078ff13b6ee31313d3a Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 06:10:13 -0400 Subject: [PATCH 6/7] refactor sparkle URLs to info.plist Signed-off-by: Joseph Mattello --- AltServer/AppDelegate.swift | 6 ++++-- AltServer/Info.plist | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AltServer/AppDelegate.swift b/AltServer/AppDelegate.swift index cde13ae3..90ac42a1 100644 --- a/AltServer/AppDelegate.swift +++ b/AltServer/AppDelegate.swift @@ -66,11 +66,13 @@ class AppDelegate: NSObject, NSApplicationDelegate { ALTDeviceManager.shared.start() #if STAGING - SUUpdater.shared().feedURL = URL(string: "https://altstore.io/altserver/sparkle-macos-staging.xml") + let feedURL: String = Bundle.main.infoDictionary!["SUFeedURL"]! as! String #else - SUUpdater.shared().feedURL = URL(string: "https://altstore.io/altserver/sparkle-macos.xml") + 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") diff --git a/AltServer/Info.plist b/AltServer/Info.plist index 096397d2..df713a6b 100644 --- a/AltServer/Info.plist +++ b/AltServer/Info.plist @@ -32,5 +32,7 @@ NSApplication SUFeedURL https://altstore.io/altserver/sparkle-macos.xml + SUFeedURL-Staging + https://altstore.io/altserver/sparkle-macos-staging.xml From 012a7885ffb81c620b629a07157cc304846ab389 Mon Sep 17 00:00:00 2001 From: Joseph Mattello Date: Tue, 7 Jun 2022 06:10:23 -0400 Subject: [PATCH 7/7] xcode touching packages Signed-off-by: Joseph Mattello --- .../xcshareddata/swiftpm/Package.resolved | 78 ++++++++++++++++--- 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1588591d..5c4dff3d 100644 --- a/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/AltStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,14 +1,70 @@ { - "pins" : [ - { - "identity" : "launchatlogin", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sindresorhus/LaunchAtLogin.git", - "state" : { - "revision" : "e8171b3e38a2816f579f58f3dac1522aa39efe41", - "version" : "4.2.0" + "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 + } } - } - ], - "version" : 2 + ] + }, + "version": 1 }