Supports sendable & actor

Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version:5.9
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "DebugMenu",
     defaultLocalization: "en",
-    platforms: [.iOS(.v14)],
+    platforms: [.iOS(.v16)],
     products: [
         .library(
             name: "DebugMenu",

Sources/DebugMenu/DebugMenu.swift

@@ -2,6 +2,8 @@ import UIKit
 
 @available(iOSApplicationExtension, unavailable)
 public struct DebugMenu {
+
+    @MainActor
     public static func install(
         windowScene: UIWindowScene? = nil,
         items: [DebugItem] = [],

Sources/DebugMenu/Entity/Application.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 public class Application {
-    public static var current: Application = .init()
+    public static var current: Application { Application() }
 
     public var appName: String {
         Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as! String

Sources/DebugMenu/Entity/DashboardItem.swift

@@ -1,6 +1,7 @@
 import Foundation
 
-public protocol DashboardItem {
+@MainActor
+public protocol DashboardItem: Sendable {
     var title: String { get }
     func startMonitoring()
     func stopMonitoring()

Sources/DebugMenu/Entity/DebugItem.swift

@@ -1,23 +1,23 @@
 import UIKit
 
-public protocol DebugItem {
+public protocol DebugItem: Sendable {
     var debugItemTitle: String { get }
     var action: DebugItemAction { get }
 }
 
-public enum DebugItemAction {
+public enum DebugItemAction: Sendable {
     case didSelect(
-        operation: (_ controller: UIViewController) async -> DebugMenuResult
+        operation: @Sendable @MainActor (_ controller: UIViewController) async -> DebugMenuResult
     )
-    case execute(_ operation: () async -> DebugMenuResult)
+    case execute(_ operation: @Sendable () async -> DebugMenuResult)
     case toggle(
-        current: () -> Bool,
-        operation: (_ isOn: Bool) async -> DebugMenuResult
+        current: @Sendable () -> Bool,
+        operation: @Sendable (_ isOn: Bool) async -> DebugMenuResult
     )
     case slider(
-        current: () -> Double,
-        valueLabelText: (Double) -> String,
+        current: @Sendable () -> Double,
+        valueLabelText: @Sendable (Double) -> String,
         range: ClosedRange<Double>,
-        operation: (_ value: Double) async -> DebugMenuResult
+        operation: @Sendable (_ value: Double) async -> DebugMenuResult
     )
 }

Sources/DebugMenu/Entity/Device.swift

@@ -1,7 +1,8 @@
 import UIKit
 
-public class Device {
-    public static let current: Device = .init()
+@MainActor
+public final class Device {
+    public static var current: Device { Device() }
 
     public var localizedModel: String {
         UIDevice.current.localizedModel

Sources/DebugMenu/Entity/Device/GPU.swift

@@ -1,8 +1,8 @@
 import Foundation
 import Metal
 
-class GPU {
-    static var current: GPU = .init()
+final class GPU {
+    static var current: GPU { GPU() }
     let device: MTLDevice
 
     init() {

Sources/DebugMenu/Entity/Device/NetworkUsage.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct NetworkUsage {
+public struct NetworkUsage: Sendable {
     public let wifiDataSent: UInt64
     public let wifiDataReceived: UInt64
     public let wwanDataSent: UInt64

Sources/DebugMenu/Entity/MetricsFetcher.swift

@@ -1,7 +1,7 @@
 import Foundation
 
-public enum MetricsFetcher {
-    case text(_ fetcher: () -> String)
-    case graph(_ fetcher: () -> [Double])
-    case interval(_ fetcher: () -> [TimeInterval])
+public enum MetricsFetcher: Sendable {
+    case text(_ fetcher: @Sendable @MainActor () -> String)
+    case graph(_ fetcher: @Sendable @MainActor () -> [Double])
+    case interval(_ fetcher: @Sendable @MainActor () -> [TimeInterval])
 }

Sources/DebugMenu/Entity/Options.swift

@@ -1,12 +1,12 @@
 import Foundation
 import UIKit
 
-public enum Options {
+public enum Options: Sendable {
     case showsWidgetOnLaunch
     case showsRecentItems
     case launchIcon(LaunchIcon)
 
-    public struct LaunchIcon {
+    public struct LaunchIcon: Sendable {
         public typealias Position = FloatingItemGestureRecognizer.Edge
 
         let image: UIImage?
@@ -21,7 +21,7 @@ public enum Options {
         }
     }
 
-    public static var `default`: [Options] = [.showsRecentItems]
+    public static var `default`: [Options] { [.showsRecentItems] }
 
     var isShowsWidgetOnLaunch: Bool {
         if case .showsWidgetOnLaunch = self { return true }

Sources/DebugMenu/Extensions/FloatingItemGestureRecognizer.swift

@@ -4,7 +4,7 @@ public class FloatingItemGestureRecognizer: UIPanGestureRecognizer {
     private weak var groundView: UIView?
     private var gestureGap: CGPoint?
     private let margin: CGFloat = 16
-    public enum Edge {
+    public enum Edge: Sendable {
         case top
         //        case center
         case bottom
@@ -26,7 +26,7 @@ public class FloatingItemGestureRecognizer: UIPanGestureRecognizer {
 
     }
 
-    deinit {
+    @MainActor deinit {
         self.removeTarget(self, action: #selector(pan(_:)))
     }
 

Sources/DebugMenu/Plugin/Dashboard/CPUGraphDashboardItem.swift

@@ -1,6 +1,7 @@
 import Foundation
 
-public class CPUGraphDashboardItem: DashboardItem {
+@MainActor
+public final class CPUGraphDashboardItem: DashboardItem {
     public init() {}
     public let title: String = "CPU"
     private var data: [Double] = []

Sources/DebugMenu/Plugin/Dashboard/CPUUsageDashboardItem.swift

@@ -1,6 +1,7 @@
 import Foundation
 
-public class CPUUsageDashboardItem: DashboardItem {
+@MainActor
+public final class CPUUsageDashboardItem: DashboardItem {
     public init() {}
     public let title: String = "CPU"
     private var text: String = ""

Sources/DebugMenu/Plugin/Dashboard/FPSDashboardItem.swift

@@ -1,7 +1,8 @@
 import Foundation
 import QuartzCore
 
-public class FPSDashboardItem: DashboardItem {
+@MainActor
+public final class FPSDashboardItem: DashboardItem {
     public let title: String = "FPS"
     var displayLink: CADisplayLink?
     var lastupdated: CFTimeInterval = 0

Sources/DebugMenu/Plugin/Dashboard/GPUMemoryUsageDashboardItem.swift

@@ -1,6 +1,7 @@
 import Foundation
 
-public class GPUMemoryUsageDashboardItem: DashboardItem {
+@MainActor
+public final class GPUMemoryUsageDashboardItem: DashboardItem {
     public init() {}
     public let title: String = "GPU MEM"
     private var text: String = ""

Sources/DebugMenu/Plugin/Dashboard/IntervalDashboardItem.swift

@@ -1,7 +1,8 @@
 import Combine
 import Foundation
 
-public class IntervalDashboardItem: DashboardItem {
+@MainActor
+public final class IntervalDashboardItem: DashboardItem {
     public init(title: String, name: String) {
         self.title = title
         self.name = Notification.Name(name)

Sources/DebugMenu/Plugin/Dashboard/MemoryUsageDashboardItem.swift

@@ -1,6 +1,7 @@
 import Foundation
 
-public class MemoryUsageDashboardItem: DashboardItem {
+@MainActor
+public final class MemoryUsageDashboardItem: DashboardItem {
     public init() {}
     public let title: String = "MEM"
     private var text: String = ""

Sources/DebugMenu/Plugin/Dashboard/NetworkUsageDashboardItem.swift

@@ -1,7 +1,8 @@
 import Combine
 import Foundation
 
-public class NetworkUsageDashboardItem: DashboardItem {
+@MainActor
+public final class NetworkUsageDashboardItem: DashboardItem {
     public init() {}
     public let title: String = "Network"
     var lastNetworkUsage: NetworkUsage? = nil

Sources/DebugMenu/Plugin/Dashboard/ThermalStateDashboardItem.swift

@@ -1,7 +1,8 @@
 import Combine
 import Foundation
 
-public class ThermalStateDashboardItem: DashboardItem {
+@MainActor
+public final class ThermalStateDashboardItem: DashboardItem {
     public init() {}
     public let title: String = "Thermal"
     var currentThermalState: ProcessInfo.ThermalState = .nominal

Sources/DebugMenu/Plugin/DebugMenu/AppInfoDebugItem.swift

@@ -4,7 +4,7 @@ public struct AppInfoDebugItem: DebugItem {
     public init() {}
     public var debugItemTitle: String = "App Info"
     public var action: DebugItemAction = .didSelect { parent in
-        let vc = await EnvelopePreviewTableViewController {
+        let vc = EnvelopePreviewTableViewController {
             [
                 "App Name": Application.current.appName,
                 "Version": Application.current.version,
@@ -18,7 +18,7 @@ public struct AppInfoDebugItem: DebugItem {
             .map({ Envelope.init(key: $0.key, value: $0.value) })
             .sorted(by: { $0.key < $1.key })
         }
-        await parent.navigationController?.pushViewController(vc, animated: true)
+        parent.navigationController?.pushViewController(vc, animated: true)
         return .success()
     }
 

Sources/DebugMenu/Plugin/DebugMenu/CaseSelectableDebugItem.swift

@@ -1,14 +1,14 @@
 import UIKit
 
-public struct CaseSelectableDebugItem<T: CaseIterable & RawRepresentable>: DebugItem
+public struct CaseSelectableDebugItem<T: CaseIterable & RawRepresentable & Sendable>: DebugItem
 where T.RawValue: Equatable {
-    public init(currentValue: T, didSelected: @escaping (T) -> Void) {
+    public init(currentValue: T, didSelected: @escaping @Sendable @MainActor (T) -> Void) {
         self.action = .didSelect { controller in
-            let vc = await CaseSelectableTableController<T>(
+            let vc = CaseSelectableTableController<T>(
                 currentValue: currentValue,
                 didSelected: didSelected
             )
-            await controller.navigationController?.pushViewController(vc, animated: true)
+            controller.navigationController?.pushViewController(vc, animated: true)
             return .success()
         }
     }

Sources/DebugMenu/Plugin/DebugMenu/DeviceInfoDebugItem.swift

@@ -4,7 +4,7 @@ public struct DeviceInfoDebugItem: DebugItem {
     public init() {}
     public var debugItemTitle: String = "Device Info"
     public var action: DebugItemAction = .didSelect { parent in
-        let vc = await EnvelopePreviewTableViewController {
+        let vc = EnvelopePreviewTableViewController {
             [
                 "Name": Device.current.name,
                 "Battery level": Device.current.localizedBatteryLevel,
@@ -22,7 +22,7 @@ public struct DeviceInfoDebugItem: DebugItem {
             ]
             .map({ Envelope(key: $0.key, value: $0.value) }).sorted(by: { $0.key < $1.key })
         }
-        await parent.navigationController?.pushViewController(vc, animated: true)
+        parent.navigationController?.pushViewController(vc, animated: true)
         return .success()
     }
 

Sources/DebugMenu/Plugin/DebugMenu/GroupDebugItem.swift

@@ -13,12 +13,12 @@ public struct GroupDebugItem: DebugItem, HasDebugItems {
     public var debugItemTitle: String
     public var action: DebugItemAction {
         .didSelect { controller in
-            let vc = await InAppDebuggerViewController(
+            let vc = InAppDebuggerViewController(
                 title: self.debugItemTitle,
                 debuggerItems: self.debugItems,
                 options: []
             )
-            await controller.navigationController?.pushViewController(vc, animated: true)
+            controller.navigationController?.pushViewController(vc, animated: true)
             return .success()
         }
     }

Sources/DebugMenu/Plugin/DebugMenu/KeyValueDebugItem.swift

@@ -3,12 +3,12 @@ import Foundation
 public struct KeyValueDebugItem: DebugItem {
     public init(
         title: String,
-        fetcher: @escaping () async -> [Envelope]
+        fetcher: @escaping @Sendable @MainActor () async -> [Envelope]
     ) {
         self.title = title
         self.action = .didSelect(operation: { parent in
-            let vc = await EnvelopePreviewTableViewController(fetcher: fetcher)
-            await parent.navigationController?.pushViewController(vc, animated: true)
+            let vc = EnvelopePreviewTableViewController(fetcher: fetcher)
+            parent.navigationController?.pushViewController(vc, animated: true)
             return .success()
         })
     }

Sources/DebugMenu/Plugin/DebugMenu/SliderDebugItem.swift

@@ -3,10 +3,10 @@ import Foundation
 public struct SliderDebugItem: DebugItem {
     public init(
         title: String,
-        current: @escaping () -> Double,
-        valueLabelText: @escaping (Double) -> String = { String(format: "%.2f", $0) },
+        current: @escaping @Sendable () -> Double,
+        valueLabelText: @escaping @Sendable (Double) -> String = { String(format: "%.2f", $0) },
         range: ClosedRange<Double> = 0.0...1.0,
-        onChange: @escaping (Double) -> Void
+        onChange: @escaping @Sendable (Double) -> Void
     ) {
         self.title = title
         self.action = .slider(

Sources/DebugMenu/Plugin/DebugMenu/ToggleDebugItem.swift

@@ -1,7 +1,11 @@
 import Foundation
 
 public struct ToggleDebugItem: DebugItem {
-    public init(title: String, current: @escaping () -> Bool, onChange: @escaping (Bool) -> Void) {
+    public init(
+        title: String,
+        current: @escaping @Sendable () -> Bool,
+        onChange: @escaping @Sendable (Bool) -> Void
+    ) {
         self.title = title
         self.action = .toggle(
             current: current,

Sources/DebugMenu/Plugin/DebugMenu/UI/CaseSelectableTableController.swift

@@ -1,14 +1,14 @@
 import Foundation
 import UIKit
 
-public class CaseSelectableTableController<T: CaseIterable & RawRepresentable>:
+public class CaseSelectableTableController<T: CaseIterable & RawRepresentable & Sendable>:
     UITableViewController
 where T.RawValue: Equatable {
     public let currentValue: T
     public let didSelected: (T) -> Void
     private var selectedIndex: IndexPath? = nil
 
-    public init(currentValue: T, didSelected: @escaping (T) -> Void) {
+    public init(currentValue: T, didSelected: @escaping @Sendable @MainActor (T) -> Void) {
         self.currentValue = currentValue
         self.didSelected = didSelected
         super.init(style: .grouped)

Sources/DebugMenu/Plugin/DebugMenu/UI/EnvelopePreviewTableViewController.swift

@@ -6,7 +6,7 @@ class EnvelopePreviewTableViewController: UITableViewController {
     var envelops: [Envelope] = []
     var fetcher: () async -> [Envelope]
 
-    init(fetcher: @escaping () async -> [Envelope]) {
+    init(fetcher: @escaping @Sendable @MainActor () async -> [Envelope]) {
         self.fetcher = fetcher
         super.init(style: .plain)
     }