From 3d444f301d1dc0f886cd30151ce1c3c7973dbce8 Mon Sep 17 00:00:00 2001 From: mahee96 <47920326+mahee96@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:03:49 -0700 Subject: [PATCH] - stosVPN-integration: Removed em_proxy and EmotionalDamage module in favour of stosVPN --- AltStore.xcodeproj/project.pbxproj | 191 ---------- AltStore/AppDelegate.swift | 2 - AltStore/LaunchViewController.swift | 2 - .../BackgroundRefreshAppsOperation.swift | 2 - AltStore/SceneDelegate.swift | 2 - .../EmotionalDamage/EmotionalDamage.swift | 18 - SideStore/em_proxy.xcodeproj/project.pbxproj | 343 ------------------ 7 files changed, 560 deletions(-) delete mode 100644 SideStore/EmotionalDamage/EmotionalDamage.swift delete mode 100644 SideStore/em_proxy.xcodeproj/project.pbxproj diff --git a/AltStore.xcodeproj/project.pbxproj b/AltStore.xcodeproj/project.pbxproj index b9c20b30..840e8b12 100644 --- a/AltStore.xcodeproj/project.pbxproj +++ b/AltStore.xcodeproj/project.pbxproj @@ -44,7 +44,6 @@ 0EE7FDC92BE8D07400D1E390 /* NSError+AltStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6C336124197D700034FD24 /* NSError+AltStore.swift */; }; 0EE7FDCB2BE8D12B00D1E390 /* ALTLocalizedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */; }; 0EE7FDCD2BE9124400D1E390 /* ErrorDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0EE7FDCC2BE9124400D1E390 /* ErrorDetailsViewController.swift */; }; - 19104DB52909C06D00C49C7B /* EmotionalDamage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */; }; 19B9B7452845E6DF0076EF69 /* SelectTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */; }; 551A15E55999499418AC1022 /* Pods_AltStoreCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 707E746318F0B6F1A44935D3 /* Pods_AltStoreCore.framework */; }; A800F7042CE28E3800208744 /* View+AltWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = A800F7032CE28E2F00208744 /* View+AltWidget.swift */; }; @@ -53,7 +52,6 @@ A8096D182D30AD4F000C39C6 /* WidgetUpdateIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8096D172D30AD4F000C39C6 /* WidgetUpdateIntent.swift */; }; A8096D1C2D30ADA9000C39C6 /* ActiveAppsTimelineProvider+Simulator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8096D1B2D30ADA9000C39C6 /* ActiveAppsTimelineProvider+Simulator.swift */; }; A809F69E2D04D7AC00F0F0F3 /* libminimuxer_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A809F68E2D04D71200F0F0F3 /* libminimuxer_static.a */; }; - A809F69F2D04D7B300F0F0F3 /* libem_proxy_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A809F6942D04D71200F0F0F3 /* libem_proxy_static.a */; }; A809F6A82D04DA1900F0F0F3 /* minimuxer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A809F6A32D04DA1900F0F0F3 /* minimuxer.swift */; }; A809F6A92D04DA1900F0F0F3 /* SwiftBridgeCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = A809F6A72D04DA1900F0F0F3 /* SwiftBridgeCore.swift */; }; A80D60D32D3DD85100CEF65D /* ReleaseTrack.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80D60D12D3D705F00CEF65D /* ReleaseTrack.swift */; }; @@ -120,7 +118,6 @@ A8E2DB322D684E2A009E5D31 /* UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E2DB2F2D684E2A009E5D31 /* UITestsLaunchTests.swift */; }; A8E2DB342D68507F009E5D31 /* SideStoreTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = A8E2DB332D68507F009E5D31 /* SideStoreTests.xctestplan */; }; A8EA195F2D4982D600DC6322 /* BaseEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8EA195E2D4982D600DC6322 /* BaseEntity.swift */; }; - A8F838922D048E8F00ED425D /* libEmotionalDamage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */; }; A8F838932D048E8F00ED425D /* libminimuxer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 191E5FAB290A5D92001A3B7C /* libminimuxer.a */; }; A8F838942D048ECE00ED425D /* libimobiledevice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BF45872B2298D31600BD7491 /* libimobiledevice.a */; }; A8FD915E2D046F5200322782 /* UserInfoValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8FD915D2D046F5200322782 /* UserInfoValue.swift */; }; @@ -130,7 +127,6 @@ A8FD917C2D0478D200322782 /* VerificationError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5CF56812A0D83F9006D93E2 /* VerificationError.swift */; }; B33FFBAA295F8F78002259E6 /* preboard.c in Sources */ = {isa = PBXBuildFile; fileRef = B33FFBA9295F8F78002259E6 /* preboard.c */; }; B33FFBAC295F8F98002259E6 /* companion_proxy.c in Sources */ = {isa = PBXBuildFile; fileRef = B33FFBAB295F8F98002259E6 /* companion_proxy.c */; }; - B343F86D295F759E002B1159 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B343F86C295F759E002B1159 /* libresolv.tbd */; }; B343F87C295F7C5D002B1159 /* opack.c in Sources */ = {isa = PBXBuildFile; fileRef = B343F872295F7C5C002B1159 /* opack.c */; }; B343F87D295F7C5D002B1159 /* cbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = B343F873295F7C5C002B1159 /* cbuf.c */; }; B343F87E295F7C5D002B1159 /* collection.c in Sources */ = {isa = PBXBuildFile; fileRef = B343F874295F7C5D002B1159 /* collection.c */; }; @@ -451,13 +447,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 19104DB92909C0F200C49C7B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BFD247622284B9A500981D42 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 19104DB12909C06C00C49C7B; - remoteInfo = EmotionalDamage; - }; 191E5FB2290A5D9B001A3B7C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFD247622284B9A500981D42 /* Project object */; @@ -472,20 +461,6 @@ remoteGlobalIDString = CA609C732349C7AAD9FA67C4; remoteInfo = "minimuxer-staticlib"; }; - A809F6932D04D71200F0F0F3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B343F84D295F6323002B1159 /* em_proxy.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = CA60C44C93D7916DE57E6EBD; - remoteInfo = "em_proxy-staticlib"; - }; - A809F6952D04D71200F0F0F3 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B343F84D295F6323002B1159 /* em_proxy.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = CA60058A9FBE4D17AF51A7D5; - remoteInfo = "run-bin"; - }; A809F6A02D04D7CB00F0F0F3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = A8F66C602D04D464009689E6 /* minimuxer.xcodeproj */; @@ -649,8 +624,6 @@ 0EE7FDC22BE8BC4200D1E390 /* ALTWrappedError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ALTWrappedError.h; sourceTree = ""; }; 0EE7FDC32BE8BC7900D1E390 /* ALTLocalizedError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ALTLocalizedError.swift; sourceTree = ""; }; 0EE7FDCC2BE9124400D1E390 /* ErrorDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorDetailsViewController.swift; sourceTree = ""; }; - 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEmotionalDamage.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmotionalDamage.swift; sourceTree = ""; }; 191E5FAB290A5D92001A3B7C /* libminimuxer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libminimuxer.a; sourceTree = BUILT_PRODUCTS_DIR; }; 19B9B7442845E6DF0076EF69 /* SelectTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTeamViewController.swift; sourceTree = ""; }; 32741831F952989EC7E74FFA /* Pods-SideStore.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SideStore.debug.xcconfig"; path = "Target Support Files/Pods-SideStore/Pods-SideStore.debug.xcconfig"; sourceTree = ""; }; @@ -727,14 +700,12 @@ A8E2DB2F2D684E2A009E5D31 /* UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITestsLaunchTests.swift; sourceTree = ""; }; A8E2DB332D68507F009E5D31 /* SideStoreTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SideStoreTests.xctestplan; sourceTree = ""; }; A8EA195E2D4982D600DC6322 /* BaseEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseEntity.swift; sourceTree = ""; }; - A8F66C3C2D04D433009689E6 /* em_proxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = em_proxy.h; sourceTree = ""; }; A8F66C602D04D464009689E6 /* minimuxer.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = minimuxer.xcodeproj; sourceTree = ""; }; A8FD915B2D046EF100322782 /* ProcessError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProcessError.swift; sourceTree = ""; }; A8FD915D2D046F5200322782 /* UserInfoValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInfoValue.swift; sourceTree = ""; }; A8FD917A2D0472DD00322782 /* DeprecatedAPIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeprecatedAPIs.swift; sourceTree = ""; }; B33FFBA9295F8F78002259E6 /* preboard.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = preboard.c; path = src/preboard.c; sourceTree = ""; }; B33FFBAB295F8F98002259E6 /* companion_proxy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = companion_proxy.c; path = src/companion_proxy.c; sourceTree = ""; }; - B343F84D295F6323002B1159 /* em_proxy.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = em_proxy.xcodeproj; path = SideStore/em_proxy.xcodeproj; sourceTree = SOURCE_ROOT; }; B343F86C295F759E002B1159 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/usr/lib/libresolv.tbd; sourceTree = DEVELOPER_DIR; }; B343F872295F7C5C002B1159 /* opack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opack.c; sourceTree = ""; }; B343F873295F7C5C002B1159 /* cbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cbuf.c; sourceTree = ""; }; @@ -1090,15 +1061,6 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 19104DAF2909C06C00C49C7B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A809F69F2D04D7B300F0F0F3 /* libem_proxy_static.a in Frameworks */, - B343F86D295F759E002B1159 /* libresolv.tbd in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 191E5FA8290A5D92001A3B7C /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1167,7 +1129,6 @@ A8B646012D70C23E00125819 /* MarkdownKit in Frameworks */, A805C3CD2D0C316A00E76BDD /* Pods_SideStore.framework in Frameworks */, A8F838942D048ECE00ED425D /* libimobiledevice.a in Frameworks */, - A8F838922D048E8F00ED425D /* libEmotionalDamage.a in Frameworks */, A8F838932D048E8F00ED425D /* libminimuxer.a in Frameworks */, D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */, D533E8BE2727BBF800A9B5DD /* libcurl.a in Frameworks */, @@ -1192,14 +1153,6 @@ path = Errors; sourceTree = ""; }; - 19104DB32909C06D00C49C7B /* EmotionalDamage */ = { - isa = PBXGroup; - children = ( - 19104DB42909C06D00C49C7B /* EmotionalDamage.swift */, - ); - path = EmotionalDamage; - sourceTree = ""; - }; 191E5FF4290B2663001A3B7C /* libimobiledevice-glue */ = { isa = PBXGroup; children = ( @@ -1251,15 +1204,6 @@ name = Products; sourceTree = ""; }; - A809F68F2D04D71200F0F0F3 /* Products */ = { - isa = PBXGroup; - children = ( - A809F6942D04D71200F0F0F3 /* libem_proxy_static.a */, - A809F6962D04D71200F0F0F3 /* run */, - ); - name = Products; - sourceTree = ""; - }; A80D790B2D2F209700A40F40 /* Intents */ = { isa = PBXGroup; children = ( @@ -1508,23 +1452,12 @@ A8E2DB352D6850A9009E5D31 /* Tests */, A8F66C5C2D04D433009689E6 /* minimuxer */, A8F66C602D04D464009689E6 /* minimuxer.xcodeproj */, - A8F66C412D04D433009689E6 /* em_proxy */, - B343F84D295F6323002B1159 /* em_proxy.xcodeproj */, - 19104DB32909C06D00C49C7B /* EmotionalDamage */, B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */, A8C38C1C2D2068D100E83DBD /* Utils */, ); path = SideStore; sourceTree = ""; }; - A8F66C412D04D433009689E6 /* em_proxy */ = { - isa = PBXGroup; - children = ( - A8F66C3C2D04D433009689E6 /* em_proxy.h */, - ); - path = em_proxy; - sourceTree = ""; - }; A8F66C5C2D04D433009689E6 /* minimuxer */ = { isa = PBXGroup; children = ( @@ -2071,7 +2004,6 @@ BF58047B246A28F7008AE704 /* AltBackup.app */, BF66EE7E2501AE50007EE018 /* AltStoreCore.framework */, BF989167250AABF3002ACF50 /* AltWidgetExtension.appex */, - 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */, 191E5FAB290A5D92001A3B7C /* libminimuxer.a */, D586D39828EF58B0000E101F /* AltTests.xctest */, A8E2DB212D684CBD009E5D31 /* UITests.xctest */, @@ -2523,22 +2455,6 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 19104DB12909C06C00C49C7B /* EmotionalDamage */ = { - isa = PBXNativeTarget; - buildConfigurationList = 19104DB62909C06D00C49C7B /* Build configuration list for PBXNativeTarget "EmotionalDamage" */; - buildPhases = ( - 19104DAE2909C06C00C49C7B /* Sources */, - 19104DAF2909C06C00C49C7B /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = EmotionalDamage; - productName = EmotionalDamage; - productReference = 19104DB22909C06C00C49C7B /* libEmotionalDamage.a */; - productType = "com.apple.product-type.library.static"; - }; 191E5FAA290A5D92001A3B7C /* minimuxer */ = { isa = PBXNativeTarget; buildConfigurationList = 191E5FAF290A5D92001A3B7C /* Build configuration list for PBXNativeTarget "minimuxer" */; @@ -2691,7 +2607,6 @@ dependencies = ( A8E00D3E2D0C95B5000DD2C7 /* PBXTargetDependency */, 191E5FB3290A5D9B001A3B7C /* PBXTargetDependency */, - 19104DBA2909C0F200C49C7B /* PBXTargetDependency */, BF66EE842501AE50007EE018 /* PBXTargetDependency */, BF989176250AABF4002ACF50 /* PBXTargetDependency */, ); @@ -2710,9 +2625,6 @@ LastUpgradeCheck = 1020; ORGANIZATIONNAME = SideStore; TargetAttributes = { - 19104DB12909C06C00C49C7B = { - CreatedOnToolsVersion = 14.0; - }; 191E5FAA290A5D92001A3B7C = { CreatedOnToolsVersion = 14.0; }; @@ -2768,10 +2680,6 @@ productRefGroup = BFD2476B2284B9A500981D42 /* Products */; projectDirPath = ""; projectReferences = ( - { - ProductGroup = A809F68F2D04D71200F0F0F3 /* Products */; - ProjectRef = B343F84D295F6323002B1159 /* em_proxy.xcodeproj */; - }, { ProductGroup = A8A543222D04F0C100D72399 /* Products */; ProjectRef = B343F886295F7F9B002B1159 /* libfragmentzip.xcodeproj */; @@ -2788,7 +2696,6 @@ BF58047A246A28F7008AE704 /* AltBackup */, BF66EE7D2501AE50007EE018 /* AltStoreCore */, BF989166250AABF3002ACF50 /* AltWidgetExtension */, - 19104DB12909C06C00C49C7B /* EmotionalDamage */, 191E5FAA290A5D92001A3B7C /* minimuxer */, A8E2DB202D684CBD009E5D31 /* UITests */, A81A8CC42D68BA610086C96F /* DataStructureTests */, @@ -2804,20 +2711,6 @@ remoteRef = A809F68D2D04D71200F0F0F3 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - A809F6942D04D71200F0F0F3 /* libem_proxy_static.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libem_proxy_static.a; - remoteRef = A809F6932D04D71200F0F0F3 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - A809F6962D04D71200F0F0F3 /* run */ = { - isa = PBXReferenceProxy; - fileType = "compiled.mach-o.executable"; - path = run; - remoteRef = A809F6952D04D71200F0F0F3 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; A8A543292D04F0C100D72399 /* libfragmentzip */ = { isa = PBXReferenceProxy; fileType = "compiled.mach-o.executable"; @@ -3019,14 +2912,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 19104DAE2909C06C00C49C7B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 19104DB52909C06D00C49C7B /* EmotionalDamage.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 191E5FA7290A5D92001A3B7C /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3438,11 +3323,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 19104DBA2909C0F200C49C7B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 19104DB12909C06C00C49C7B /* EmotionalDamage */; - targetProxy = 19104DB92909C0F200C49C7B /* PBXContainerItemProxy */; - }; 191E5FB3290A5D9B001A3B7C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 191E5FAA290A5D92001A3B7C /* minimuxer */; @@ -3508,68 +3388,6 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 19104DB72909C06D00C49C7B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_WARN_DUPLICATE_LIBRARIES = YES; - LD_WARN_UNUSED_DYLIBS = YES; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/SideStore/em_proxy", - ); - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - OTHER_LDFLAGS = ( - "-ObjC", - "$(inherited)", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = SideStore/em_proxy/em_proxy.h; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 15.0; - WATCHOS_DEPLOYMENT_TARGET = 7.0; - }; - name = Debug; - }; - 19104DB82909C06D00C49C7B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)"; - IPHONEOS_DEPLOYMENT_TARGET = 15.0; - LD_WARN_DUPLICATE_LIBRARIES = YES; - LD_WARN_UNUSED_DYLIBS = YES; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/SideStore/em_proxy", - ); - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - OTHER_LDFLAGS = ( - "-ObjC", - "$(inherited)", - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = SideStore/em_proxy/em_proxy.h; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 15.0; - WATCHOS_DEPLOYMENT_TARGET = 7.0; - }; - name = Release; - }; 191E5FB0290A5D92001A3B7C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4252,15 +4070,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 19104DB62909C06D00C49C7B /* Build configuration list for PBXNativeTarget "EmotionalDamage" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 19104DB72909C06D00C49C7B /* Debug */, - 19104DB82909C06D00C49C7B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 191E5FAF290A5D92001A3B7C /* Build configuration list for PBXNativeTarget "minimuxer" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/AltStore/AppDelegate.swift b/AltStore/AppDelegate.swift index 107569e3..792f04f9 100644 --- a/AltStore/AppDelegate.swift +++ b/AltStore/AppDelegate.swift @@ -14,7 +14,6 @@ import Intents import AltStoreCore import AltSign import Roxas -import EmotionalDamage import Nuke @@ -139,7 +138,6 @@ final class AppDelegate: UIResponder, UIApplicationDelegate { func applicationWillEnterForeground(_ application: UIApplication) { AppManager.shared.update() - start_em_proxy(bind_addr: Consts.Proxy.serverURL) PatreonAPI.shared.refreshPatreonAccount() } diff --git a/AltStore/LaunchViewController.swift b/AltStore/LaunchViewController.swift index a953ddc3..f4221f5c 100644 --- a/AltStore/LaunchViewController.swift +++ b/AltStore/LaunchViewController.swift @@ -8,7 +8,6 @@ import UIKit import Roxas -import EmotionalDamage import minimuxer import WidgetKit @@ -88,7 +87,6 @@ final class LaunchViewController: RSTLaunchViewController, UIDocumentPickerDeleg #if !targetEnvironment(simulator) - start_em_proxy(bind_addr: Consts.Proxy.serverURL) guard let pf = fetchPairingFile() else { displayError("Device pairing file not found.") diff --git a/AltStore/Operations/BackgroundRefreshAppsOperation.swift b/AltStore/Operations/BackgroundRefreshAppsOperation.swift index 0d6cbde1..de21751b 100644 --- a/AltStore/Operations/BackgroundRefreshAppsOperation.swift +++ b/AltStore/Operations/BackgroundRefreshAppsOperation.swift @@ -10,7 +10,6 @@ import UIKit import CoreData import AltStoreCore -import EmotionalDamage import minimuxer typealias RefreshError = RefreshErrorCode.Error @@ -99,7 +98,6 @@ final class BackgroundRefreshAppsOperation: ResultOperation<[String: Result(mutating: host.utf8String) - let _ = start_emotional_damage(host_pointer) -} - -public func stop_em_proxy() { - stop_emotional_damage() -} diff --git a/SideStore/em_proxy.xcodeproj/project.pbxproj b/SideStore/em_proxy.xcodeproj/project.pbxproj deleted file mode 100644 index 2f4ab9d7..00000000 --- a/SideStore/em_proxy.xcodeproj/project.pbxproj +++ /dev/null @@ -1,343 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 53; - objects = { - -/* Begin PBXBuildFile section */ - 9987603429A4555300818586 /* em_proxy.h in Sources */ = {isa = PBXBuildFile; fileRef = 9999259129A45319005CF020 /* em_proxy.h */; }; -/* End PBXBuildFile section */ - -/* Begin PBXBuildRule section */ - CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - filePatterns = "*/em_proxy.h"; - fileType = pattern.proxy; - inputFiles = ( - ); - isEditable = 0; - name = "Cargo project build"; - outputFiles = ( - "$(OBJECT_FILE_DIR)/$(CARGO_XCODE_TARGET_ARCH)-$(EXECUTABLE_NAME)", - ); - script = "# generated with cargo-xcode 1.5.0\n# modified to use prebuilt binaries\n\nset -eu;\n\nBUILT_SRC=\"./em_proxy/$LIB_FILE_NAME.a\"\necho Generating Static lib: $BUILT_SRC\nln -f -- \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\" || cp \"$BUILT_SRC\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\necho \"$BUILT_SRC -> $TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n\n# xcode generates dep file, but for its own path, so append our rename to it\n#DEP_FILE_SRC=\"minimuxer/target/${CARGO_XCODE_TARGET_TRIPLE}/release/${CARGO_XCODE_CARGO_DEP_FILE_NAME}\"\n#if [ -f \"$DEP_FILE_SRC\" ]; then\n# DEP_FILE_DST=\"${DERIVED_FILE_DIR}/${CARGO_XCODE_TARGET_ARCH}-${EXECUTABLE_NAME}.d\"\n# cp -f \"$DEP_FILE_SRC\" \"$DEP_FILE_DST\"\n# echo >> \"$DEP_FILE_DST\" \"$SCRIPT_OUTPUT_FILE_0: $BUILT_SRC\"\n#fi\n\n# lipo script needs to know all the platform-specific files that have been built\n# archs is in the file name, so that paths don't stay around after archs change\n# must match input for LipoScript\n#FILE_LIST=\"${DERIVED_FILE_DIR}/${ARCHS}-${EXECUTABLE_NAME}.xcfilelist\"\n#touch \"$FILE_LIST\"\n#if ! egrep -q \"$SCRIPT_OUTPUT_FILE_0\" \"$FILE_LIST\" ; then\n# echo >> \"$FILE_LIST\" \"$SCRIPT_OUTPUT_FILE_0\"\n#fi\n"; - }; -/* End PBXBuildRule section */ - -/* Begin PBXFileReference section */ - 9999259129A45319005CF020 /* em_proxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = em_proxy.h; path = em_proxy/em_proxy.h; sourceTree = ""; }; - ADDEDBA66A6E1 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; - CA60058A9FBE4D17AF51A7D5 /* run */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = run; sourceTree = BUILT_PRODUCTS_DIR; }; - CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libem_proxy_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXGroup section */ - ADDEDBA66A6E2 /* Required for static linking */ = { - isa = PBXGroup; - children = ( - ADDEDBA66A6E1 /* libresolv.tbd */, - ); - name = "Required for static linking"; - sourceTree = ""; - }; - CA6094FFF69222869D176AE5 /* Products */ = { - isa = PBXGroup; - children = ( - CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */, - CA60058A9FBE4D17AF51A7D5 /* run */, - ); - name = Products; - sourceTree = ""; - }; - CA6094FFF69298AF0B5890DB /* Frameworks */ = { - isa = PBXGroup; - children = ( - ADDEDBA66A6E2 /* Required for static linking */, - ); - name = Frameworks; - sourceTree = ""; - }; - CA6094FFF692D65BC3C892A8 = { - isa = PBXGroup; - children = ( - 9999259129A45319005CF020 /* em_proxy.h */, - CA6094FFF69222869D176AE5 /* Products */, - CA6094FFF69298AF0B5890DB /* Frameworks */, - ); - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - CA60058A9FBE37FC563E4BCC /* run-bin */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA603DD75FB437FC563E4BCC /* Build configuration list for PBXNativeTarget "run-bin" */; - buildPhases = ( - CA60445C303637FC563E4BCC /* Sources */, - CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */, - ); - buildRules = ( - CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "run-bin"; - productName = run; - productReference = CA60058A9FBE4D17AF51A7D5 /* run */; - productType = "com.apple.product-type.tool"; - }; - CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */ = { - isa = PBXNativeTarget; - buildConfigurationList = CA603DD75FB4A30E3695DD59 /* Build configuration list for PBXNativeTarget "em_proxy-staticlib" */; - buildPhases = ( - 9987603529A4610700818586 /* ShellScript */, - CA60445C3036A30E3695DD59 /* Sources */, - CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */, - ); - buildRules = ( - CA6094FFF692AC6C1400ACA8 /* PBXBuildRule */, - ); - dependencies = ( - ); - name = "em_proxy-staticlib"; - productName = libem_proxy_static.a; - productReference = CA60C44C93D7916DE57E6EBD /* libem_proxy_static.a */; - productType = "com.apple.product-type.library.static"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - CA6094FFF692E04653AD465F /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1300; - TargetAttributes = { - CA60058A9FBE37FC563E4BCC = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - CA60C44C93D7A30E3695DD59 = { - CreatedOnToolsVersion = 9.2; - ProvisioningStyle = Automatic; - }; - }; - }; - buildConfigurationList = CA6094FFF69280E02D6C7F57 /* Build configuration list for PBXProject "em_proxy" */; - compatibilityVersion = "Xcode 11.4"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = CA6094FFF692D65BC3C892A8; - productRefGroup = CA6094FFF69222869D176AE5 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - CA60C44C93D7A30E3695DD59 /* em_proxy-staticlib */, - CA60058A9FBE37FC563E4BCC /* run-bin */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXShellScriptBuildPhase section */ - 9987603529A4610700818586 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ./em_proxy/em_proxy.h, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "bash ./fetch-prebuilt.sh em_proxy\n"; - }; - CA6094FFF692AF6EBB7F357C /* Universal Binary lipo */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "$(DERIVED_FILE_DIR)/$(ARCHS)-$(EXECUTABLE_NAME).xcfilelist", - ); - name = "Universal Binary lipo"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# generated with cargo-xcode 1.5.0\n\n#set -eux; cat \"$DERIVED_FILE_DIR/$ARCHS-$EXECUTABLE_NAME.xcfilelist\" | tr '\\n' '\\0' | xargs -0 lipo -create -output \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#if [ ${LD_DYLIB_INSTALL_NAME:+1} ]; then\n# install_name_tool -id \"$LD_DYLIB_INSTALL_NAME\" \"$TARGET_BUILD_DIR/$EXECUTABLE_PATH\"\n#fi\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - CA60445C303637FC563E4BCC /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - CA60445C3036A30E3695DD59 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 9987603429A4555300818586 /* em_proxy.h in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - CA604DFE779B37FC563E4BCC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CARGO_XCODE_CARGO_DEP_FILE_NAME = run.d; - CARGO_XCODE_CARGO_FILE_NAME = run; - PRODUCT_NAME = run; - SUPPORTED_PLATFORMS = macosx; - }; - name = Release; - }; - CA604DFE779BA30E3695DD59 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CARGO_XCODE_CARGO_DEP_FILE_NAME = libem_proxy.d; - CARGO_XCODE_CARGO_FILE_NAME = libem_proxy.a; - INSTALL_GROUP = ""; - INSTALL_MODE_FLAG = ""; - INSTALL_OWNER = ""; - LIB_FILE_NAME = ""; - "LIB_FILE_NAME[sdk=iphoneos*]" = "libem_proxy-ios"; - "LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim"; - PRODUCT_NAME = em_proxy_static; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; - }; - name = Release; - }; - CA609A517351228BE02872F8 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; - CARGO_XCODE_BUILD_MODE = debug; - CARGO_XCODE_FEATURES = ""; - "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64; - "CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686; - "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64; - "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos; - "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos; - "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios; - "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin; - CURRENT_PROJECT_VERSION = 0.1; - MARKETING_VERSION = 0.1.0; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_NAME = em_proxy; - SDKROOT = macosx; - SUPPORTS_MACCATALYST = YES; - }; - name = Debug; - }; - CA609A5173513CC16B37690B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CARGO_TARGET_DIR = "$(PROJECT_TEMP_DIR)/cargo_target"; - CARGO_XCODE_BUILD_MODE = release; - CARGO_XCODE_FEATURES = ""; - "CARGO_XCODE_TARGET_ARCH[arch=arm64*]" = aarch64; - "CARGO_XCODE_TARGET_ARCH[arch=i386]" = i686; - "CARGO_XCODE_TARGET_ARCH[arch=x86_64*]" = x86_64; - "CARGO_XCODE_TARGET_OS[sdk=appletvos*]" = tvos; - "CARGO_XCODE_TARGET_OS[sdk=appletvsimulator*]" = tvos; - "CARGO_XCODE_TARGET_OS[sdk=iphoneos*]" = ios; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*]" = "ios-sim"; - "CARGO_XCODE_TARGET_OS[sdk=iphonesimulator*][arch=x86_64*]" = ios; - "CARGO_XCODE_TARGET_OS[sdk=macosx*]" = darwin; - CURRENT_PROJECT_VERSION = 0.1; - MARKETING_VERSION = 0.1.0; - PRODUCT_NAME = em_proxy; - SDKROOT = macosx; - SUPPORTS_MACCATALYST = YES; - }; - name = Release; - }; - CA60DE07A83F37FC563E4BCC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CARGO_XCODE_CARGO_DEP_FILE_NAME = run.d; - CARGO_XCODE_CARGO_FILE_NAME = run; - PRODUCT_NAME = run; - SUPPORTED_PLATFORMS = macosx; - }; - name = Debug; - }; - CA60DE07A83FA30E3695DD59 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CARGO_XCODE_CARGO_DEP_FILE_NAME = libem_proxy.d; - CARGO_XCODE_CARGO_FILE_NAME = libem_proxy.a; - INSTALL_GROUP = ""; - INSTALL_MODE_FLAG = ""; - INSTALL_OWNER = ""; - LIB_FILE_NAME = ""; - "LIB_FILE_NAME[sdk=iphoneos*]" = "libem_proxy-ios"; - "LIB_FILE_NAME[sdk=iphonesimulator*]" = "libem_proxy-sim"; - PRODUCT_NAME = em_proxy_static; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos"; - }; - name = Debug; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - CA603DD75FB437FC563E4BCC /* Build configuration list for PBXNativeTarget "run-bin" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA604DFE779B37FC563E4BCC /* Release */, - CA60DE07A83F37FC563E4BCC /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CA603DD75FB4A30E3695DD59 /* Build configuration list for PBXNativeTarget "em_proxy-staticlib" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA604DFE779BA30E3695DD59 /* Release */, - CA60DE07A83FA30E3695DD59 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - CA6094FFF69280E02D6C7F57 /* Build configuration list for PBXProject "em_proxy" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - CA609A5173513CC16B37690B /* Release */, - CA609A517351228BE02872F8 /* Debug */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = CA6094FFF692E04653AD465F /* Project object */; -}