Adapt to macOS 26

Author: Mx-Iris

Core/Sources/RuntimeViewerCore/RuntimeImageLoadState.swift

@@ -5,4 +5,5 @@ public enum RuntimeImageLoadState {
     case loading
     case loaded
     case loadError(Error)
+    case unknown
 }

RuntimeViewerPackages/Package.swift

@@ -7,6 +7,14 @@ let appkitPlatforms: [Platform] = [.macOS]
 
 let uikitPlatforms: [Platform] = [.iOS, .tvOS, .visionOS]
 
+let usingSystemUXKit = true
+
+var sharedSwiftSettings: [SwiftSetting] = []
+
+if usingSystemUXKit {
+    sharedSwiftSettings.append(.define("USING_SYSTEM_UXKIT"))
+}
+
 let package = Package(
     name: "RuntimeViewerPackages",
     platforms: [
@@ -48,7 +56,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/Mx-Iris/CocoaCoordinator",
-            from: "0.3.0"
+            branch: "main"
         ),
         .package(
             url: "https://github.com/SnapKit/SnapKit",
@@ -64,11 +72,11 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/Mx-Iris/RxAppKit",
-            from: "0.2.0"
+            branch: "main"
         ),
         .package(
             url: "https://github.com/OpenUXKit/OpenUXKit",
-            from: "0.10.0"
+            branch: "main"
         ),
         .package(
             url: "https://github.com/MxIris-Library-Forks/NSAttributedStringBuilder",
@@ -141,25 +149,26 @@ let package = Package(
                 .product(name: "XCoordinatorRx", package: "XCoordinator", condition: .when(platforms: uikitPlatforms)),
                 .product(name: "CocoaCoordinator", package: "CocoaCoordinator", condition: .when(platforms: appkitPlatforms)),
                 .product(name: "RxCocoaCoordinator", package: "CocoaCoordinator", condition: .when(platforms: appkitPlatforms)),
-                .product(name: "OpenUXKitCoordinator", package: "CocoaCoordinator", condition: .when(platforms: appkitPlatforms)),
-//                .product(name: "UXKitCoordinator", package: "CocoaCoordinator", condition: .when(platforms: [.macOS])),
-            ]
+                .product(name: usingSystemUXKit ? "UXKitCoordinator" : "OpenUXKitCoordinator", package: "CocoaCoordinator", condition: .when(platforms: appkitPlatforms)),
+            ],
+            swiftSettings: sharedSwiftSettings,
         ),
         .target(
             name: "RuntimeViewerUI",
             dependencies: [
                 .product(name: "UIFoundation", package: "UIFoundation"),
                 .product(name: "UIFoundationToolbox", package: "UIFoundation"),
                 .product(name: "SnapKit", package: "SnapKit"),
-                .product(name: "OpenUXKit", package: "OpenUXKit", condition: .when(platforms: appkitPlatforms)),
-//                .product(name: "UXKit", package: "OpenUXKit"),
+                .product(name: usingSystemUXKit ? "UXKit" : "OpenUXKit", package: "OpenUXKit", condition: .when(platforms: appkitPlatforms)),
                 .product(name: "NSAttributedStringBuilder", package: "NSAttributedStringBuilder"),
                 .product(name: "SFSymbol", package: "SFSymbol"),
                 .product(name: "IDEIcons", package: "ide-icons"),
                 .product(name: "FilterUI", package: "filter-ui", condition: .when(platforms: appkitPlatforms)),
                 .product(name: "Rearrange", package: "Rearrange", condition: .when(platforms: appkitPlatforms)),
                 .product(name: "RunningApplicationKit", package: "RunningApplicationKit", condition: .when(platforms: appkitPlatforms)),
-            ]
+                .product(name: "UIFoundationAppleInternalObjC", package: "UIFoundation"),
+            ],
+            swiftSettings: sharedSwiftSettings,
         ),
         .target(
             name: "RuntimeViewerApplication",

RuntimeViewerPackages/Sources/RuntimeViewerApplication/Sidebar/SidebarImageViewModel.swift

@@ -22,7 +22,7 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
     @Observed private var searchScope: RuntimeTypeSearchScope = .all
     @Observed private var runtimeObjects: [RuntimeObjectName] = []
     @Observed private var filteredRuntimeObjects: [RuntimeObjectName] = []
-    @Observed private var loadState: RuntimeImageLoadState = .notLoaded
+    @Observed private var loadState: RuntimeImageLoadState = .unknown
 
     public init(node namedNode: RuntimeNamedNode, appServices: AppServices, router: any Router<SidebarRoute>) {
         self.runtimeEngine = appServices.runtimeEngine
@@ -31,7 +31,7 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
         self.imagePath = imagePath
         self.imageName = namedNode.name
         super.init(appServices: appServices, router: router)
-        
+
         Task {
             do {
                 let loadState: RuntimeImageLoadState = try await runtimeEngine.isImageLoaded(path: imagePath) ? .loaded : .notLoaded
@@ -42,43 +42,22 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
                 let swiftEnumNames = try await runtimeEngine.names(of: .swift(.enum), in: imagePath)
                 let swiftStructNames = try await runtimeEngine.names(of: .swift(.struct), in: imagePath)
                 await MainActor.run {
-
                     let searchString = ""
                     let searchScope: RuntimeTypeSearchScope = .all
 
                     self.searchString = searchString
                     self.searchScope = searchScope
-                    
+
                     self.runtimeObjects = objcClassNames + objcProtocolNames + swiftEnumNames + swiftStructNames + swiftClassNames + swiftProtocolNames
                     self.filteredRuntimeObjects = self.runtimeObjects.sorted()
-//                    self.runtimeObjects = Self.runtimeObjectsFor(
-//                        classNames: classNames, protocolNames: protocolNames,
-//                        searchString: searchString, searchScope: searchScope
-//                    )
 
                     self.loadState = loadState
                 }
 
-                
-//                $searchScope
-//                    .asPublisher()
-//                    .combineLatest(debouncedSearch.asPublisher(), $classNames.asPublisher(), $protocolNames.asPublisher()) {
-//                        Self.runtimeObjectsFor(
-//                            classNames: $2, protocolNames: $3,
-//                            searchString: $1, searchScope: $0
-//                        )
-//                    }
-//                    .asObservable()
-//                    .map { $0.sorted() }
-//                    .bind(to: $runtimeObjects)
-//                    .disposed(by: rx.disposeBag)
-
                 let debouncedSearch = $searchString
                     .debounce(.milliseconds(80), scheduler: MainScheduler.instance)
                     .asObservable()
-                
-                
-                
+
                 debouncedSearch
                     .withLatestFrom($runtimeObjects.asObservable()) { (searchString: String, runtimeObjects: [RuntimeObjectName]) -> [RuntimeObjectName] in
                         if searchString.isEmpty {
@@ -89,7 +68,7 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
                     }
                     .bind(to: $filteredRuntimeObjects)
                     .disposed(by: rx.disposeBag)
-                
+
                 await runtimeEngine.$imageList
                     .asObservable()
                     .flatMap { [unowned self] imageList in
@@ -102,6 +81,7 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
                     .bind(to: $loadState)
                     .disposed(by: rx.disposeBag)
             } catch {
+                loadState = .loadError(error)
                 print(error)
             }
         }
@@ -131,7 +111,6 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
 
     @MainActor
     public func transform(_ input: Input) -> Output {
-
         input.searchString.emit(to: $searchString).disposed(by: rx.disposeBag)
 
         input.runtimeObjectClicked.emitOnNextMainActor { [weak self] viewModel in
@@ -171,7 +150,6 @@ public class SidebarImageViewModel: ViewModel<SidebarRoute> {
             isEmpty: $runtimeObjects.asDriver().map { $0.isEmpty },
             windowInitialTitles: .just((runtimeNodeName, "")),
             windowSubtitle: input.runtimeObjectClicked.asSignal().map { "\($0.runtimeObject.name)" }
-            
         )
     }
 

RuntimeViewerPackages/Sources/RuntimeViewerArchitectures/RuntimeViewerArchitectures.swift

@@ -1,6 +1,7 @@
 @_exported import RxSwift
 @_exported import RxCocoa
-//@_exported import RxSwiftExt
+
+// @_exported import RxSwiftExt
 @_exported import RxSwiftPlus
 @_exported import RxCombine
 @_exported import RxDefaultsPlus
@@ -12,19 +13,23 @@
 @_exported import RxAppKit
 @_exported import CocoaCoordinator
 @_exported import RxCocoaCoordinator
+#if USING_SYSTEM_UXKIT
+@_exported import UXKitCoordinator
+#else
 @_exported import OpenUXKitCoordinator
-//@_exported import UXKitCoordinator
+#endif
 #endif
 
 #if canImport(UIKit) && !os(macOS)
 @_exported import RxUIKit
 @_exported import XCoordinator
 @_exported import XCoordinatorRx
+
 public typealias Routable = Route
 #endif
 
-extension ObservableType {
-    public func observeOnMainScheduler() -> Observable<Element> {
+public extension ObservableType {
+    func observeOnMainScheduler() -> Observable<Element> {
         observe(on: MainScheduler.instance)
     }
 }

RuntimeViewerPackages/Sources/RuntimeViewerUI/RuntimeViewerUI.swift

@@ -4,9 +4,14 @@
 @_exported import NSAttributedStringBuilder
 @_exported import SFSymbol
 @_exported import IDEIcons
+@_exported import UIFoundationAppleInternalObjC
 
 #if canImport(AppKit) && !targetEnvironment(macCatalyst)
+#if USING_SYSTEM_UXKIT
+@_exported import UXKit
+#else
 @_exported import OpenUXKit
+#endif
 @_exported import FilterUI
 //@_exported import MachInjectorUI
 @_exported import RunningApplicationKit