spm: wdiget almost builds again

SideStore.xcodeproj/project.pbxproj

@@ -21,8 +21,9 @@
 		B34AFC0629B0328D000F318E /* apps-alpha.json in Resources */ = {isa = PBXBuildFile; fileRef = B34AFBEE29B0324C000F318E /* apps-alpha.json */; };
 		B34AFC0729B03291000F318E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B34AFBF229B0324C000F318E /* Assets.xcassets */; };
 		B34AFC1429B032DF000F318E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B34AFC0D29B032DF000F318E /* Assets.xcassets */; };
-		B34BA8EE29B3432C0055A710 /* SideStore in Frameworks */ = {isa = PBXBuildFile; productRef = B34BA8ED29B3432C0055A710 /* SideStore */; };
 		B34BA92829B5ED510055A710 /* SideWidgetExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = BF989167250AABF3002ACF50 /* SideWidgetExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		B371D45129BC0BF900E157A6 /* SideStoreAppKit in Frameworks */ = {isa = PBXBuildFile; productRef = B371D45029BC0BF900E157A6 /* SideStoreAppKit */; };
+		B371D45329BC0C0B00E157A6 /* SideWidgetKit in Frameworks */ = {isa = PBXBuildFile; productRef = B371D45229BC0C0B00E157A6 /* SideWidgetKit */; };
 		B3C40F5329B06A0000C93D50 /* PatchApp.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B34AFBD929B0324C000F318E /* PatchApp.storyboard */; };
 		B3C40F5429B06A2B00C93D50 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B34AFBE629B0324C000F318E /* LaunchScreen.storyboard */; };
 		B3C40F5529B06A3200C93D50 /* Authentication.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B34AFBDA29B0324C000F318E /* Authentication.storyboard */; };
@@ -124,6 +125,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B371D45329BC0C0B00E157A6 /* SideWidgetKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -131,8 +133,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B371D45129BC0BF900E157A6 /* SideStoreAppKit in Frameworks */,
 				D533E8B72727841800A9B5DD /* libAppleArchive.tbd in Frameworks */,
-				B34BA8EE29B3432C0055A710 /* SideStore in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -321,6 +323,7 @@
 			);
 			name = SideWidgetExtension;
 			packageProductDependencies = (
+				B371D45229BC0C0B00E157A6 /* SideWidgetKit */,
 			);
 			productName = AltWidgetExtension;
 			productReference = BF989167250AABF3002ACF50 /* SideWidgetExtension.appex */;
@@ -343,7 +346,7 @@
 			);
 			name = SideStore;
 			packageProductDependencies = (
-				B34BA8ED29B3432C0055A710 /* SideStore */,
+				B371D45029BC0BF900E157A6 /* SideStoreAppKit */,
 			);
 			productName = AltStore;
 			productReference = BFD2476A2284B9A500981D42 /* SideStore.app */;
@@ -762,9 +765,13 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		B34BA8ED29B3432C0055A710 /* SideStore */ = {
+		B371D45029BC0BF900E157A6 /* SideStoreAppKit */ = {
 			isa = XCSwiftPackageProductDependency;
-			productName = SideStore;
+			productName = SideStoreAppKit;
+		};
+		B371D45229BC0C0B00E157A6 /* SideWidgetKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = SideWidgetKit;
 		};
 /* End XCSwiftPackageProductDependency section */
 	};

SideStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -54,15 +54,6 @@
         "version" : "5.0.0"
       }
     },
-    {
-      "identity" : "matchable",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/elegantchaos/Matchable.git",
-      "state" : {
-        "revision" : "d53e807009960aafbd54f6229c2542f906628b38",
-        "version" : "1.0.7"
-      }
-    },
     {
       "identity" : "nuke",
       "kind" : "remoteSourceControl",
@@ -99,15 +90,6 @@
         "version" : "1.2.2"
       }
     },
-    {
-      "identity" : "runner",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/elegantchaos/Runner.git",
-      "state" : {
-        "revision" : "65420eb4e534a58c8fb1bf18e344bc86edb42c65",
-        "version" : "1.3.2"
-      }
-    },
     {
       "identity" : "semanticversion",
       "kind" : "remoteSourceControl",
@@ -134,24 +116,6 @@
         "revision" : "2e4833a3ca65d0aaa986138b8ef350b7f549ba28",
         "version" : "1.0.0"
       }
