Cleanup next (#3331)

* Fix SPM

* Cleanup docs

* Cleanup module loading

* Fix deprecation warnings

* More deprecation fixes

Author: rlepinski

Accessibility Sample/Accessibility Sample/AppDelegate.swift

@@ -32,8 +32,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate,
 
         Airship.deepLinkDelegate = self
 
-        MessageCenter.shared.displayDelegate = self
-        PreferenceCenter.shared.openDelegate = self
+        Airship.messageCenter.displayDelegate = self
+        Airship.preferenceCenter.openDelegate = self
 
         NotificationCenter.default.addObserver(
             forName: AppStateTracker.didBecomeActiveNotification,
@@ -51,7 +51,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,
 
     func displayMessageCenter(messageID: String) {
         AppState.shared.selectedTab = .messageCenter
-        MessageCenter.shared.controller.navigate(messageID: messageID)
+        Airship.messageCenter.controller.navigate(messageID: messageID)
     }
 
     func displayMessageCenter() {

Accessibility Sample/Accessibility Sample/AppState.swift

@@ -26,14 +26,14 @@ class AppState: ObservableObject {
 
     init() {
         if Airship.isFlying {
-            MessageCenter.shared.inbox.unreadCountPublisher
+            Airship.messageCenter.inbox.unreadCountPublisher
                 .receive(on: RunLoop.main)
                 .sink { unreadCount in
                     self.unreadCount = unreadCount
                 }
                 .store(in: &self.subscriptions)
 
-            MessageCenter.shared.controller.statePublisher
+            Airship.messageCenter.controller.statePublisher
                 .receive(on: RunLoop.main)
                 .sink { status in
                     self.status = status

Accessibility Sample/Accessibility Sample/AppView.swift

@@ -27,7 +27,7 @@ struct AppView: View {
     @ViewBuilder
     private var messageCenterTab: some View {
         MessageCenterView(
-            controller: MessageCenter.shared.controller
+            controller: Airship.messageCenter.controller
         )
         .tabItem {
             Label(

Airship Sample/Airship Sample/AppDelegate.swift

@@ -30,8 +30,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, DeepLinkDelegate,
         Airship.push.defaultPresentationOptions = [.sound, .banner, .list]
 
         Airship.deepLinkDelegate = self
-        MessageCenter.shared.displayDelegate = self
-        PreferenceCenter.shared.openDelegate = self
+        Airship.messageCenter.displayDelegate = self
+        Airship.preferenceCenter.openDelegate = self
 
         NotificationCenter.default.addObserver(
             forName: AppStateTracker.didBecomeActiveNotification,

Airship Sample/Airship Sample/AppState.swift

@@ -30,15 +30,15 @@ class AppState: ObservableObject {
 
     init() {
         if Airship.isFlying {
-            MessageCenter.shared.inbox.unreadCountPublisher
+            Airship.messageCenter.inbox.unreadCountPublisher
                 .receive(on: RunLoop.main)
                 .sink { unreadCount in
                     self.unreadCount = unreadCount
                 }
                 .store(in: &self.subscriptions)
 
-            MessageCenter.shared.controller = messageCenterController
-            MessageCenter.shared.controller.statePublisher
+            Airship.messageCenter.controller = messageCenterController
+            Airship.messageCenter.controller.statePublisher
                 .receive(on: RunLoop.main)
                 .sink { status in
                     self.status = status

Airship/AirshipAutomation/Source/Actions/CancelSchedulesAction.swift

@@ -33,7 +33,7 @@ public final class CancelSchedulesAction: AirshipAction {
     }
 
     var automation: InAppAutomation {
-        return overrideAutomation ?? InAppAutomation.shared
+        return overrideAutomation ?? Airship.inAppAutomation
     }
 
     public func accepts(arguments: ActionArguments) async -> Bool {

Airship/AirshipAutomation/Source/Actions/ScheduleAction.swift

@@ -31,7 +31,7 @@ public final class ScheduleAction: AirshipAction {
     }
 
     var automation: InAppAutomation {
-        return overrideAutomation ?? InAppAutomation.shared
+        return overrideAutomation ??  Airship.inAppAutomation
     }
 
     public func accepts(arguments: ActionArguments) async -> Bool {

Airship/AirshipAutomation/Source/AutomationSDKModule.swift

@@ -16,31 +16,18 @@ public class AutomationSDKModule: NSObject, AirshipSDKModule {
         self.components = components
     }
 
-    public static func load(dependencies: [String : Any]) -> (any AirshipSDKModule)? {
-        // Dependencies
-        let dataStore = dependencies[SDKDependencyKeys.dataStore] as! PreferenceDataStore
-        let privacyManager = dependencies[SDKDependencyKeys.privacyManager] as! AirshipPrivacyManager
-        let remoteData = dependencies[SDKDependencyKeys.remoteData] as! (any RemoteDataProtocol)
-        let deferredResolver = dependencies[SDKDependencyKeys.deferredResolver] as! (any AirshipDeferredResolverProtocol)
-        let config = dependencies[SDKDependencyKeys.config] as! RuntimeConfig
-        let experiments = dependencies[SDKDependencyKeys.experimentsProvider] as! (any ExperimentDataProvider)
-        let sceneManager = dependencies[SDKDependencyKeys.sceneManager] as! (any AirshipSceneManagerProtocol)
-        let messageSceneManager = InAppMessageSceneManager(sceneManger: sceneManager)
-        let airshipAnalytics = dependencies[SDKDependencyKeys.analytics] as! (any InternalAnalyticsProtocol)
-        let meteredUsage = dependencies[SDKDependencyKeys.meteredUsage] as! (any AirshipMeteredUsageProtocol)
-        let cache = dependencies[SDKDependencyKeys.cache] as! (any AirshipCache)
-        let audienceChecker = dependencies[SDKDependencyKeys.audienceChecker] as! (any DeviceAudienceChecker)
-
+    public static func load(_ args: AirshiopModuleLoaderArgs) -> (any AirshipSDKModule)? {
         /// Utils
-        let remoteDataAccess = AutomationRemoteDataAccess(remoteData: remoteData)
+        let messageSceneManager = InAppMessageSceneManager(sceneManger: AirshipSceneManager.shared)
+        let remoteDataAccess = AutomationRemoteDataAccess(remoteData: args.remoteData)
         let assetManager = AssetCacheManager()
-        let displayCoordinatorManager = DisplayCoordinatorManager(dataStore: dataStore)
-        let frequencyLimits = FrequencyLimitManager(config: config)
+        let displayCoordinatorManager = DisplayCoordinatorManager(dataStore: args.dataStore)
+        let frequencyLimits = FrequencyLimitManager(config: args.config)
         let scheduleConditionsChangedNotifier = ScheduleConditionsChangedNotifier()
-        let eventRecorder = InAppEventRecorder(airshipAnalytics: airshipAnalytics, meteredUsage: meteredUsage)
-        let metrics = ApplicationMetrics(dataStore: dataStore, privacyManager: privacyManager)
+        let eventRecorder = InAppEventRecorder(airshipAnalytics: args.analytics, meteredUsage: args.meteredUsage)
+        let metrics = ApplicationMetrics(dataStore: args.dataStore, privacyManager: args.privacyManager)
 
-        let automationStore = AutomationStore(config: config)
+        let automationStore = AutomationStore(config: args.config)
 
         let analyticsFactory = InAppMessageAnalyticsFactory(
             eventRecorder: eventRecorder,
@@ -58,15 +45,15 @@ public class AutomationSDKModule: NSObject, AirshipSDKModule {
         let automationPreparer = AutomationPreparer(
             actionPreparer: actionPreparer,
             messagePreparer: messagePreparer,
-            deferredResolver: deferredResolver,
+            deferredResolver: args.deferredResolver,
             frequencyLimits: frequencyLimits,
-            audienceChecker: audienceChecker,
-            experiments: experiments,
+            audienceChecker: args.audienceChecker,
+            experiments: args.experimentsManager,
             remoteDataAccess: remoteDataAccess,
-            config: config,
+            config: args.config,
             additionalAudienceResolver: AdditionalAudienceCheckerResolver(
-                config: config,
-                cache: cache
+                config: args.config,
+                cache: args.cache
             )
         )
 
@@ -89,7 +76,7 @@ public class AutomationSDKModule: NSObject, AirshipSDKModule {
         let feed = AutomationEventFeed(
             applicationMetrics: metrics,
             applicationStateTracker: AppStateTracker.shared,
-            analyticsFeed: airshipAnalytics.eventFeed
+            analyticsFeed: args.analytics.eventFeed
         )
         feed.attach()
 
@@ -101,11 +88,11 @@ public class AutomationSDKModule: NSObject, AirshipSDKModule {
             scheduleConditionsChangedNotifier: scheduleConditionsChangedNotifier,
             eventFeed: feed,
             triggersProcessor: AutomationTriggerProcessor(store: automationStore),
-            delayProcessor: AutomationDelayProcessor(analytics: airshipAnalytics)
+            delayProcessor: AutomationDelayProcessor(analytics: args.analytics)
         )
 
         let remoteDataSubscriber = AutomationRemoteDataSubscriber(
-            dataStore: dataStore,
+            dataStore: args.dataStore,
             remoteDataAccess: remoteDataAccess,
             engine: engine,
             frequencyLimitManager: frequencyLimits
@@ -118,7 +105,7 @@ public class AutomationSDKModule: NSObject, AirshipSDKModule {
 
         let legacyInAppMessaging = LegacyInAppMessaging(
             analytics: LegacyInAppAnalytics(recorder: eventRecorder),
-            dataStore: dataStore,
+            dataStore: args.dataStore,
             automationEngine: engine
         )
 
@@ -127,9 +114,9 @@ public class AutomationSDKModule: NSObject, AirshipSDKModule {
             inAppMessaging: inAppMessaging,
             legacyInAppMessaging: legacyInAppMessaging,
             remoteDataSubscriber: remoteDataSubscriber,
-            dataStore: dataStore,
-            privacyManager: privacyManager,
-            config: config
+            dataStore: args.dataStore,
+            privacyManager: args.privacyManager,
+            config: args.config
         )
 
         return AutomationSDKModule(

Airship/AirshipCore/Source/AirshipSDKModule.swift

@@ -9,5 +9,5 @@ public protocol AirshipSDKModule: NSObject {
     var components: [any AirshipComponent] { get }
 
     @MainActor
-    static func load(dependencies: [String: Any]) -> (any AirshipSDKModule)?
+    static func load(_ args: AirshiopModuleLoaderArgs) -> (any AirshipSDKModule)?
 }

Airship/AirshipCore/Source/AirshipSceneManager.swift

@@ -1,13 +1,16 @@
 /* Copyright Airship and Contributors */
 
+import Foundation
 #if !os(watchOS)
-
 import UIKit
+#endif
 
 /// - Note: for internal use only.  :nodoc:
 public protocol AirshipSceneManagerProtocol: Sendable {
+#if !os(watchOS)
     @MainActor
     var lastActiveScene: UIWindowScene  { get throws }
+#endif
 }
 
 
@@ -19,6 +22,8 @@ public protocol AirshipSceneManagerProtocol: Sendable {
 public final class AirshipSceneManager: AirshipSceneManagerProtocol, @unchecked Sendable {
     public static let shared = AirshipSceneManager()
 
+#if !os(watchOS)
+
     private var scenes: [UIWindowScene] = []
 
     private let notificationCenter: AirshipNotificationCenter
@@ -99,7 +104,7 @@ public final class AirshipSceneManager: AirshipSceneManagerProtocol, @unchecked
         }
         return scene
     }
+#endif
 
 }
 
-#endif

Airship/AirshipCore/Source/ModuleLoader.swift

@@ -3,23 +3,22 @@
 import Foundation
 
 /// NOTE: For internal use only. :nodoc:
-public struct SDKDependencyKeys {
-    public static let channel = "channel"
-    public static let contact = "contact"
-    public static let push = "push"
-    public static let remoteData = "remote_data"
-    public static let config = "config"
-    public static let dataStore = "dataStore"
-    public static let analytics = "analytics"
-    public static let privacyManager = "privacy_manager"
-    public static let permissionsManager = "permissions_manager"
-    public static let workManager = "work_manager"
-    public static let deferredResolver = "deferred_resolver"
-    public static let cache = "airship_cache"
-    public static let experimentsProvider = "experiments"
-    public static let meteredUsage = "metered_usage"
-    public static let sceneManager = "scene_manager"
-    public static let audienceChecker = "audience_checker"
+public struct AirshiopModuleLoaderArgs {
+    public let config: RuntimeConfig
+    public let dataStore: PreferenceDataStore
+    public let channel: any InternalAirshipChannelProtocol&AirshipChannelProtocol
+    public let contact: any AirshipContactProtocol
+    public let push: any AirshipPushProtocol
+    public let remoteData: any RemoteDataProtocol
+    public let analytics: any InternalAnalyticsProtocol&AirshipAnalyticsProtocol
+    public let privacyManager: AirshipPrivacyManager
+    public let permissionsManager: AirshipPermissionsManager
+    public let experimentsManager: any ExperimentDataProvider
+    public let meteredUsage: AirshipMeteredUsage
+    public let deferredResolver: any AirshipDeferredResolverProtocol
+    public let cache: any AirshipCache
+    public let audienceChecker: any DeviceAudienceChecker
+    public let workManager: any AirshipWorkManagerProtocol
 
 }
 
@@ -58,39 +57,31 @@ class ModuleLoader {
         audienceChecker: any DeviceAudienceChecker
     ) {
 
-        var dependencies: [String: Any] = [
-            SDKDependencyKeys.config: config,
-            SDKDependencyKeys.dataStore: dataStore,
-            SDKDependencyKeys.channel: channel,
-            SDKDependencyKeys.contact: contact,
-            SDKDependencyKeys.push: push,
-            SDKDependencyKeys.remoteData: remoteData,
-            SDKDependencyKeys.analytics: analytics,
-            SDKDependencyKeys.privacyManager: privacyManager,
-            SDKDependencyKeys.permissionsManager: permissionsManager,
-            SDKDependencyKeys.workManager: AirshipWorkManager.shared,
-            SDKDependencyKeys.deferredResolver: deferredResolver,
-            SDKDependencyKeys.cache: cache,
-            SDKDependencyKeys.experimentsProvider: experimentsManager,
-            SDKDependencyKeys.meteredUsage: meteredUsage,
-            SDKDependencyKeys.audienceChecker: audienceChecker
-        ]
-
-#if !os(watchOS)
-        dependencies[SDKDependencyKeys.sceneManager] = AirshipSceneManager.shared
-#endif
-
-        let swiftModules = ModuleLoader.loadModules(dependencies)
-        let swiftComponents = swiftModules.compactMap { $0.components }.reduce([], +)
-        let swiftActionManifests = swiftModules.compactMap { $0.actionsManifest }
-
-
-        self.components = swiftComponents
-        self.actionManifests = swiftActionManifests
+        let args = AirshiopModuleLoaderArgs(
+            config: config,
+            dataStore: dataStore,
+            channel: channel,
+            contact: contact,
+            push: push,
+            remoteData: remoteData,
+            analytics: analytics,
+            privacyManager: privacyManager,
+            permissionsManager: permissionsManager,
+            experimentsManager: experimentsManager,
+            meteredUsage: meteredUsage,
+            deferredResolver: deferredResolver,
+            cache: cache,
+            audienceChecker: audienceChecker,
+            workManager: AirshipWorkManager.shared
+        )
+
+        let modules = ModuleLoader.loadModules(args)
+        self.components = modules.compactMap { $0.components }.reduce([], +)
+        self.actionManifests = modules.compactMap { $0.actionsManifest }
     }
 
     @MainActor
-    private class func loadModules(_ dependencies: [String: Any]) -> [any AirshipSDKModule]
+    private class func loadModules(_ args: AirshiopModuleLoaderArgs) -> [any AirshipSDKModule]
     {
         let sdkModules: [any AirshipSDKModule] = SDKModuleNames.allCases.compactMap {
             guard
@@ -100,7 +91,7 @@ class ModuleLoader {
             }
 
             AirshipLogger.debug("Loading module \($0)")
-            return moduleClass.load(dependencies: dependencies)
+            return moduleClass.load(args)
         }
 
         return sdkModules

Airship/AirshipDebug/Source/DebugSDKModule.swift

@@ -15,15 +15,11 @@ public class DebugSDKModule: NSObject, AirshipSDKModule {
 
     public let components: [any AirshipComponent]
 
-    public static func load(dependencies: [String : Any]) -> (any AirshipSDKModule)? {
-        let analytics = dependencies[SDKDependencyKeys.analytics] as! (any AirshipAnalyticsProtocol)
-        let remoteData = dependencies[SDKDependencyKeys.remoteData] as! (any RemoteDataProtocol)
-        let config = dependencies[SDKDependencyKeys.config] as! RuntimeConfig
-
+    public static func load(_ args: AirshiopModuleLoaderArgs) -> (any AirshipSDKModule)? {
         let debugManager = AirshipDebugManager(
-            config: config,
-            analytics: analytics,
-            remoteData: remoteData
+            config: args.config,
+            analytics: args.analytics,
+            remoteData: args.remoteData
         )
         return DebugSDKModule(debugManager)
     }