diff --git a/SideStore.xcodeproj/project.pbxproj b/SideStore.xcodeproj/project.pbxproj
index 43d12e7d..4229fab8 100644
--- a/SideStore.xcodeproj/project.pbxproj
+++ b/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 */
};
diff --git a/SideStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SideStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c20ecf4c..f3ae004e 100644
--- a/SideStore.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/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
diff --git a/SideStoreApp/Configurations/SideBackup.xcconfig b/SideStoreApp/Configurations/SideBackup.xcconfig
index 4679ea09..0553c84d 100644
--- a/SideStoreApp/Configurations/SideBackup.xcconfig
+++ b/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)
diff --git a/SideStoreApp/Configurations/SideStore.xcconfig b/SideStoreApp/Configurations/SideStore.xcconfig
index 96b006aa..ce559eb9 100644
--- a/SideStoreApp/Configurations/SideStore.xcconfig
+++ b/SideStoreApp/Configurations/SideStore.xcconfig
@@ -1,3 +1 @@
-#include "../../Build.xcconfig"
-
-PRODUCT_BUNDLE_IDENTIFIER = $(ORG_PREFIX).$(PRODUCT_NAME)
+#include "Shared.xcconfig"
diff --git a/SideStoreApp/Configurations/SideWidgetExtension.xcconfig b/SideStoreApp/Configurations/SideWidgetExtension.xcconfig
index b85fc1bd..bf40b5e0 100644
--- a/SideStoreApp/Configurations/SideWidgetExtension.xcconfig
+++ b/SideStoreApp/Configurations/SideWidgetExtension.xcconfig
@@ -1,3 +1,3 @@
-#include "../../Build.xcconfig"
+#include "Shared.xcconfig"
PRODUCT_BUNDLE_IDENTIFIER = $(PRODUCT_BUNDLE_IDENTIFIER).SideWidget
diff --git a/SideStoreApp/Package.swift b/SideStoreApp/Package.swift
index 8aa8f04b..22b00449 100644
--- a/SideStoreApp/Package.swift
+++ b/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]
diff --git a/SideStoreApp/Sources/SideBackup/AltBackup.entitlements b/SideStoreApp/Sources/SideBackup/Resources/AltBackup.entitlements
similarity index 100%
rename from SideStoreApp/Sources/SideBackup/AltBackup.entitlements
rename to SideStoreApp/Sources/SideBackup/Resources/AltBackup.entitlements
diff --git a/SideStoreApp/Sources/SideBackup/Assets.xcassets/AppIcon.appiconset/Contents.json b/SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from SideStoreApp/Sources/SideBackup/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/SideStoreApp/Sources/SideBackup/Assets.xcassets/Background.colorset/Contents.json b/SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/Background.colorset/Contents.json
similarity index 100%
rename from SideStoreApp/Sources/SideBackup/Assets.xcassets/Background.colorset/Contents.json
rename to SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/Background.colorset/Contents.json
diff --git a/SideStoreApp/Sources/SideBackup/Assets.xcassets/Contents.json b/SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/Contents.json
similarity index 100%
rename from SideStoreApp/Sources/SideBackup/Assets.xcassets/Contents.json
rename to SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/Contents.json
diff --git a/SideStoreApp/Sources/SideBackup/Assets.xcassets/Text.colorset/Contents.json b/SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/Text.colorset/Contents.json
similarity index 100%
rename from SideStoreApp/Sources/SideBackup/Assets.xcassets/Text.colorset/Contents.json
rename to SideStoreApp/Sources/SideBackup/Resources/Assets.xcassets/Text.colorset/Contents.json
diff --git a/SideStoreApp/Sources/SideBackup/Base.lproj/LaunchScreen.storyboard b/SideStoreApp/Sources/SideBackup/Resources/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from SideStoreApp/Sources/SideBackup/Base.lproj/LaunchScreen.storyboard
rename to SideStoreApp/Sources/SideBackup/Resources/Base.lproj/LaunchScreen.storyboard
diff --git a/SideStoreApp/Sources/SideBackup/Info.plist b/SideStoreApp/Sources/SideBackup/Resources/Info.plist
similarity index 89%
rename from SideStoreApp/Sources/SideBackup/Info.plist
rename to SideStoreApp/Sources/SideBackup/Resources/Info.plist
index c40c1c3c..cc80fad3 100644
--- a/SideStoreApp/Sources/SideBackup/Info.plist
+++ b/SideStoreApp/Sources/SideBackup/Resources/Info.plist
@@ -35,6 +35,16 @@
altbackup
+
+ CFBundleTypeRole
+ Editor
+ CFBundleURLName
+ SideBackup General
+ CFBundleURLSchemes
+
+ sidebackup
+
+
CFBundleVersion
1
diff --git a/SideStoreApp/Sources/SideDaemon/DaemonRequestHandler.swift b/SideStoreApp/Sources/SideDaemon/DaemonRequestHandler.swift
index b3f53e2c..8c88fb32 100644
--- a/SideStoreApp/Sources/SideDaemon/DaemonRequestHandler.swift
+++ b/SideStoreApp/Sources/SideDaemon/DaemonRequestHandler.swift
@@ -7,7 +7,7 @@
//
import Foundation
-import Shared
+
import SideKit
import os.log
diff --git a/SideStoreApp/Sources/SideDaemon/XPCConnectionHandler.swift b/SideStoreApp/Sources/SideDaemon/XPCConnectionHandler.swift
index 9627fef0..b4c019fd 100644
--- a/SideStoreApp/Sources/SideDaemon/XPCConnectionHandler.swift
+++ b/SideStoreApp/Sources/SideDaemon/XPCConnectionHandler.swift
@@ -8,6 +8,7 @@
import Foundation
import Security
+import SideStoreCore
class XPCConnectionHandler: NSObject, ConnectionHandler {
var connectionHandler: ((Connection) -> Void)?
diff --git a/SideStoreApp/Sources/SideStore/Resources/Info.plist b/SideStoreApp/Sources/SideStore/Resources/Info.plist
index a54f4f93..b645158b 100644
--- a/SideStoreApp/Sources/SideStore/Resources/Info.plist
+++ b/SideStoreApp/Sources/SideStore/Resources/Info.plist
@@ -2,6 +2,8 @@
+ ALTAnisetteURL
+ https://ani.sidestore.io
ALTAppGroups
group.$(APP_GROUP_IDENTIFIER)
@@ -9,12 +11,10 @@
ALTDeviceID
00008101-000129D63698001E
- ALTServerID
- 1F7D5B55-79CE-4546-A029-D4DDC4AF3B6D
ALTPairingFile
<insert pairing file here>
- ALTAnisetteURL
- https://ani.sidestore.io
+ ALTServerID
+ 1F7D5B55-79CE-4546-A029-D4DDC4AF3B6D
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDocumentTypes
@@ -44,8 +44,6 @@
$(PRODUCT_NAME)
CFBundlePackageType
APPL
- LSSupportsOpeningDocumentsInPlace
-
CFBundleShortVersionString
$(MARKETING_VERSION)
CFBundleURLTypes
@@ -93,6 +91,13 @@
LSRequiresIPhoneOS
+ LSSupportsOpeningDocumentsInPlace
+
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+
+
NSBonjourServices
_altserver._tcp
@@ -131,13 +136,10 @@
fetch
remote-notification
+ UIFileSharingEnabled
+
UILaunchStoryboardName
LaunchScreen
- NSAppTransportSecurity
-
- NSAllowsArbitraryLoads
-
-
UIMainStoryboardFile
Main
UIRequiredDeviceCapabilities
@@ -204,7 +206,5 @@
- UIFileSharingEnabled
-
diff --git a/SideStoreApp/Sources/SideStoreAppKit/ALTApplication+AltStoreApp.swift b/SideStoreApp/Sources/SideStoreAppKit/ALTApplication+AltStoreApp.swift
index c130d123..94cd9e22 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/ALTApplication+AltStoreApp.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/ALTApplication+AltStoreApp.swift
@@ -7,6 +7,7 @@
//
import AltSign
+import SideStoreCore
extension ALTApplication {
static let altstoreBundleID = Bundle.Info.appbundleIdentifier
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Authentication/Intents/ViewAppIntentHandler.swift b/SideStoreApp/Sources/SideStoreAppKit/Authentication/Intents/ViewAppIntentHandler.swift
index e23754d7..280c1809 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Authentication/Intents/ViewAppIntentHandler.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Authentication/Intents/ViewAppIntentHandler.swift
@@ -7,7 +7,6 @@
//
import Intents
-import Shared
import SideStoreCore
import os.log
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Components/ToastView.swift b/SideStoreApp/Sources/SideStoreAppKit/Components/ToastView.swift
index 407d501f..b5b0eeb8 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Components/ToastView.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Components/ToastView.swift
@@ -7,7 +7,7 @@
//
import RoxasUIKit
-import Shared
+
import SideStoreCore
import SideKit
import AltSign
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift b/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift
index 7bd44490..f1333171 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Managing Apps/AppManager.swift
+++ b/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
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Operations/DownloadAppOperation.swift b/SideStoreApp/Sources/SideStoreAppKit/Operations/DownloadAppOperation.swift
index f1b08750..4acb6b96 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Operations/DownloadAppOperation.swift
+++ b/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 {
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Operations/RemoveAppOperation.swift b/SideStoreApp/Sources/SideStoreAppKit/Operations/RemoveAppOperation.swift
index 9f669eed..25fe143b 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Operations/RemoveAppOperation.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Operations/RemoveAppOperation.swift
@@ -11,7 +11,7 @@ import Foundation
import SideStoreCore
import minimuxer
import MiniMuxerSwift
-import Shared
+
import SideKit
@objc(RemoveAppOperation)
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Operations/SendAppOperation.swift b/SideStoreApp/Sources/SideStoreAppKit/Operations/SendAppOperation.swift
index 2efb0ea5..cdd320e5 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Operations/SendAppOperation.swift
+++ b/SideStoreApp/Sources/SideStoreAppKit/Operations/SendAppOperation.swift
@@ -9,7 +9,7 @@ import Foundation
import Network
import SideStoreCore
-import Shared
+
import SideKit
import MiniMuxerSwift
diff --git a/SideStoreApp/Sources/SideStoreAppKit/Operations/VerifyAppOperation.swift b/SideStoreApp/Sources/SideStoreAppKit/Operations/VerifyAppOperation.swift
index 85a4ad9a..e1b706e6 100644
--- a/SideStoreApp/Sources/SideStoreAppKit/Operations/VerifyAppOperation.swift
+++ b/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])
diff --git a/SideStoreApp/Sources/SideStoreCore/Components/Keychain.swift b/SideStoreApp/Sources/SideStoreCore/Components/Keychain.swift
index d91fc06b..29bb91c9 100644
--- a/SideStoreApp/Sources/SideStoreCore/Components/Keychain.swift
+++ b/SideStoreApp/Sources/SideStoreCore/Components/Keychain.swift
@@ -9,7 +9,7 @@
import Foundation
import KeychainAccess
-import AltSign
+//import AltSign
@propertyWrapper
public struct KeychainItem {
diff --git a/SideStoreApp/Sources/SideStoreCore/Extensions/FileManager+SharedDirectories.swift b/SideStoreApp/Sources/SideStoreCore/Extensions/FileManager+SharedDirectories.swift
index 34ee915a..13f61af4 100644
--- a/SideStoreApp/Sources/SideStoreCore/Extensions/FileManager+SharedDirectories.swift
+++ b/SideStoreApp/Sources/SideStoreCore/Extensions/FileManager+SharedDirectories.swift
@@ -7,7 +7,7 @@
//
import Foundation
-import Shared
+
public extension FileManager {
var altstoreSharedDirectory: URL? {
diff --git a/SideStoreApp/Sources/SideStoreCore/Model/StoreApp.swift b/SideStoreApp/Sources/SideStoreCore/Model/StoreApp.swift
index 30e293e2..c4086d5d 100644
--- a/SideStoreApp/Sources/SideStoreCore/Model/StoreApp.swift
+++ b/SideStoreApp/Sources/SideStoreCore/Model/StoreApp.swift
@@ -8,8 +8,6 @@
import CoreData
import Foundation
-
-import AltSign
import Roxas
public extension StoreApp {
diff --git a/SideStoreApp/Sources/SideWidget/Resources/Info.plist b/SideStoreApp/Sources/SideWidget/Resources/Info.plist
index 7078498c..e78f0ff5 100644
--- a/SideStoreApp/Sources/SideWidget/Resources/Info.plist
+++ b/SideStoreApp/Sources/SideWidget/Resources/Info.plist
@@ -23,13 +23,13 @@
$(PRODUCT_BUNDLE_PACKAGE_TYPE)
CFBundleShortVersionString
$(MARKETING_VERSION)
+ CFBundleVersion
+ 1
INIntentsSupported
RefreshAllIntent
ViewAppIntent
- CFBundleVersion
- 1
NSExtension
NSExtensionPointIdentifier