-    },
-    {
-      "identity" : "versionator",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/elegantchaos/Versionator.git",
-      "state" : {
-        "revision" : "d7bf7747ae277f6a5cd3193806262160d579f0cc",
-        "version" : "1.0.3"
-      }
-    },
-    {
-      "identity" : "xctestextensions",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/elegantchaos/XCTestExtensions.git",
-      "state" : {
-        "revision" : "39694671be8bea1ab0bbd87114705b2a92567a8e",
-        "version" : "1.5.0"
-      }
     }
   ],
   "version" : 2

SideStoreApp/Configurations/SideBackup.xcconfig

@@ -1,3 +1,3 @@
-#include "../../Build.xcconfig"
+#include "Shared.xcconfig"
 
-PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).SideBackup
+PRODUCT_BUNDLE_IDENTIFIER =  $(ORG_PREFIX).$(PRODUCT_NAME)

SideStoreApp/Configurations/SideStore.xcconfig

@@ -1,3 +1 @@
-#include "../../Build.xcconfig"
-
-PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PRODUCT_NAME)
+#include "Shared.xcconfig"

SideStoreApp/Configurations/SideWidgetExtension.xcconfig

@@ -1,3 +1,3 @@
-#include "../../Build.xcconfig"
+#include "Shared.xcconfig"
 
 PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).SideWidget

SideStoreApp/Package.swift

@@ -15,13 +15,9 @@ let USE_CXX_MODULES           = envBool(("USE_CXX_MODULES", false))
 let INHIBIT_UPSTREAM_WARNINGS = envBool(("INHIBIT_UPSTREAM_WARNINGS", true))
 let STATIC_LIBRARY            = envBool(("STATIC_LIBRARY", false))
 
-let unsafe_flags : [String]   = INHIBIT_UPSTREAM_WARNINGS ?
-["-w"] :
-[String]()
+let unsafe_flags: [String]    = INHIBIT_UPSTREAM_WARNINGS ? ["-w"] : [String]()
 
-let unsafe_flags_cxx: [String] = INHIBIT_UPSTREAM_WARNINGS ?
-["-w", "-Wno-module-import-in-extern-c"] :
-["-Wno-module-import-in-extern-c"]
+let unsafe_flags_cxx: [String] = INHIBIT_UPSTREAM_WARNINGS ? ["-w", "-Wno-module-import-in-extern-c"] : ["-Wno-module-import-in-extern-c"]
 
 extension Package.Dependency {
 	/// The combination of all the dependencies for the Package.
@@ -58,7 +54,7 @@ extension Package.Dependency {
 		.github("JoeMatt/SwiftPMPlugins", from: "1.0.0"),
 
 		 /// Generate swift files with git head info
-		 .github("elegantchaos/Versionator", from: "1.0.3"),
+		.github("elegantchaos/Versionator", from: "1.0.3").disable,
 
 		 /// plists from .json, including Info.plist
 		.github("elegantchaos/InfomaticPlugin", branch: "main").disable
@@ -76,7 +72,7 @@ extension Package.Dependency {
 		/// ```sh
 		/// mint run secret-keys generate
 		/// ```
-			.github("simorgh3196/swift-secret-keys", from: "0.0.1").disable,
+		.github("simorgh3196/swift-secret-keys", from: "0.0.1").disable,
 
 		/// #__ Swift docc generator __
 		/// `swift package generate-documentation`
@@ -91,7 +87,7 @@ extension Package.Dependency {
 		/// ## Preview:
 		/// `swift package --disable-sandbox preview-documentation --target MyFramework`
 		/// [Hosting](https://apple.github.io/swift-docc-plugin/documentation/swiftdoccplugin/)
-			.github("apple/swift-docc-plugin", from: "1.1.0").disable,
+		.github("apple/swift-docc-plugin", from: "1.1.0").disable,
 	]-?
 
 	#if USE_RESULT_BUILDER
@@ -288,11 +284,7 @@ extension Target.SideStore {
 
 	/// __PluginTargets__
 	static let pluginTargets: [Target] = {
-		#if USE_CARGO_BUILD_PLUGIN
 		Cargo.Plugins
-		#else
-		[]
-		#endif
 	}()
 
 	// MARK: - SideStoreAppKit
@@ -300,6 +292,8 @@ extension Target.SideStore {
 		.target(
 			name: "SideStoreAppKit",
 			dependencies: [
+				AppCenterAnalytics,
+				AppCenterCrashes,
 				"AltSign",
 				"Down",
 				"EmotionalDamage",
@@ -345,6 +339,8 @@ extension Target.SideStore {
 			dependencies: ["SideStoreCore", "KeychainAccess", "AltSign", "SemanticVersion", "SideKit"]))
 
 	// MARK: - SideDaemon
+	/// This is mostly leftover from `AltDaemon`
+	/// We don't need or use it, but it felt bad to just delete it at the moment.
 	static let SideDaemon: TargetPair = (
 	        .executableTarget(
 	            name: "SideDaemon",
@@ -360,12 +356,21 @@ extension Target.SideStore {
 	        .testTarget(name: "SideDaemonTests", dependencies: ["SideDaemon"]))
 
 	// MARK: - SideBackup
-	static let SideBackup: Target =
-		.executableTarget(name: "SideBackup", plugins: commonPlugins)
+	static let SideBackup: Target = .executableTarget(
+		name: "SideBackup",
+		exclude: [
+			"Info.plist",
+			"AltBackup.entitlements"]
+			.map{ "Resources/\($0)" },
+		resources: [
+			.process("Resources/")
+		],
+		plugins: commonPlugins)
 
 	// MARK: - SidePatcher
+	/// Note: This is Objective-C so Swift generator's will fail if you try to apply them here - @JoeMatt
 	static let SidePatcher: TargetPair = (
-		.target(name: "SidePatcher", dependencies: [ RoxasUI ], plugins: commonPlugins),
+		.target(name: "SidePatcher", dependencies: [ RoxasUI ], plugins: []),
 		.testTarget(name: "SidePatcherTests", dependencies: ["SidePatcher"]))
 }
 
@@ -571,6 +576,10 @@ enum Cargo: Encodable {
 				dependencies: ["Cargo"]
 			)].map{._plugin($0)}
 }
+#else
+enum Cargo {
+	static let Plugins: [Target] = []
+}
 #endif
 
 
@@ -594,6 +603,14 @@ extension PackageDescription.Package.Dependency {
 		.package(url: "https://github.com/\(repo).git", revision: revision)}
 }
 
+/// `-?` Operator added as a quick way to `.compactMap{$0}` an
+/// array that has optionals. In combination with adding `.disable` which returns `Self?`
+/// as an easy way to disable packages from `Package.swift` since there are some limitions
+/// 1. #if's can't be used in static array initiliziers, unless using ugly inline functions, and that kills
+/// the Swift processor a lot.
+/// The other option was to use a `@resultBuilder`, which I started below, to add some
+/// synataic suger but probablly overkill honeslty.
+/// - Author: @JoeMatt
 postfix operator -?
 extension Array where Element == Package.Dependency? {
 	func removeNils() -> [Package.Dependency] { self.compactMap{$0} }
@@ -603,10 +620,10 @@ extension Array where Element == Package.Dependency? {
 
 extension Array where Element == Target? {
 	func removeNils() -> [Target] { self.compactMap{$0} }
-
 	static postfix func -? (array: Self) -> [Target] { array.removeNils() }
 }
 
+/// I'm a WIP as a less verbose way of merging array's of various`Target`s and `Dependency` lists
 @resultBuilder
 struct DependencyBuilder {
 	typealias Component = [Package.Dependency]

SideStoreApp/Sources/SideBackup/Resources/Info.plist

@@ -35,6 +35,16 @@
 				<string>altbackup</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>SideBackup General</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>sidebackup</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>

SideStoreApp/Sources/SideDaemon/DaemonRequestHandler.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Shared
+
 import SideKit
 import os.log
 

SideStoreApp/Sources/SideDaemon/XPCConnectionHandler.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import Security
+import SideStoreCore
 
 class XPCConnectionHandler: NSObject, ConnectionHandler {
     var connectionHandler: ((Connection) -> Void)?

SideStoreApp/Sources/SideStore/Resources/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ALTAnisetteURL</key>
+	<string>https://ani.sidestore.io</string>
 	<key>ALTAppGroups</key>
 	<array>
 		<string>group.$(APP_GROUP_IDENTIFIER)</string>
@@ -9,12 +11,10 @@
 	</array>
 	<key>ALTDeviceID</key>
 	<string>00008101-000129D63698001E</string>
-	<key>ALTServerID</key>
-	<string>1F7D5B55-79CE-4546-A029-D4DDC4AF3B6D</string>
 	<key>ALTPairingFile</key>
 	<string>&lt;insert pairing file here&gt;</string>
-	<key>ALTAnisetteURL</key>
-	<string>https://ani.sidestore.io</string>
+	<key>ALTServerID</key>
+	<string>1F7D5B55-79CE-4546-A029-D4DDC4AF3B6D</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDocumentTypes</key>
@@ -44,8 +44,6 @@
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<true/>
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
@@ -93,6 +91,13 @@
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>NSBonjourServices</key>
 	<array>
 		<string>_altserver._tcp</string>
@@ -131,13 +136,10 @@
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
+	<key>UIFileSharingEnabled</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<true/>
-	</dict>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -204,7 +206,5 @@
 			</dict>
 		</dict>
 	</array>
-	<key>UIFileSharingEnabled</key>
-	<true/>
 </dict>
 </plist>

SideStoreApp/Sources/SideStoreAppKit/ALTApplication+AltStoreApp.swift

@@ -7,6 +7,7 @@
 //
 
 import AltSign
+import SideStoreCore
 
 extension ALTApplication {
     static let altstoreBundleID = Bundle.Info.appbundleIdentifier

SideStoreApp/Sources/SideStoreAppKit/Authentication/Intents/ViewAppIntentHandler.swift

@@ -7,7 +7,6 @@
 //
 
 import Intents
-import Shared
 import SideStoreCore
 import os.log
 

SideStoreApp/Sources/SideStoreAppKit/Components/ToastView.swift

@@ -7,7 +7,7 @@
 //
 
 import RoxasUIKit
-import Shared
+
 import SideStoreCore
 import SideKit
 import AltSign

SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift

@@ -13,7 +13,7 @@ import MobileCoreServices
 import UIKit
 import UserNotifications
 import WidgetKit
-import Shared
+
 
 import AltSign
 import SideKit

SideStoreApp/Sources/SideStoreAppKit/Operations/DownloadAppOperation.swift

@@ -12,7 +12,7 @@ import RoxasUIKit
 import AltSign
 import SideKit
 import SideStoreCore
-import Shared
+
 import os.log
 
 private extension DownloadAppOperation {

SideStoreApp/Sources/SideStoreAppKit/Operations/RemoveAppOperation.swift

@@ -11,7 +11,7 @@ import Foundation
 import SideStoreCore
 import minimuxer
 import MiniMuxerSwift
-import Shared
+
 import SideKit
 
 @objc(RemoveAppOperation)

SideStoreApp/Sources/SideStoreAppKit/Operations/SendAppOperation.swift

@@ -9,7 +9,7 @@ import Foundation
 import Network
 
 import SideStoreCore
-import Shared
+
 import SideKit
 import MiniMuxerSwift
 

SideStoreApp/Sources/SideStoreAppKit/Operations/VerifyAppOperation.swift

@@ -11,7 +11,7 @@ import Foundation
 import AltSign
 import RoxasUIKit
 import SideKit
-import Shared
+
 
 enum VerificationError: LocalizedError {
     case privateEntitlements(ALTApplication, entitlements: [String: Any])

SideStoreApp/Sources/SideStoreCore/Components/Keychain.swift

@@ -9,7 +9,7 @@
 import Foundation
 import KeychainAccess
 
-import AltSign
+//import AltSign
 
 @propertyWrapper
 public struct KeychainItem<Value> {

SideStoreApp/Sources/SideStoreCore/Extensions/FileManager+SharedDirectories.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import Shared
+
 
 public extension FileManager {
     var altstoreSharedDirectory: URL? {

SideStoreApp/Sources/SideStoreCore/Model/StoreApp.swift

@@ -8,8 +8,6 @@
 
 import CoreData
 import Foundation
-
-import AltSign
 import Roxas
 
 public extension StoreApp {

SideStoreApp/Sources/SideWidget/Resources/Info.plist

@@ -23,13 +23,13 @@
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
 	<key>INIntentsSupported</key>
 	<array>
 		<string>RefreshAllIntent</string>
 		<string>ViewAppIntent</string>
 	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>