From e834879585544bdb404ce99e2a30f70e30b41e01 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sat, 31 Oct 2026 17:51:22 +0800 Subject: [PATCH 1/2] fix: use module selectors in Example observation models --- Example/Example/ObservableExampleApp.swift | 23 +++++++++++++------ Example/Shared/Data/ObservationExample.swift | 12 ++++++++-- .../DynamicContentView/ForEachExample.swift | 6 ++++- .../ObservationInteractionTests.swift | 6 ++++- 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/Example/Example/ObservableExampleApp.swift b/Example/Example/ObservableExampleApp.swift index cf8265b81..6b1b7ad3c 100644 --- a/Example/Example/ObservableExampleApp.swift +++ b/Example/Example/ObservableExampleApp.swift @@ -45,13 +45,16 @@ private struct ContentViewWrapper: View { } #if canImport(AppKit) && !targetEnvironment(macCatalyst) -// Avoid AppKit export Foundation and Foundation export Observation issue. -// Then Observation's Observable macro will conflict with OpenObservation's Observable macro. import class AppKit.NSResponder import class AppKit.NSWindow import protocol AppKit.NSApplicationDelegate import struct Foundation.Notification -@Observable + +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private class AppDelegate: NSResponder, NSApplicationDelegate { var window: NSWindow? @@ -60,8 +63,6 @@ private class AppDelegate: NSResponder, NSApplicationDelegate { } } #else -// Avoid UIKit export Foundation and Foundation export Observation issue. -// Then Observation's Observable macro will conflict with OpenObservation's Observable macro. import class UIKit.UIApplication import class UIKit.UIResponder import class UIKit.UIScene @@ -71,7 +72,11 @@ import class UIKit.UIWindow import protocol UIKit.UIApplicationDelegate import protocol UIKit.UIWindowSceneDelegate -@Observable +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? @@ -97,7 +102,11 @@ private class AppDelegate: UIResponder, UIApplicationDelegate { } } -@Observable +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private class SceneDelegate: NSObject, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { print("SceneDelegate will connect to scene: \(scene), session: \(session), options: \(connectionOptions)") diff --git a/Example/Shared/Data/ObservationExample.swift b/Example/Shared/Data/ObservationExample.swift index 385d38351..c076f4bfb 100644 --- a/Example/Shared/Data/ObservationExample.swift +++ b/Example/Shared/Data/ObservationExample.swift @@ -20,7 +20,11 @@ struct ObservationExample: View { } } -@Observable +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private class ColorModel { var showRed = false } @@ -42,7 +46,11 @@ struct ObservationColorExample: View { ObservationColorExample() } -@Observable +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private final class CounterModel { var count = 0 } diff --git a/Example/Shared/View/DynamicContentView/ForEachExample.swift b/Example/Shared/View/DynamicContentView/ForEachExample.swift index c0b3eacb1..9db209648 100644 --- a/Example/Shared/View/DynamicContentView/ForEachExample.swift +++ b/Example/Shared/View/DynamicContentView/ForEachExample.swift @@ -72,7 +72,11 @@ struct ForEachNonConstantRangeView: View { } } -@Observable +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private class ForEachLazyContainerNonConstantCountViewModel { var data: [Int] = [1, 2] } diff --git a/Example/Tests/OpenSwiftUIInteractionTests/Data/Observation/ObservationInteractionTests.swift b/Example/Tests/OpenSwiftUIInteractionTests/Data/Observation/ObservationInteractionTests.swift index 55ed7104a..76d03e25a 100644 --- a/Example/Tests/OpenSwiftUIInteractionTests/Data/Observation/ObservationInteractionTests.swift +++ b/Example/Tests/OpenSwiftUIInteractionTests/Data/Observation/ObservationInteractionTests.swift @@ -31,7 +31,11 @@ struct ObservationInteractionTests { } } -@Observable +#if OPENSWIFTUI +@OpenObservation::Observable +#else +@Observation::Observable +#endif private final class CounterModel { var count = 0 } From a62441a54ae83acb183941408754bb92770c5ba7 Mon Sep 17 00:00:00 2001 From: Kyle Date: Sat, 31 Oct 2026 18:07:36 +0800 Subject: [PATCH 2/2] refactor: remove redundant platform imports --- Example/Example/BenchmarkApp.swift | 4 ---- Example/Example/ExampleApp.swift | 2 -- Example/Example/ObservableExampleApp.swift | 14 -------------- Example/Example/ObservableObjectExampleApp.swift | 2 -- Example/HostingExample/ViewController.swift | 6 ------ Example/Shared/Extension/Platform+TypeAlias.swift | 2 -- .../Hosting/CAHostingLayerExample.swift | 6 ------ .../Representable/ColorRepresentableExample.swift | 2 -- .../View/Image/ImageConversionsExample.swift | 6 ------ Example/Shared/View/Text/FontPlayground.swift | 3 --- Example/TestingHost/TestingHostApp.swift | 6 ------ .../InteractionTests/InteractionTestHost.swift | 5 ----- .../Integration/Hosting/HostingViewUITests.swift | 6 ------ ...latformViewControllerRepresentableUITests.swift | 2 -- .../PlatformViewRepresentableUITests.swift | 2 -- .../UITests/AnimationDebugControllerTests.swift | 1 - .../UITests/SnapshotTesting+Testing.swift | 3 --- .../Accessibility/AccessibilityAction.swift | 5 ----- .../AccessibilityAdjustableAction.swift | 3 --- .../AccessibilityCoreUserSettings.swift | 1 - .../Accessibility/AccessibilityFocus.swift | 1 - .../Accessibility/AccessibilityNode.swift | 1 - .../AccessibilityRotorEntryRange.swift | 3 --- .../Platform/AppKitAccessibility.swift | 1 - .../Platform/UIKitAccessibility.swift | 1 - Sources/OpenSwiftUI/App/App/App.swift | 2 -- Sources/OpenSwiftUI/App/App/AppKit/AppKitApp.swift | 1 - .../App/App/AppKit/AppKitAppDelegate.swift | 1 - .../App/App/AppKit/AppWindowsController.swift | 1 - .../App/AppKit/NSApplicationDelegateAdaptor.swift | 1 - .../OpenSwiftUI/App/App/LaunchTestSupport.swift | 6 ------ .../App/UIKit/UIApplicationDelegateAdaptor.swift | 1 - Sources/OpenSwiftUI/App/App/UIKit/UIKitApp.swift | 1 - .../App/App/UIKit/UIKitAppDelegate.swift | 1 - .../App/App/UIKit/UIKitMainMenuController.swift | 1 - .../UIKit/DocumentBrowserViewController.swift | 2 -- Sources/OpenSwiftUI/App/Scene/SceneBridge.swift | 5 ----- .../Scene/UIKit/UIKitSceneConnectionOption.swift | 1 - .../Data/Environment/Environment+UITraitKey.swift | 1 - .../Data/Environment/PlatformEnvironment.swift | 2 -- .../Data/Environment/UIKitEnvironment.swift | 1 - Sources/OpenSwiftUI/Event/Focus/DefaultFocus.swift | 5 ----- .../Event/Focus/FirstResponderObserver.swift | 1 - Sources/OpenSwiftUI/Event/Focus/FocusBridge.swift | 5 ----- .../Event/Focus/FocusEffectDelegate.swift | 1 - .../OpenSwiftUI/Event/Focus/FocusEffectView.swift | 1 - Sources/OpenSwiftUI/Event/Focus/FocusItem.swift | 5 ----- .../OpenSwiftUI/Event/Focus/FocusNavigator.swift | 1 - .../OpenSwiftUI/Event/Focus/FocusResponder.swift | 6 ------ .../OpenSwiftUI/Event/Focus/FocusRingHelper.swift | 1 - .../Event/Focus/FocusRingNSButton.swift | 1 - Sources/OpenSwiftUI/Event/Focus/FocusSection.swift | 6 ------ .../OpenSwiftUI/Event/Focus/FocusViewGraph.swift | 3 --- Sources/OpenSwiftUI/Event/Focus/Focusable.swift | 6 ------ Sources/OpenSwiftUI/Event/Focus/KeyViewProxy.swift | 1 - .../Focus/UIKitHostContainerFocusItemInput.swift | 1 - .../Event/HitTest/HitTestingDebug.swift | 2 -- .../Event/HitTest/HitTestingSupport.swift | 5 ----- .../Platform/AppKit/AppKitGestureRecognizer.swift | 1 - .../AppKit/AppKitKeyEventConversions.swift | 1 - .../Event/Platform/AppKit/NSViewResponder.swift | 1 - .../Platform/UIKit/CurrentEventProvider.swift | 1 - .../Platform/UIKit/ScrollEventConverter.swift | 1 - .../Platform/UIKit/UIKitEventBindingBridge.swift | 1 - .../Platform/UIKit/UIKitGestureContainer.swift | 1 - .../Platform/UIKit/UIKitGestureRecognizer.swift | 1 - .../Platform/UIKit/UIKitGestureUtilities.swift | 1 - .../UIKit/UIKitHoverGestureRecognizer.swift | 1 - .../Platform/UIKit/UIKitKeyEventConversions.swift | 1 - .../Platform/UIKit/UIKitKeyPressResponder.swift | 1 - .../UIKit/UIKitRelationshipGestureRecognizer.swift | 1 - .../UIKit/UIKitResponderEventBindingBridge.swift | 1 - .../UIKit/UIKitResponderGestureRecognizer.swift | 1 - .../Event/Platform/UIKit/UIViewResponder.swift | 1 - .../Responder/PlatformViewResponderBase.swift | 5 ----- .../Graphic/Color/KitAccentColorProvider.swift | 1 - .../Color/KitCoreUINamedColorProvider.swift | 5 ----- .../AppKit/AppKitAppearanceConversions.swift | 1 - .../Graphic/AppKit/AppKitColorConversions.swift | 1 - .../Graphic/AppKit/AppKitConversions.swift | 1 - .../Graphic/AppKit/AppKitViewEnvironment.swift | 1 - .../Graphic/UIKit/UIKitConversions.swift | 1 - .../AppKit/Controller/NSHostingController.swift | 2 -- .../Hosting/AppKit/View/NSHostingView.swift | 1 - .../UIKit/Controller/UIHostingController.swift | 1 - .../Controller/UIViewControllerProvider.swift | 1 - .../Hosting/UIKit/UIHostingViewable.swift | 1 - .../UIKit/View/UIHostingView+Extension.swift | 1 - .../Hosting/UIKit/View/UIHostingView.swift | 1 - .../Hosting/UIKit/View/UIHostingViewBase.swift | 1 - .../UIKit/View/UIHostingViewDebugLayer.swift | 1 - .../PlatformItemList/PlatformItemList.swift | 3 --- .../WidgetAuxiliaryViewMetadata.swift | 5 ----- Sources/OpenSwiftUI/Integration/PreviewShims.swift | 2 -- .../AppKit/NSViewControllerRepresentable.swift | 1 - .../Representable/AppKit/NSViewRepresentable.swift | 1 - .../Platform/PlatformView+SafeArea.swift | 2 -- .../Representable/Platform/PlatformViewHost.swift | 2 -- .../Platform/PlatformViewRepresentable.swift | 2 -- .../UIKit/UIViewControllerRepresentable.swift | 1 - .../Representable/UIKit/UIViewRepresentable.swift | 1 - .../Layout/Edge/EdgeInsetsConversions.swift | 6 ------ .../Render/DisplayList/AppKitDisplayList.swift | 1 - .../DisplayList/DisplayListViewDrawing.swift | 6 ------ .../Render/DisplayList/UIKitDisplayList.swift | 1 - Sources/OpenSwiftUI/Test/PerformanceTest.swift | 5 ----- Sources/OpenSwiftUI/Test/TestingAppDelegate.swift | 6 ------ .../OpenSwiftUI/Test/TestingSceneDelegate.swift | 1 - Sources/OpenSwiftUI/Test/ViewTest.swift | 3 --- Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift | 5 ----- .../View/Control/Button/AppKitButton.swift | 1 - .../Button/BorderedButtonStyle_CarMac.swift | 3 --- .../Control/ProgressView/AppKitProgressView.swift | 1 - .../Control/ProgressView/UIKitProgressView.swift | 1 - .../AppKit/AppKitFeedbackImplementation.swift | 1 - .../UIKit/UIKitFeedbackImplementation.swift | 1 - .../UIKit/UIKitSensoryFeedbackCache.swift | 1 - .../Control/Slider/SystemSliderStyle_Mac.swift | 1 - .../Control/Slider/SystemSliderStyle_Phone.swift | 1 - .../View/Control/Stepper/ArrowStepperStyle.swift | 1 - .../Stepper/SegmentedButtonStepperStyle.swift | 1 - .../View/Image/NSImageConversions.swift | 1 - Sources/OpenSwiftUI/View/Image/PlatformImage.swift | 2 -- .../View/Image/UIImageConversions.swift | 1 - .../OpenSwiftUI/View/Image/VectorImageLayer.swift | 1 - .../View/Scroll/HostingScrollView+Focus.swift | 1 - .../View/Scroll/HostingScrollView.swift | 1 - .../View/Text/Text+Selection_macOS.swift | 1 - .../Typesetting/TypesettingConfiguration.swift | 1 - .../View/TextField/NSTextField+Environment.swift | 1 - .../View/Toggle/CheckboxToggleStyle.swift | 1 - .../View/Toggle/SwitchToggleStyle.swift | 6 ------ .../View/Toolbar/BarAppearanceBridge+AppKit.swift | 1 - .../View/Toolbar/BarAppearanceBridge+UIKit.swift | 1 - .../Integration/PlatformAlias.swift | 2 -- .../IdentifiedViewProxyCompatibilityTests.swift | 3 --- .../Data/Environment/UIKitEnvironmentTests.swift | 1 - .../Event/Focus/FocusNavigatorTests.swift | 1 - .../Event/InputEvent/KeyEventDispatcherTests.swift | 1 - .../View/NSHostingViewRootTransformTests.swift | 1 - .../Hosting/AppKit/View/NSHostingViewTests.swift | 1 - .../UIKit/View/UIHostingViewBaseTests.swift | 1 - .../Hosting/UIKit/View/UIHostingViewTests.swift | 1 - .../IdentifiedView/IdentifiedViewTreeTests.swift | 3 --- .../View/Image/ImageConversionsTests.swift | 6 ------ 145 files changed, 316 deletions(-) diff --git a/Example/Example/BenchmarkApp.swift b/Example/Example/BenchmarkApp.swift index ec297021d..215a29e89 100644 --- a/Example/Example/BenchmarkApp.swift +++ b/Example/Example/BenchmarkApp.swift @@ -12,10 +12,6 @@ import OpenSwiftUI import SwiftUI #endif -#if os(iOS) || os(visionOS) -import UIKit -#endif - struct BenchmarkApp { static func main() { _TestApp().runBenchmarks([ diff --git a/Example/Example/ExampleApp.swift b/Example/Example/ExampleApp.swift index ad2670c11..71f9b6760 100644 --- a/Example/Example/ExampleApp.swift +++ b/Example/Example/ExampleApp.swift @@ -26,7 +26,6 @@ struct ExampleApp: App { } #if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit private class AppDelegate: NSResponder, NSApplicationDelegate { var window: NSWindow? @@ -35,7 +34,6 @@ private class AppDelegate: NSResponder, NSApplicationDelegate { } } #else -import UIKit private class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? diff --git a/Example/Example/ObservableExampleApp.swift b/Example/Example/ObservableExampleApp.swift index 6b1b7ad3c..04fa7aefc 100644 --- a/Example/Example/ObservableExampleApp.swift +++ b/Example/Example/ObservableExampleApp.swift @@ -45,11 +45,6 @@ private struct ContentViewWrapper: View { } #if canImport(AppKit) && !targetEnvironment(macCatalyst) -import class AppKit.NSResponder -import class AppKit.NSWindow -import protocol AppKit.NSApplicationDelegate -import struct Foundation.Notification - #if OPENSWIFTUI @OpenObservation::Observable #else @@ -63,15 +58,6 @@ private class AppDelegate: NSResponder, NSApplicationDelegate { } } #else -import class UIKit.UIApplication -import class UIKit.UIResponder -import class UIKit.UIScene -import class UIKit.UISceneConfiguration -import class UIKit.UISceneSession -import class UIKit.UIWindow -import protocol UIKit.UIApplicationDelegate -import protocol UIKit.UIWindowSceneDelegate - #if OPENSWIFTUI @OpenObservation::Observable #else diff --git a/Example/Example/ObservableObjectExampleApp.swift b/Example/Example/ObservableObjectExampleApp.swift index 65e3fe678..dee6d8283 100644 --- a/Example/Example/ObservableObjectExampleApp.swift +++ b/Example/Example/ObservableObjectExampleApp.swift @@ -49,7 +49,6 @@ private struct ContentViewWrapper: View { } #if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit private class AppDelegate: NSResponder, NSApplicationDelegate, ObservableObject { var window: NSWindow? @@ -58,7 +57,6 @@ private class AppDelegate: NSResponder, NSApplicationDelegate, ObservableObject } } #else -import UIKit private class AppDelegate: UIResponder, UIApplicationDelegate, ObservableObject { var window: UIWindow? diff --git a/Example/HostingExample/ViewController.swift b/Example/HostingExample/ViewController.swift index c903f4085..b7e91cd1b 100644 --- a/Example/HostingExample/ViewController.swift +++ b/Example/HostingExample/ViewController.swift @@ -11,12 +11,6 @@ import OpenSwiftUI import SwiftUI #endif -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - #if os(iOS) || os(visionOS) class ViewController: UINavigationController { override func viewDidAppear(_ animated: Bool) { diff --git a/Example/Shared/Extension/Platform+TypeAlias.swift b/Example/Shared/Extension/Platform+TypeAlias.swift index ca08ed12e..3b5901954 100644 --- a/Example/Shared/Extension/Platform+TypeAlias.swift +++ b/Example/Shared/Extension/Platform+TypeAlias.swift @@ -12,7 +12,6 @@ public import SwiftUI #endif #if canImport(AppKit) && !targetEnvironment(macCatalyst) -public import AppKit public typealias PlatformColor = NSColor public typealias PlatformImage = NSImage public typealias PlatformView = NSView @@ -20,7 +19,6 @@ public typealias PlatformViewController = NSViewController public typealias PlatformHostingController = NSHostingController public typealias PlatformHostingView = NSHostingView #elseif canImport(UIKit) -public import UIKit public typealias PlatformColor = UIColor public typealias PlatformImage = UIImage public typealias PlatformView = UIView diff --git a/Example/Shared/Integration/Hosting/CAHostingLayerExample.swift b/Example/Shared/Integration/Hosting/CAHostingLayerExample.swift index 1be1e86e8..797c5cd33 100644 --- a/Example/Shared/Integration/Hosting/CAHostingLayerExample.swift +++ b/Example/Shared/Integration/Hosting/CAHostingLayerExample.swift @@ -18,12 +18,6 @@ import QuartzCore -#if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit -#elseif canImport(UIKit) -import UIKit -#endif - #if !OPENSWIFTUI @available(iOS 18.0, macOS 15.0, *) #endif diff --git a/Example/Shared/Integration/Representable/ColorRepresentableExample.swift b/Example/Shared/Integration/Representable/ColorRepresentableExample.swift index 4b8ddf540..d9cdb86e4 100644 --- a/Example/Shared/Integration/Representable/ColorRepresentableExample.swift +++ b/Example/Shared/Integration/Representable/ColorRepresentableExample.swift @@ -9,11 +9,9 @@ import SwiftUI #endif #if os(iOS) || os(visionOS) -import UIKit typealias PlatformViewRepresentable = UIViewRepresentable typealias PlatformViewControllerRepresentable = UIViewControllerRepresentable #elseif os(macOS) -import AppKit typealias PlatformViewRepresentable = NSViewRepresentable typealias PlatformViewControllerRepresentable = NSViewControllerRepresentable #endif diff --git a/Example/Shared/View/Image/ImageConversionsExample.swift b/Example/Shared/View/Image/ImageConversionsExample.swift index 3ee891891..01f62080a 100644 --- a/Example/Shared/View/Image/ImageConversionsExample.swift +++ b/Example/Shared/View/Image/ImageConversionsExample.swift @@ -8,12 +8,6 @@ import OpenSwiftUI import SwiftUI #endif -#if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit -#elseif canImport(UIKit) -import UIKit -#endif - struct ImageConversionsExample: View { var body: some View { HStack(spacing: 0) { diff --git a/Example/Shared/View/Text/FontPlayground.swift b/Example/Shared/View/Text/FontPlayground.swift index 001fa916c..dbb0f00b9 100644 --- a/Example/Shared/View/Text/FontPlayground.swift +++ b/Example/Shared/View/Text/FontPlayground.swift @@ -9,9 +9,6 @@ import OpenSwiftUI #else import SwiftUI #endif -#if canImport(UIKit) -import UIKit -#endif // Examples adapted from “SwiftUI under the Hood: Fonts”: // https://movingparts.io/fonts-in-swiftui diff --git a/Example/TestingHost/TestingHostApp.swift b/Example/TestingHost/TestingHostApp.swift index 18fa5fa2e..31806c6de 100644 --- a/Example/TestingHost/TestingHostApp.swift +++ b/Example/TestingHost/TestingHostApp.swift @@ -8,12 +8,6 @@ import OpenSwiftUI import SwiftUI #endif -#if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit -#else -import UIKit -#endif - @main struct TestingHostApp: App { #if canImport(AppKit) && !targetEnvironment(macCatalyst) diff --git a/Example/Tests/OpenSwiftUIInteractionTests/InteractionTests/InteractionTestHost.swift b/Example/Tests/OpenSwiftUIInteractionTests/InteractionTests/InteractionTestHost.swift index fe24091fb..aed56eb2b 100644 --- a/Example/Tests/OpenSwiftUIInteractionTests/InteractionTests/InteractionTestHost.swift +++ b/Example/Tests/OpenSwiftUIInteractionTests/InteractionTests/InteractionTestHost.swift @@ -2,11 +2,6 @@ // InteractionTestHost.swift // OpenSwiftUIInteractionTests -#if os(macOS) -import AppKit -#elseif os(iOS) -import UIKit -#endif import Foundation import Hammer #if OPENSWIFTUI diff --git a/Example/Tests/OpenSwiftUIUITests/Integration/Hosting/HostingViewUITests.swift b/Example/Tests/OpenSwiftUIUITests/Integration/Hosting/HostingViewUITests.swift index 3d58ebcac..24fbba61c 100644 --- a/Example/Tests/OpenSwiftUIUITests/Integration/Hosting/HostingViewUITests.swift +++ b/Example/Tests/OpenSwiftUIUITests/Integration/Hosting/HostingViewUITests.swift @@ -6,12 +6,6 @@ import Testing import TestingHost import SnapshotTesting -#if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit -#elseif canImport(UIKit) -import UIKit -#endif - @MainActor @Suite(.snapshots(record: .never, diffTool: diffTool)) struct HostingViewUITests { diff --git a/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewControllerRepresentableUITests.swift b/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewControllerRepresentableUITests.swift index 15c41ee2a..c02299b29 100644 --- a/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewControllerRepresentableUITests.swift +++ b/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewControllerRepresentableUITests.swift @@ -6,10 +6,8 @@ import Testing import SnapshotTesting #if os(iOS) || os(visionOS) -import UIKit typealias PlatformViewControllerRepresentable = UIViewControllerRepresentable #elseif os(macOS) -import AppKit typealias PlatformViewControllerRepresentable = NSViewControllerRepresentable #endif diff --git a/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewRepresentableUITests.swift b/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewRepresentableUITests.swift index e0164f8d0..68884e65b 100644 --- a/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewRepresentableUITests.swift +++ b/Example/Tests/OpenSwiftUIUITests/Integration/Representable/PlatformViewRepresentableUITests.swift @@ -6,10 +6,8 @@ import Testing import SnapshotTesting #if os(iOS) || os(visionOS) -import UIKit typealias PlatformViewRepresentable = UIViewRepresentable #elseif os(macOS) -import AppKit typealias PlatformViewRepresentable = NSViewRepresentable #endif diff --git a/Example/Tests/OpenSwiftUIUITests/UITests/AnimationDebugControllerTests.swift b/Example/Tests/OpenSwiftUIUITests/UITests/AnimationDebugControllerTests.swift index ca66428cf..71e681515 100644 --- a/Example/Tests/OpenSwiftUIUITests/UITests/AnimationDebugControllerTests.swift +++ b/Example/Tests/OpenSwiftUIUITests/UITests/AnimationDebugControllerTests.swift @@ -3,7 +3,6 @@ // OpenSwiftUIUITests #if os(macOS) -import AppKit import SnapshotTesting import Testing @testable import TestingHost diff --git a/Example/Tests/OpenSwiftUIUITests/UITests/SnapshotTesting+Testing.swift b/Example/Tests/OpenSwiftUIUITests/UITests/SnapshotTesting+Testing.swift index a6fe0ded9..282b94483 100644 --- a/Example/Tests/OpenSwiftUIUITests/UITests/SnapshotTesting+Testing.swift +++ b/Example/Tests/OpenSwiftUIUITests/UITests/SnapshotTesting+Testing.swift @@ -2,9 +2,6 @@ // SnapshotTesting+Testing.swift // OpenSwiftUIUITests -#if os(macOS) -import AppKit -#endif import Foundation import SnapshotTesting import TestingHost diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityAction.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityAction.swift index 1fd63036e..10bb277aa 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityAction.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityAction.swift @@ -8,11 +8,6 @@ import Foundation import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif // MARK: - AccessibilityAction diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityAdjustableAction.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityAdjustableAction.swift index 34dbabeab..538620bbf 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityAdjustableAction.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityAdjustableAction.swift @@ -7,9 +7,6 @@ public import OpenSwiftUICore import OpenSwiftUI_SPI -#if os(macOS) -import AppKit -#endif // MARK: - AccessibilityAdjustmentDirection diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityCoreUserSettings.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityCoreUserSettings.swift index cbf3233f0..4b11026fd 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityCoreUserSettings.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityCoreUserSettings.swift @@ -8,7 +8,6 @@ #if canImport(UIKit) import Accessibility package import OpenSwiftUICore -import UIKit extension AccessibilityCore { package enum UserSettings { diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityFocus.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityFocus.swift index c02f85da7..910761f66 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityFocus.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityFocus.swift @@ -11,7 +11,6 @@ import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore #if os(macOS) -import AppKit import COpenSwiftUI #endif diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityNode.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityNode.swift index 006063910..d500178af 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityNode.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityNode.swift @@ -13,7 +13,6 @@ import OpenSwiftUICore import struct OpenSwiftUICore.UniqueID #if canImport(UIKit) -import UIKit typealias AccessibilityNodeBase = UIResponder #else typealias AccessibilityNodeBase = NSObject diff --git a/Sources/OpenSwiftUI/Accessibility/AccessibilityRotorEntryRange.swift b/Sources/OpenSwiftUI/Accessibility/AccessibilityRotorEntryRange.swift index 1a16a71d1..588e0717b 100644 --- a/Sources/OpenSwiftUI/Accessibility/AccessibilityRotorEntryRange.swift +++ b/Sources/OpenSwiftUI/Accessibility/AccessibilityRotorEntryRange.swift @@ -6,9 +6,6 @@ // Status: WIP (TBA) import Foundation -#if canImport(UIKit) -import UIKit -#endif // MARK: - AccessibilityRotorEntryRange [TBA] diff --git a/Sources/OpenSwiftUI/Accessibility/Platform/AppKitAccessibility.swift b/Sources/OpenSwiftUI/Accessibility/Platform/AppKitAccessibility.swift index c96b096f4..35ef5e1c3 100644 --- a/Sources/OpenSwiftUI/Accessibility/Platform/AppKitAccessibility.swift +++ b/Sources/OpenSwiftUI/Accessibility/Platform/AppKitAccessibility.swift @@ -7,7 +7,6 @@ // ID: F9F3632E7F7BE116C99E79BEEDA2329B (SwiftUI) #if os(macOS) -public import AppKit import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Accessibility/Platform/UIKitAccessibility.swift b/Sources/OpenSwiftUI/Accessibility/Platform/UIKitAccessibility.swift index 490c98cf7..84feebf49 100644 --- a/Sources/OpenSwiftUI/Accessibility/Platform/UIKitAccessibility.swift +++ b/Sources/OpenSwiftUI/Accessibility/Platform/UIKitAccessibility.swift @@ -12,7 +12,6 @@ import COpenSwiftUI import OpenSwiftUICore import OpenSwiftUI_SPI import libAccessibilityPrivate -import UIKit // MARK: - UILargeContentViewerInteractionBridge [WIP] diff --git a/Sources/OpenSwiftUI/App/App/App.swift b/Sources/OpenSwiftUI/App/App/App.swift index d550a792a..66e777711 100644 --- a/Sources/OpenSwiftUI/App/App/App.swift +++ b/Sources/OpenSwiftUI/App/App/App.swift @@ -190,12 +190,10 @@ func applyAppRootModifier(_ view: AnyView) -> AnyView { // MARK: - Platform implementation #if os(iOS) || os(visionOS) -import UIKit typealias DelegateBaseClass = UIResponder typealias PlatformApplication = UIApplication typealias PlatformApplicationDelegate = UIApplicationDelegate #elseif os(macOS) -import AppKit typealias DelegateBaseClass = NSResponder typealias PlatformApplication = NSApplication typealias PlatformApplicationDelegate = NSApplicationDelegate diff --git a/Sources/OpenSwiftUI/App/App/AppKit/AppKitApp.swift b/Sources/OpenSwiftUI/App/App/AppKit/AppKitApp.swift index e432339df..b4ab1a349 100644 --- a/Sources/OpenSwiftUI/App/App/AppKit/AppKitApp.swift +++ b/Sources/OpenSwiftUI/App/App/AppKit/AppKitApp.swift @@ -9,7 +9,6 @@ @_spi(ForOpenSwiftUIOnly) @_spi(Private) import OpenSwiftUICore -import AppKit // MARK: - runApp diff --git a/Sources/OpenSwiftUI/App/App/AppKit/AppKitAppDelegate.swift b/Sources/OpenSwiftUI/App/App/AppKit/AppKitAppDelegate.swift index 70106f5eb..6baad7fe2 100644 --- a/Sources/OpenSwiftUI/App/App/AppKit/AppKitAppDelegate.swift +++ b/Sources/OpenSwiftUI/App/App/AppKit/AppKitAppDelegate.swift @@ -7,7 +7,6 @@ // ID: CD9513E1DBF2FF41775224EE6D5A7974 (SwiftUI) #if os(macOS) -import AppKit class AppDelegate: NSResponder, NSApplicationDelegate { var graph: AppGraph diff --git a/Sources/OpenSwiftUI/App/App/AppKit/AppWindowsController.swift b/Sources/OpenSwiftUI/App/App/AppKit/AppWindowsController.swift index 0c3188848..64b8a011a 100644 --- a/Sources/OpenSwiftUI/App/App/AppKit/AppWindowsController.swift +++ b/Sources/OpenSwiftUI/App/App/AppKit/AppWindowsController.swift @@ -7,7 +7,6 @@ // ID: 72F61A03E62F0A97E0761B990CF02152 (SwiftUI) #if os(macOS) -import AppKit import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/App/App/AppKit/NSApplicationDelegateAdaptor.swift b/Sources/OpenSwiftUI/App/App/AppKit/NSApplicationDelegateAdaptor.swift index c3264a852..8408d80e0 100644 --- a/Sources/OpenSwiftUI/App/App/AppKit/NSApplicationDelegateAdaptor.swift +++ b/Sources/OpenSwiftUI/App/App/AppKit/NSApplicationDelegateAdaptor.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -public import AppKit @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore #if OPENSWIFTUI_OPENCOMBINE diff --git a/Sources/OpenSwiftUI/App/App/LaunchTestSupport.swift b/Sources/OpenSwiftUI/App/App/LaunchTestSupport.swift index a47ec2453..081450ce5 100644 --- a/Sources/OpenSwiftUI/App/App/LaunchTestSupport.swift +++ b/Sources/OpenSwiftUI/App/App/LaunchTestSupport.swift @@ -6,12 +6,6 @@ // Status: Complete // ID: 71E21E30634D2453CAA80C5CA9EF3E2C (SwiftUI) -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) @_spi(Private) diff --git a/Sources/OpenSwiftUI/App/App/UIKit/UIApplicationDelegateAdaptor.swift b/Sources/OpenSwiftUI/App/App/UIKit/UIApplicationDelegateAdaptor.swift index 9158b5931..064c5bca8 100644 --- a/Sources/OpenSwiftUI/App/App/UIKit/UIApplicationDelegateAdaptor.swift +++ b/Sources/OpenSwiftUI/App/App/UIKit/UIApplicationDelegateAdaptor.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(iOS) || os(visionOS) -public import UIKit @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore #if OPENSWIFTUI_OPENCOMBINE diff --git a/Sources/OpenSwiftUI/App/App/UIKit/UIKitApp.swift b/Sources/OpenSwiftUI/App/App/UIKit/UIKitApp.swift index 7d949113a..15a731b6e 100644 --- a/Sources/OpenSwiftUI/App/App/UIKit/UIKitApp.swift +++ b/Sources/OpenSwiftUI/App/App/UIKit/UIKitApp.swift @@ -10,7 +10,6 @@ @_spi(ForOpenSwiftUIOnly) @_spi(Private) import OpenSwiftUICore -import UIKit // MARK: - runApp diff --git a/Sources/OpenSwiftUI/App/App/UIKit/UIKitAppDelegate.swift b/Sources/OpenSwiftUI/App/App/UIKit/UIKitAppDelegate.swift index 4ca5d41fa..eca5e25b1 100644 --- a/Sources/OpenSwiftUI/App/App/UIKit/UIKitAppDelegate.swift +++ b/Sources/OpenSwiftUI/App/App/UIKit/UIKitAppDelegate.swift @@ -11,7 +11,6 @@ import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) package import OpenSwiftUICore -public import UIKit #if OPENSWIFTUI_OPENCOMBINE import OpenCombine #else diff --git a/Sources/OpenSwiftUI/App/App/UIKit/UIKitMainMenuController.swift b/Sources/OpenSwiftUI/App/App/UIKit/UIKitMainMenuController.swift index b5d8a6a7e..4c8edaa08 100644 --- a/Sources/OpenSwiftUI/App/App/UIKit/UIKitMainMenuController.swift +++ b/Sources/OpenSwiftUI/App/App/UIKit/UIKitMainMenuController.swift @@ -7,7 +7,6 @@ // ID: B619265B3CBBC7F42E2392FC185432F2 (SwiftUI) #if os(iOS) || os(visionOS) -import UIKit // TODO class UIKitMainMenuController { diff --git a/Sources/OpenSwiftUI/App/Document/UIKit/DocumentBrowserViewController.swift b/Sources/OpenSwiftUI/App/Document/UIKit/DocumentBrowserViewController.swift index 8c883b431..a41cb0691 100644 --- a/Sources/OpenSwiftUI/App/Document/UIKit/DocumentBrowserViewController.swift +++ b/Sources/OpenSwiftUI/App/Document/UIKit/DocumentBrowserViewController.swift @@ -6,8 +6,6 @@ #if os(iOS) || os(visionOS) -import UIKit - // MARK: - DocumentBrowserViewController [WIP] // TODO diff --git a/Sources/OpenSwiftUI/App/Scene/SceneBridge.swift b/Sources/OpenSwiftUI/App/Scene/SceneBridge.swift index 3df50f790..b3e0cd668 100644 --- a/Sources/OpenSwiftUI/App/Scene/SceneBridge.swift +++ b/Sources/OpenSwiftUI/App/Scene/SceneBridge.swift @@ -8,11 +8,6 @@ // TODO: Add test case and verify [Q] #if canImport(Darwin) -#if os(iOS) || os(visionOS) -public import UIKit -#elseif os(macOS) -public import AppKit -#endif #if OPENSWIFTUI_OPENCOMBINE import OpenCombine #else diff --git a/Sources/OpenSwiftUI/App/Scene/UIKit/UIKitSceneConnectionOption.swift b/Sources/OpenSwiftUI/App/Scene/UIKit/UIKitSceneConnectionOption.swift index b913f9d6f..329a0aa02 100644 --- a/Sources/OpenSwiftUI/App/Scene/UIKit/UIKitSceneConnectionOption.swift +++ b/Sources/OpenSwiftUI/App/Scene/UIKit/UIKitSceneConnectionOption.swift @@ -10,7 +10,6 @@ import OpenAttributeGraphShims @_spi(Private) import OpenSwiftUICore -import UIKit // FIXME: UIKit private Swift API diff --git a/Sources/OpenSwiftUI/Data/Environment/Environment+UITraitKey.swift b/Sources/OpenSwiftUI/Data/Environment/Environment+UITraitKey.swift index b4ff12a6f..a093acfea 100644 --- a/Sources/OpenSwiftUI/Data/Environment/Environment+UITraitKey.swift +++ b/Sources/OpenSwiftUI/Data/Environment/Environment+UITraitKey.swift @@ -9,7 +9,6 @@ #if canImport(UIKit) public import OpenSwiftUICore -public import UIKit /// An environment key that is bridged to a UIKit trait. /// diff --git a/Sources/OpenSwiftUI/Data/Environment/PlatformEnvironment.swift b/Sources/OpenSwiftUI/Data/Environment/PlatformEnvironment.swift index f90898f8e..fed7b0efd 100644 --- a/Sources/OpenSwiftUI/Data/Environment/PlatformEnvironment.swift +++ b/Sources/OpenSwiftUI/Data/Environment/PlatformEnvironment.swift @@ -10,10 +10,8 @@ import COpenSwiftUI import OpenSwiftUICore import UIFoundation_Private #if os(iOS) || os(visionOS) -import UIKit typealias TraitCollection = UITraitCollection #elseif os(macOS) -import AppKit typealias TraitCollection = Void #else typealias TraitCollection = Void diff --git a/Sources/OpenSwiftUI/Data/Environment/UIKitEnvironment.swift b/Sources/OpenSwiftUI/Data/Environment/UIKitEnvironment.swift index 88b0e2a13..c1fd875a0 100644 --- a/Sources/OpenSwiftUI/Data/Environment/UIKitEnvironment.swift +++ b/Sources/OpenSwiftUI/Data/Environment/UIKitEnvironment.swift @@ -11,7 +11,6 @@ import COpenSwiftUI @_spi(ClarityBoard) @_spi(Private) package import OpenSwiftUICore -package import UIKit private struct BridgedEnvironmentKeysKey: EnvironmentKey { static let defaultValue: [any UITraitBridgedEnvironmentKey.Type] = [] diff --git a/Sources/OpenSwiftUI/Event/Focus/DefaultFocus.swift b/Sources/OpenSwiftUI/Event/Focus/DefaultFocus.swift index 3ba39e7b5..bc71e6cf6 100644 --- a/Sources/OpenSwiftUI/Event/Focus/DefaultFocus.swift +++ b/Sources/OpenSwiftUI/Event/Focus/DefaultFocus.swift @@ -10,11 +10,6 @@ import Foundation import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif // MARK: - View + DefaultFocus diff --git a/Sources/OpenSwiftUI/Event/Focus/FirstResponderObserver.swift b/Sources/OpenSwiftUI/Event/Focus/FirstResponderObserver.swift index 55b306e41..df2eecaed 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FirstResponderObserver.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FirstResponderObserver.swift @@ -7,7 +7,6 @@ // ID: C46338C7764E4E02DFE8CA9F275E0662 (SwiftUI) #if os(macOS) -import AppKit import OpenSwiftUICore private var observerKey: UInt8 = 0 diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusBridge.swift b/Sources/OpenSwiftUI/Event/Focus/FocusBridge.swift index 55972c97d..f7ae3f8c5 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusBridge.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusBridge.swift @@ -8,11 +8,6 @@ @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore import COpenSwiftUI -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif // MARK: - FocusHost diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusEffectDelegate.swift b/Sources/OpenSwiftUI/Event/Focus/FocusEffectDelegate.swift index 4a8d18171..9c1ee52ed 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusEffectDelegate.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusEffectDelegate.swift @@ -7,7 +7,6 @@ // ID: 8C909BE7747C720C6B9D560863FD7609 (SwiftUI) #if os(macOS) -import AppKit import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusEffectView.swift b/Sources/OpenSwiftUI/Event/Focus/FocusEffectView.swift index 64d8e1cd0..7d2937c8d 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusEffectView.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusEffectView.swift @@ -7,7 +7,6 @@ // ID: B9E8471D77A01696E0731B43A95A9346 (SwiftUI) #if os(macOS) -import AppKit import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusItem.swift b/Sources/OpenSwiftUI/Event/Focus/FocusItem.swift index 1f404ead4..de6d77391 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusItem.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusItem.swift @@ -10,11 +10,6 @@ import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif // MARK: - FocusItem diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusNavigator.swift b/Sources/OpenSwiftUI/Event/Focus/FocusNavigator.swift index e1e059fda..333eb4f07 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusNavigator.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusNavigator.swift @@ -7,7 +7,6 @@ // ID: 3CB6EB205666430ABD7FC458DE8E3793 (SwiftUI) #if os(macOS) -import AppKit import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusResponder.swift b/Sources/OpenSwiftUI/Event/Focus/FocusResponder.swift index 1c0b204ed..3a6a692e0 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusResponder.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusResponder.swift @@ -9,12 +9,6 @@ import Foundation @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - #if os(iOS) || os(visionOS) typealias PlatformFocusItem = any UIFocusItem #else diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusRingHelper.swift b/Sources/OpenSwiftUI/Event/Focus/FocusRingHelper.swift index 4ab8e5091..395935ca6 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusRingHelper.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusRingHelper.swift @@ -7,7 +7,6 @@ // ID: 1E6F543B2B96E8B73646864D883C37DC (SwiftUI) #if os(macOS) -import AppKit @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusRingNSButton.swift b/Sources/OpenSwiftUI/Event/Focus/FocusRingNSButton.swift index b18ffb459..b951fdfc8 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusRingNSButton.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusRingNSButton.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -import AppKit import COpenSwiftUI // MARK: - FocusRingNSButton diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusSection.swift b/Sources/OpenSwiftUI/Event/Focus/FocusSection.swift index 85fc20f5a..b2c87ad3e 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusSection.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusSection.swift @@ -11,12 +11,6 @@ import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - // MARK: - FocusSectionResponder class FocusSectionResponder: DefaultLayoutViewResponder, BaseFocusResponder { diff --git a/Sources/OpenSwiftUI/Event/Focus/FocusViewGraph.swift b/Sources/OpenSwiftUI/Event/Focus/FocusViewGraph.swift index 6c916d6d1..ed84e46b0 100644 --- a/Sources/OpenSwiftUI/Event/Focus/FocusViewGraph.swift +++ b/Sources/OpenSwiftUI/Event/Focus/FocusViewGraph.swift @@ -9,9 +9,6 @@ import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#endif // MARK: - Focus System Inputs diff --git a/Sources/OpenSwiftUI/Event/Focus/Focusable.swift b/Sources/OpenSwiftUI/Event/Focus/Focusable.swift index 956abd119..aa2b50c73 100644 --- a/Sources/OpenSwiftUI/Event/Focus/Focusable.swift +++ b/Sources/OpenSwiftUI/Event/Focus/Focusable.swift @@ -13,12 +13,6 @@ import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - // MARK: - View + Focus extension View { diff --git a/Sources/OpenSwiftUI/Event/Focus/KeyViewProxy.swift b/Sources/OpenSwiftUI/Event/Focus/KeyViewProxy.swift index 1ab81ba6f..03c1dc5f7 100644 --- a/Sources/OpenSwiftUI/Event/Focus/KeyViewProxy.swift +++ b/Sources/OpenSwiftUI/Event/Focus/KeyViewProxy.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -import AppKit import COpenSwiftUI import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Focus/UIKitHostContainerFocusItemInput.swift b/Sources/OpenSwiftUI/Event/Focus/UIKitHostContainerFocusItemInput.swift index 0b0f92de7..ddda2b472 100644 --- a/Sources/OpenSwiftUI/Event/Focus/UIKitHostContainerFocusItemInput.swift +++ b/Sources/OpenSwiftUI/Event/Focus/UIKitHostContainerFocusItemInput.swift @@ -11,7 +11,6 @@ import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - AnyUIKitHostedFocusItemResponder diff --git a/Sources/OpenSwiftUI/Event/HitTest/HitTestingDebug.swift b/Sources/OpenSwiftUI/Event/HitTest/HitTestingDebug.swift index 11e14926b..b36c94cba 100644 --- a/Sources/OpenSwiftUI/Event/HitTest/HitTestingDebug.swift +++ b/Sources/OpenSwiftUI/Event/HitTest/HitTestingDebug.swift @@ -54,7 +54,6 @@ private struct HitTestTrace where Value: HitTestTracing { } #if os(iOS) || os(visionOS) -import UIKit // MARK: - UIView + HitTestTracing @@ -118,7 +117,6 @@ extension UIView: HitTestTracing { } } #elseif os(macOS) -import AppKit // MARK: - NSView + HitTestTracing diff --git a/Sources/OpenSwiftUI/Event/HitTest/HitTestingSupport.swift b/Sources/OpenSwiftUI/Event/HitTest/HitTestingSupport.swift index 514b5789a..f886b0848 100644 --- a/Sources/OpenSwiftUI/Event/HitTest/HitTestingSupport.swift +++ b/Sources/OpenSwiftUI/Event/HitTest/HitTestingSupport.swift @@ -11,11 +11,6 @@ import COpenSwiftUI @_spi(DisplayList_ViewSystem) @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(macOS) -import AppKit -#elseif os(iOS) || os(visionOS) -import UIKit -#endif // MARK: - RecursiveIgnoreHitTestCustomizing diff --git a/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitGestureRecognizer.swift b/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitGestureRecognizer.swift index b39acfde1..f7f76b444 100644 --- a/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitGestureRecognizer.swift +++ b/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitGestureRecognizer.swift @@ -7,7 +7,6 @@ // ID: 25FE44535476195900B7BAAA6C5B48FF (SwiftUI) #if os(macOS) -import AppKit import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitKeyEventConversions.swift b/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitKeyEventConversions.swift index b15f9b760..26a688236 100644 --- a/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitKeyEventConversions.swift +++ b/Sources/OpenSwiftUI/Event/Platform/AppKit/AppKitKeyEventConversions.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -import AppKit @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Platform/AppKit/NSViewResponder.swift b/Sources/OpenSwiftUI/Event/Platform/AppKit/NSViewResponder.swift index 8cb8c70a4..c05bb8f3f 100644 --- a/Sources/OpenSwiftUI/Event/Platform/AppKit/NSViewResponder.swift +++ b/Sources/OpenSwiftUI/Event/Platform/AppKit/NSViewResponder.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -import AppKit @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/CurrentEventProvider.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/CurrentEventProvider.swift index 3f4bd9e34..983db9239 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/CurrentEventProvider.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/CurrentEventProvider.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(iOS) || os(visionOS) -import UIKit protocol CurrentEventProvider { var currentEvent: UIEvent? { get } diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/ScrollEventConverter.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/ScrollEventConverter.swift index 64773dcca..d34e0bddb 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/ScrollEventConverter.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/ScrollEventConverter.swift @@ -9,7 +9,6 @@ import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - ScrollEventConverter diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitEventBindingBridge.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitEventBindingBridge.swift index c3e63c767..3dac8182e 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitEventBindingBridge.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitEventBindingBridge.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIKitEventBindingBridge diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureContainer.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureContainer.swift index c42e832f2..aa6b01b7f 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureContainer.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureContainer.swift @@ -11,7 +11,6 @@ import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIKitGestureContainer diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureRecognizer.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureRecognizer.swift index c936fa89a..fb9a1e912 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureRecognizer.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureRecognizer.swift @@ -10,7 +10,6 @@ import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIKitGestureRecognizer diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureUtilities.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureUtilities.swift index 196945063..a494b14a4 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureUtilities.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitGestureUtilities.swift @@ -7,7 +7,6 @@ #if os(iOS) || os(visionOS) import COpenSwiftUI -import UIKit @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitHoverGestureRecognizer.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitHoverGestureRecognizer.swift index 4ccd5f42e..fe04e64f9 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitHoverGestureRecognizer.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitHoverGestureRecognizer.swift @@ -9,7 +9,6 @@ import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIKitHoverGestureRecognizer diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyEventConversions.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyEventConversions.swift index 196767d95..577cf5315 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyEventConversions.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyEventConversions.swift @@ -10,7 +10,6 @@ @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIPress + KeyEventProvider diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyPressResponder.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyPressResponder.swift index c9faa31ea..46c3060e3 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyPressResponder.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitKeyPressResponder.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIKitKeyPressResponder diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitRelationshipGestureRecognizer.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitRelationshipGestureRecognizer.swift index 3ff48e744..a9e7a57cd 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitRelationshipGestureRecognizer.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitRelationshipGestureRecognizer.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(iOS) || os(visionOS) -import UIKit // MARK: - UIKitRelationshipGestureRecognizer diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderEventBindingBridge.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderEventBindingBridge.swift index 7865c07bc..7fc2d81f0 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderEventBindingBridge.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderEventBindingBridge.swift @@ -9,7 +9,6 @@ #if os(iOS) || os(visionOS) @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - UIKitResponderEventBindingBridge diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderGestureRecognizer.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderGestureRecognizer.swift index 5f86ed5ca..84c5c3495 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderGestureRecognizer.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIKitResponderGestureRecognizer.swift @@ -11,7 +11,6 @@ import COpenSwiftUI import Foundation @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit private let isUIKitGestureDebuggingEnabled = UserDefaults.uiKit?.bool(forKey: "LogGesture") ?? false diff --git a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIViewResponder.swift b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIViewResponder.swift index 651a5c673..3d5b0fe87 100644 --- a/Sources/OpenSwiftUI/Event/Platform/UIKit/UIViewResponder.swift +++ b/Sources/OpenSwiftUI/Event/Platform/UIKit/UIViewResponder.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit class UIViewResponder: PlatformViewResponderBase { weak var focusAccessibilityNode: AccessibilityNode? diff --git a/Sources/OpenSwiftUI/Event/Responder/PlatformViewResponderBase.swift b/Sources/OpenSwiftUI/Event/Responder/PlatformViewResponderBase.swift index 471a4e6bd..986690bab 100644 --- a/Sources/OpenSwiftUI/Event/Responder/PlatformViewResponderBase.swift +++ b/Sources/OpenSwiftUI/Event/Responder/PlatformViewResponderBase.swift @@ -9,11 +9,6 @@ import Foundation @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(macOS) && !targetEnvironment(macCatalyst) -import AppKit -#elseif os(iOS) || os(visionOS) -import UIKit -#endif class PlatformViewResponderBase: ViewResponder { weak var hostView: PlatformView? diff --git a/Sources/OpenSwiftUI/Graphic/Color/KitAccentColorProvider.swift b/Sources/OpenSwiftUI/Graphic/Color/KitAccentColorProvider.swift index e61aa5bf5..8f7389328 100644 --- a/Sources/OpenSwiftUI/Graphic/Color/KitAccentColorProvider.swift +++ b/Sources/OpenSwiftUI/Graphic/Color/KitAccentColorProvider.swift @@ -13,7 +13,6 @@ private func NSUserAccentHasHardwareColor() -> Bool @_silgen_name("NSUserAccentColorGetHardwareAccentColorName") private func NSUserAccentColorGetHardwareAccentColorName() -> NSString? -import AppKit import Foundation import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Graphic/Color/KitCoreUINamedColorProvider.swift b/Sources/OpenSwiftUI/Graphic/Color/KitCoreUINamedColorProvider.swift index 2adc88dad..cc5dfe46a 100644 --- a/Sources/OpenSwiftUI/Graphic/Color/KitCoreUINamedColorProvider.swift +++ b/Sources/OpenSwiftUI/Graphic/Color/KitCoreUINamedColorProvider.swift @@ -8,11 +8,6 @@ import CoreUI import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif struct KitCoreUINamedColorProvider: CoreUINamedColorProvider { static func effectiveCGColor(cuiColor: CUINamedColor, in environment: EnvironmentValues) -> CGColor? { diff --git a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitAppearanceConversions.swift b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitAppearanceConversions.swift index 0b2dfb84e..0822e893d 100644 --- a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitAppearanceConversions.swift +++ b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitAppearanceConversions.swift @@ -7,7 +7,6 @@ #if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit import COpenSwiftUI // MARK: - NSAppearance Conversions [6.5.4] diff --git a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift index 4c9a62701..890f97e87 100644 --- a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift +++ b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitColorConversions.swift @@ -9,7 +9,6 @@ #if canImport(AppKit) && !targetEnvironment(macCatalyst) public import OpenSwiftUICore -public import AppKit import COpenSwiftUI // MARK: - NSColor Conversions diff --git a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitConversions.swift b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitConversions.swift index b6310ecc2..b81c46ae3 100644 --- a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitConversions.swift +++ b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitConversions.swift @@ -6,7 +6,6 @@ // Status: WIP #if canImport(AppKit) -import AppKit import OpenSwiftUICore // MARK: - ControlSize Conversions diff --git a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitViewEnvironment.swift b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitViewEnvironment.swift index 2810b4279..4634bebb9 100644 --- a/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitViewEnvironment.swift +++ b/Sources/OpenSwiftUI/Integration/Graphic/AppKit/AppKitViewEnvironment.swift @@ -6,7 +6,6 @@ // Status: TBA #if os(macOS) -import AppKit import COpenSwiftUI import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Integration/Graphic/UIKit/UIKitConversions.swift b/Sources/OpenSwiftUI/Integration/Graphic/UIKit/UIKitConversions.swift index e574e45cf..d2170ff60 100644 --- a/Sources/OpenSwiftUI/Integration/Graphic/UIKit/UIKitConversions.swift +++ b/Sources/OpenSwiftUI/Integration/Graphic/UIKit/UIKitConversions.swift @@ -9,7 +9,6 @@ #if canImport(UIKit) public import OpenSwiftUICore -public import UIKit import COpenSwiftUI // MARK: - UIRectEdge Conversions diff --git a/Sources/OpenSwiftUI/Integration/Hosting/AppKit/Controller/NSHostingController.swift b/Sources/OpenSwiftUI/Integration/Hosting/AppKit/Controller/NSHostingController.swift index 4a6ffcb98..e7974a353 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/AppKit/Controller/NSHostingController.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/AppKit/Controller/NSHostingController.swift @@ -7,8 +7,6 @@ #if os(macOS) -public import AppKit - /// An AppKit view controller that hosts OpenSwiftUI view hierarchy. /// /// Create an `NSHostingController` object when you want to integrate OpenSwiftUI diff --git a/Sources/OpenSwiftUI/Integration/Hosting/AppKit/View/NSHostingView.swift b/Sources/OpenSwiftUI/Integration/Hosting/AppKit/View/NSHostingView.swift index 5f228d5ea..cd767bef3 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/AppKit/View/NSHostingView.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/AppKit/View/NSHostingView.swift @@ -10,7 +10,6 @@ @_spi(ForOpenSwiftUIOnly) @_spi(Private) public import OpenSwiftUICore -public import AppKit import OpenSwiftUI_SPI import COpenSwiftUI diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIHostingController.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIHostingController.swift index aac2fb531..fe14b1cfc 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIHostingController.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIHostingController.swift @@ -1,5 +1,4 @@ #if os(iOS) || os(visionOS) -public import UIKit @available(macOS, unavailable) @available(watchOS, unavailable) diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIViewControllerProvider.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIViewControllerProvider.swift index 5bbd4332a..3587d4421 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIViewControllerProvider.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/Controller/UIViewControllerProvider.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(iOS) || os(visionOS) -public import UIKit import COpenSwiftUI // MARK: - UIViewControllerProvider diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/UIHostingViewable.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/UIHostingViewable.swift index b020dca09..3b37d43ea 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/UIHostingViewable.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/UIHostingViewable.swift @@ -7,7 +7,6 @@ #if os(iOS) || os(visionOS) public import Foundation -import UIKit /// Abstract the bits UV needs to know about UIHostingController so it doesn't /// need to rely on UIHostingController existing in the SDK, which it can't in diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView+Extension.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView+Extension.swift index bc14740ea..058838de5 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView+Extension.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView+Extension.swift @@ -6,7 +6,6 @@ // Status: WIP #if os(iOS) || os(visionOS) -public import UIKit @_spi(ForOpenSwiftUIOnly) @_spi(Private) public import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift index 742e06162..265676d86 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingView.swift @@ -7,7 +7,6 @@ // ID: FAF0B683EB49BE9BABC9009857940A1E (SwiftUI) #if os(iOS) || os(visionOS) -public import UIKit import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) @_spi(Private) diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift index 80a54bfe6..434df4f7b 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewBase.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) package import QuartzCore -package import UIKit import COpenSwiftUI import OpenAttributeGraphShims diff --git a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewDebugLayer.swift b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewDebugLayer.swift index 739bbfdd7..8c96989b5 100644 --- a/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewDebugLayer.swift +++ b/Sources/OpenSwiftUI/Integration/Hosting/UIKit/View/UIHostingViewDebugLayer.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(iOS) || os(visionOS) -import UIKit final class UIHostingViewDebugLayer: CALayer { required init?(coder: NSCoder) { diff --git a/Sources/OpenSwiftUI/Integration/PlatformItemList/PlatformItemList.swift b/Sources/OpenSwiftUI/Integration/PlatformItemList/PlatformItemList.swift index cf666c0e2..e05fb74a6 100644 --- a/Sources/OpenSwiftUI/Integration/PlatformItemList/PlatformItemList.swift +++ b/Sources/OpenSwiftUI/Integration/PlatformItemList/PlatformItemList.swift @@ -7,9 +7,6 @@ // ID: CE84B1BFBEAEAB6361605407E54625A3 (SwiftUI) import Foundation -#if os(macOS) -import AppKit -#endif import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) @_spi(Private) diff --git a/Sources/OpenSwiftUI/Integration/PlatformItemList/WidgetAuxiliaryViewMetadata.swift b/Sources/OpenSwiftUI/Integration/PlatformItemList/WidgetAuxiliaryViewMetadata.swift index 6aec91117..24fe7dcb9 100644 --- a/Sources/OpenSwiftUI/Integration/PlatformItemList/WidgetAuxiliaryViewMetadata.swift +++ b/Sources/OpenSwiftUI/Integration/PlatformItemList/WidgetAuxiliaryViewMetadata.swift @@ -13,11 +13,6 @@ import UIFoundation_Private @_spi(ForOpenSwiftUIOnly) @_spi(Private) import OpenSwiftUICore -#if canImport(AppKit) && !targetEnvironment(macCatalyst) -public import AppKit -#elseif canImport(UIKit) -public import UIKit -#endif // MARK: - WidgetAuxiliaryViewMetadata [WIP] diff --git a/Sources/OpenSwiftUI/Integration/PreviewShims.swift b/Sources/OpenSwiftUI/Integration/PreviewShims.swift index 07516f589..d16af081d 100644 --- a/Sources/OpenSwiftUI/Integration/PreviewShims.swift +++ b/Sources/OpenSwiftUI/Integration/PreviewShims.swift @@ -8,7 +8,6 @@ import OpenSwiftUICore #if canImport(AppKit) && !targetEnvironment(macCatalyst) -public import AppKit extension OpenSwiftUI.View { @available(*, deprecated, message: "Use the OpenSwiftUI #Preview macro or PreviewProvider instead.") public func _previewVC() -> NSViewController { @@ -16,7 +15,6 @@ extension OpenSwiftUI.View { } } #elseif canImport(UIKit) -public import UIKit extension OpenSwiftUI.View { @available(*, deprecated, message: "Use the OpenSwiftUI #Preview macro or PreviewProvider instead.") public func _previewVC() -> UIViewController { diff --git a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift index 199147f7e..df5ca987b 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewControllerRepresentable.swift @@ -8,7 +8,6 @@ #if os(macOS) -public import AppKit public import OpenSwiftUICore import OpenAttributeGraphShims diff --git a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift index 458393e38..0fa4aee19 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/AppKit/NSViewRepresentable.swift @@ -8,7 +8,6 @@ #if os(macOS) -public import AppKit public import OpenSwiftUICore import OpenAttributeGraphShims diff --git a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformView+SafeArea.swift b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformView+SafeArea.swift index 10a591a95..901fa3765 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformView+SafeArea.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformView+SafeArea.swift @@ -16,10 +16,8 @@ protocol SafeAreaHelperDelegate: AnyObject { } #if os(iOS) || os(visionOS) -import UIKit typealias PlatformEdgeInsets = UIEdgeInsets #elseif os(macOS) -import AppKit typealias PlatformEdgeInsets = NSEdgeInsets extension NSEdgeInsets { static var zero: NSEdgeInsets { diff --git a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewHost.swift b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewHost.swift index f6610c24e..721fe5149 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewHost.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewHost.swift @@ -13,10 +13,8 @@ import COpenSwiftUI import OpenSwiftUICore #if os(iOS) || os(visionOS) -import UIKit typealias PlatformConstraintBasedLayoutHostingView = _UIConstraintBasedLayoutHostingView #elseif os(macOS) -import AppKit typealias PlatformConstraintBasedLayoutHostingView = _NSConstraintBasedLayoutHostingView #endif diff --git a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift index 2e73f8389..6d71e75a8 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/Platform/PlatformViewRepresentable.swift @@ -7,14 +7,12 @@ // ID: A513612C07DFA438E70B9FA90719B40D (SwiftUI) #if os(iOS) || os(visionOS) -import UIKit typealias PlatformView = UIView typealias PlatformScrollView = UIScrollView typealias PlatformViewController = UIViewController typealias PlatformHostingController = UIHostingController typealias PlatformViewResponder = UIViewResponder #elseif os(macOS) -import AppKit typealias PlatformView = NSView typealias PlatformScrollView = NSScrollView typealias PlatformViewController = NSViewController diff --git a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift index 91466cf81..f95763c56 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewControllerRepresentable.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) -public import UIKit public import OpenSwiftUICore import OpenAttributeGraphShims diff --git a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift index 51d56c584..51747ef4b 100644 --- a/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift +++ b/Sources/OpenSwiftUI/Integration/Representable/UIKit/UIViewRepresentable.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) -public import UIKit public import OpenSwiftUICore import OpenAttributeGraphShims diff --git a/Sources/OpenSwiftUI/Layout/Edge/EdgeInsetsConversions.swift b/Sources/OpenSwiftUI/Layout/Edge/EdgeInsetsConversions.swift index e4c2c9a20..dc901008d 100644 --- a/Sources/OpenSwiftUI/Layout/Edge/EdgeInsetsConversions.swift +++ b/Sources/OpenSwiftUI/Layout/Edge/EdgeInsetsConversions.swift @@ -8,12 +8,6 @@ #if canImport(Darwin) // MARK: - EdgeInsets + Conversion -#if canImport(UIKit) -public import UIKit -#elseif canImport(AppKit) -public import AppKit -#endif - extension EdgeInsets { /// Create edge insets from the equivalent NSDirectionalEdgeInsets. @available(watchOS, unavailable) diff --git a/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift b/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift index 1d0f87cc3..163e8789c 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/AppKitDisplayList.swift @@ -10,7 +10,6 @@ @_spi(ForOpenSwiftUIOnly) @_spi(DisplayList_ViewSystem) import OpenSwiftUICore -import AppKit #if OPENSWIFTUI_SWIFTUI_RENDERER import OpenSwiftUISymbolDualTestsSupport #endif diff --git a/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift b/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift index 60466efd4..66d81089c 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/DisplayListViewDrawing.swift @@ -13,12 +13,6 @@ import OpenSwiftUICore import QuartzCore import OpenRenderBoxShims -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - // MARK: - CGDrawingView final class CGDrawingView: PlatformGraphicsView, PlatformDrawable { diff --git a/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift b/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift index 1ec61ec32..a9c7de1c0 100644 --- a/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift +++ b/Sources/OpenSwiftUI/Render/DisplayList/UIKitDisplayList.swift @@ -9,7 +9,6 @@ #if os(iOS) || os(visionOS) import COpenSwiftUI @_spi(DisplayList_ViewSystem) import OpenSwiftUICore -import UIKit #if OPENSWIFTUI_SWIFTUI_RENDERER import OpenSwiftUISymbolDualTestsSupport #endif diff --git a/Sources/OpenSwiftUI/Test/PerformanceTest.swift b/Sources/OpenSwiftUI/Test/PerformanceTest.swift index 0e62ead38..cee5863e0 100644 --- a/Sources/OpenSwiftUI/Test/PerformanceTest.swift +++ b/Sources/OpenSwiftUI/Test/PerformanceTest.swift @@ -4,11 +4,6 @@ // // Status: Complete -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif import OpenSwiftUI_SPI // MARK: - _PerformanceTest [6.4.41] diff --git a/Sources/OpenSwiftUI/Test/TestingAppDelegate.swift b/Sources/OpenSwiftUI/Test/TestingAppDelegate.swift index ecce636c7..c61232613 100644 --- a/Sources/OpenSwiftUI/Test/TestingAppDelegate.swift +++ b/Sources/OpenSwiftUI/Test/TestingAppDelegate.swift @@ -4,12 +4,6 @@ // // Status: Complete for iOS -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - // MARK: - TestingAppDelegate [6.4.41] [iOS] class TestingAppDelegate: DelegateBaseClass, PlatformApplicationDelegate { diff --git a/Sources/OpenSwiftUI/Test/TestingSceneDelegate.swift b/Sources/OpenSwiftUI/Test/TestingSceneDelegate.swift index 1b27f6646..1d96c71ce 100644 --- a/Sources/OpenSwiftUI/Test/TestingSceneDelegate.swift +++ b/Sources/OpenSwiftUI/Test/TestingSceneDelegate.swift @@ -5,7 +5,6 @@ // Status: Complete for iOS #if os(iOS) || os(visionOS) -import UIKit // MARK: - TestingSceneDelegate [6.4.41] [iOS] diff --git a/Sources/OpenSwiftUI/Test/ViewTest.swift b/Sources/OpenSwiftUI/Test/ViewTest.swift index eb10ae035..957c2dfb3 100644 --- a/Sources/OpenSwiftUI/Test/ViewTest.swift +++ b/Sources/OpenSwiftUI/Test/ViewTest.swift @@ -8,9 +8,6 @@ public import Foundation @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -public import UIKit -#endif // MARK: - _ViewTest [6.4.41] diff --git a/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift b/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift index 7c0e08dcc..96e4239a5 100644 --- a/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift +++ b/Sources/OpenSwiftUI/Util/OpenSwiftUIGlue.swift @@ -11,11 +11,6 @@ public import OpenSwiftUICore @_spiOnly public import OpenAttributeGraphShims import COpenSwiftUI -#if os(iOS) || os(visionOS) || os(tvOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif // MARK: - OpenSwiftUIGlue diff --git a/Sources/OpenSwiftUI/View/Control/Button/AppKitButton.swift b/Sources/OpenSwiftUI/View/Control/Button/AppKitButton.swift index 98b7a2987..96e89c22c 100644 --- a/Sources/OpenSwiftUI/View/Control/Button/AppKitButton.swift +++ b/Sources/OpenSwiftUI/View/Control/Button/AppKitButton.swift @@ -7,7 +7,6 @@ // ID: 9FEBA96B0BC70E1682E82D239F242E73 (SwiftUI) #if os(macOS) -import AppKit import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) diff --git a/Sources/OpenSwiftUI/View/Control/Button/BorderedButtonStyle_CarMac.swift b/Sources/OpenSwiftUI/View/Control/Button/BorderedButtonStyle_CarMac.swift index 5ed902e3d..e12e888b3 100644 --- a/Sources/OpenSwiftUI/View/Control/Button/BorderedButtonStyle_CarMac.swift +++ b/Sources/OpenSwiftUI/View/Control/Button/BorderedButtonStyle_CarMac.swift @@ -8,9 +8,6 @@ import Foundation import OpenSwiftUICore -#if os(macOS) -import AppKit -#endif // MARK: - BorderedButtonStyle_CarMac diff --git a/Sources/OpenSwiftUI/View/Control/ProgressView/AppKitProgressView.swift b/Sources/OpenSwiftUI/View/Control/ProgressView/AppKitProgressView.swift index e497e8949..2152e60b7 100644 --- a/Sources/OpenSwiftUI/View/Control/ProgressView/AppKitProgressView.swift +++ b/Sources/OpenSwiftUI/View/Control/ProgressView/AppKitProgressView.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -import AppKit import COpenSwiftUI import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/View/Control/ProgressView/UIKitProgressView.swift b/Sources/OpenSwiftUI/View/Control/ProgressView/UIKitProgressView.swift index 417d81ae4..cee2dbc31 100644 --- a/Sources/OpenSwiftUI/View/Control/ProgressView/UIKitProgressView.swift +++ b/Sources/OpenSwiftUI/View/Control/ProgressView/UIKitProgressView.swift @@ -9,7 +9,6 @@ #if os(iOS) || os(visionOS) import COpenSwiftUI import OpenSwiftUICore -import UIKit // MARK: - LinearUIKitProgressView diff --git a/Sources/OpenSwiftUI/View/Control/SensoryFeedback/AppKit/AppKitFeedbackImplementation.swift b/Sources/OpenSwiftUI/View/Control/SensoryFeedback/AppKit/AppKitFeedbackImplementation.swift index 735aa070d..f7ccbac2a 100644 --- a/Sources/OpenSwiftUI/View/Control/SensoryFeedback/AppKit/AppKitFeedbackImplementation.swift +++ b/Sources/OpenSwiftUI/View/Control/SensoryFeedback/AppKit/AppKitFeedbackImplementation.swift @@ -6,7 +6,6 @@ // Status: Complete #if os(macOS) -import AppKit import OpenSwiftUICore // MARK: - View + platformSensoryFeedback diff --git a/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitFeedbackImplementation.swift b/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitFeedbackImplementation.swift index f1e00ccb5..42acbd43d 100644 --- a/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitFeedbackImplementation.swift +++ b/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitFeedbackImplementation.swift @@ -11,7 +11,6 @@ import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - LocationBasedSensoryFeedback diff --git a/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitSensoryFeedbackCache.swift b/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitSensoryFeedbackCache.swift index fc6ff8cc9..79cd10c23 100644 --- a/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitSensoryFeedbackCache.swift +++ b/Sources/OpenSwiftUI/View/Control/SensoryFeedback/UIKit/UIKitSensoryFeedbackCache.swift @@ -10,7 +10,6 @@ import OpenAttributeGraphShims import OpenSwiftUICore -import UIKit // MARK: - AnyUIKitSensoryFeedbackCache diff --git a/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Mac.swift b/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Mac.swift index 335ba0a8a..357b26051 100644 --- a/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Mac.swift +++ b/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Mac.swift @@ -7,7 +7,6 @@ // ID: A7473CA4D30DB9CE24790738AC72AF8E (SwiftUI) #if os(macOS) -import AppKit import COpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Phone.swift b/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Phone.swift index 2b04d982d..d4054f89c 100644 --- a/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Phone.swift +++ b/Sources/OpenSwiftUI/View/Control/Slider/SystemSliderStyle_Phone.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) import OpenSwiftUICore -import UIKit // MARK: - PlatformSliderStyle diff --git a/Sources/OpenSwiftUI/View/Control/Stepper/ArrowStepperStyle.swift b/Sources/OpenSwiftUI/View/Control/Stepper/ArrowStepperStyle.swift index 0202e2e17..422ad1c45 100644 --- a/Sources/OpenSwiftUI/View/Control/Stepper/ArrowStepperStyle.swift +++ b/Sources/OpenSwiftUI/View/Control/Stepper/ArrowStepperStyle.swift @@ -7,7 +7,6 @@ // ID: 7EDEE3BC9F04CB7860AD83774DB90346 (SwiftUI) #if os(macOS) -import AppKit import OpenSwiftUICore // MARK: - Coordinator diff --git a/Sources/OpenSwiftUI/View/Control/Stepper/SegmentedButtonStepperStyle.swift b/Sources/OpenSwiftUI/View/Control/Stepper/SegmentedButtonStepperStyle.swift index 5d2e8093f..2ea16705d 100644 --- a/Sources/OpenSwiftUI/View/Control/Stepper/SegmentedButtonStepperStyle.swift +++ b/Sources/OpenSwiftUI/View/Control/Stepper/SegmentedButtonStepperStyle.swift @@ -8,7 +8,6 @@ #if os(iOS) || os(visionOS) import OpenSwiftUICore -import UIKit // MARK: - Coordinator diff --git a/Sources/OpenSwiftUI/View/Image/NSImageConversions.swift b/Sources/OpenSwiftUI/View/Image/NSImageConversions.swift index adbb6575b..68039f1af 100644 --- a/Sources/OpenSwiftUI/View/Image/NSImageConversions.swift +++ b/Sources/OpenSwiftUI/View/Image/NSImageConversions.swift @@ -6,7 +6,6 @@ // Status: Complete #if canImport(AppKit) && !targetEnvironment(macCatalyst) -public import AppKit public import OpenSwiftUICore import OpenRenderBoxShims diff --git a/Sources/OpenSwiftUI/View/Image/PlatformImage.swift b/Sources/OpenSwiftUI/View/Image/PlatformImage.swift index d9b487ac0..a430b166a 100644 --- a/Sources/OpenSwiftUI/View/Image/PlatformImage.swift +++ b/Sources/OpenSwiftUI/View/Image/PlatformImage.swift @@ -3,10 +3,8 @@ // OpenSwiftUI #if canImport(UIKit) -import UIKit typealias PlatformImage = UIImage #elseif canImport(AppKit) -import AppKit typealias PlatformImage = NSImage #else import Foundation diff --git a/Sources/OpenSwiftUI/View/Image/UIImageConversions.swift b/Sources/OpenSwiftUI/View/Image/UIImageConversions.swift index d2e1ddc6e..444f089be 100644 --- a/Sources/OpenSwiftUI/View/Image/UIImageConversions.swift +++ b/Sources/OpenSwiftUI/View/Image/UIImageConversions.swift @@ -7,7 +7,6 @@ // ID: 47E85C485E11398B3F3140DCB9554BB7 (SwiftUI) #if canImport(UIKit) -public import UIKit public import OpenSwiftUICore // MARK: - Image + UIImage diff --git a/Sources/OpenSwiftUI/View/Image/VectorImageLayer.swift b/Sources/OpenSwiftUI/View/Image/VectorImageLayer.swift index 45545bd6b..0cd5023e3 100644 --- a/Sources/OpenSwiftUI/View/Image/VectorImageLayer.swift +++ b/Sources/OpenSwiftUI/View/Image/VectorImageLayer.swift @@ -10,7 +10,6 @@ @_spi(ForOpenSwiftUIOnly) public import OpenSwiftUICore import OpenRenderBoxShims -public import AppKit // MARK: - VectorImageLayer + NSImage diff --git a/Sources/OpenSwiftUI/View/Scroll/HostingScrollView+Focus.swift b/Sources/OpenSwiftUI/View/Scroll/HostingScrollView+Focus.swift index 76d21a68b..30eb43c95 100644 --- a/Sources/OpenSwiftUI/View/Scroll/HostingScrollView+Focus.swift +++ b/Sources/OpenSwiftUI/View/Scroll/HostingScrollView+Focus.swift @@ -12,7 +12,6 @@ import Foundation import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // TODO: Connect the container's focus queries, filler management, and substitution. diff --git a/Sources/OpenSwiftUI/View/Scroll/HostingScrollView.swift b/Sources/OpenSwiftUI/View/Scroll/HostingScrollView.swift index e8439b4b9..458411383 100644 --- a/Sources/OpenSwiftUI/View/Scroll/HostingScrollView.swift +++ b/Sources/OpenSwiftUI/View/Scroll/HostingScrollView.swift @@ -10,7 +10,6 @@ import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit // MARK: - HostingScrollView [TBA] diff --git a/Sources/OpenSwiftUI/View/Text/Text+Selection_macOS.swift b/Sources/OpenSwiftUI/View/Text/Text+Selection_macOS.swift index 0f6115fd5..cc5f841f6 100644 --- a/Sources/OpenSwiftUI/View/Text/Text+Selection_macOS.swift +++ b/Sources/OpenSwiftUI/View/Text/Text+Selection_macOS.swift @@ -7,7 +7,6 @@ // ID: 3295A461CF58C7D9B54CD05769AF1D5B (SwiftUI) #if os(macOS) -import AppKit import COpenSwiftUI import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) diff --git a/Sources/OpenSwiftUI/View/Text/Typesetting/TypesettingConfiguration.swift b/Sources/OpenSwiftUI/View/Text/Typesetting/TypesettingConfiguration.swift index 983307390..2d864144e 100644 --- a/Sources/OpenSwiftUI/View/Text/Typesetting/TypesettingConfiguration.swift +++ b/Sources/OpenSwiftUI/View/Text/Typesetting/TypesettingConfiguration.swift @@ -6,7 +6,6 @@ // Status: Complete #if canImport(UIKit) -package import UIKit // MARK: - TypesettingConfigurationKey + UITraitBridgedEnvironmentKey diff --git a/Sources/OpenSwiftUI/View/TextField/NSTextField+Environment.swift b/Sources/OpenSwiftUI/View/TextField/NSTextField+Environment.swift index 22d76f812..bb4b773ba 100644 --- a/Sources/OpenSwiftUI/View/TextField/NSTextField+Environment.swift +++ b/Sources/OpenSwiftUI/View/TextField/NSTextField+Environment.swift @@ -6,7 +6,6 @@ // Status: WIP #if os(macOS) -import AppKit import OpenSwiftUICore // MARK: - NSTextField + Environment diff --git a/Sources/OpenSwiftUI/View/Toggle/CheckboxToggleStyle.swift b/Sources/OpenSwiftUI/View/Toggle/CheckboxToggleStyle.swift index 7144e940e..ef737e480 100644 --- a/Sources/OpenSwiftUI/View/Toggle/CheckboxToggleStyle.swift +++ b/Sources/OpenSwiftUI/View/Toggle/CheckboxToggleStyle.swift @@ -11,7 +11,6 @@ import OpenSwiftUICore #if os(macOS) -import AppKit import COpenSwiftUI #endif diff --git a/Sources/OpenSwiftUI/View/Toggle/SwitchToggleStyle.swift b/Sources/OpenSwiftUI/View/Toggle/SwitchToggleStyle.swift index 60a535ab4..440022783 100644 --- a/Sources/OpenSwiftUI/View/Toggle/SwitchToggleStyle.swift +++ b/Sources/OpenSwiftUI/View/Toggle/SwitchToggleStyle.swift @@ -152,12 +152,6 @@ public struct SwitchToggleStyle: ToggleStyle { @available(*, unavailable) extension SwitchToggleStyle: Sendable {} -#if os(iOS) || os(visionOS) -import UIKit -#elseif os(macOS) -import AppKit -#endif - // MARK: - AccessibilityToggleModifier.Switch #if os(iOS) || os(visionOS) diff --git a/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+AppKit.swift b/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+AppKit.swift index c0366a476..7c79160b5 100644 --- a/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+AppKit.swift +++ b/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+AppKit.swift @@ -7,7 +7,6 @@ // ID: 954D3D19B40AE32D17FE9A5322249E92 (SwiftUI) #if os(macOS) -import AppKit @_spi(Private) import OpenSwiftUICore diff --git a/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+UIKit.swift b/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+UIKit.swift index 925f046b2..d6a0ee8b3 100644 --- a/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+UIKit.swift +++ b/Sources/OpenSwiftUI/View/Toolbar/BarAppearanceBridge+UIKit.swift @@ -7,7 +7,6 @@ // ID: BF747AB022DCE7FC5B6AD0F035BC8E0D (SwiftUI) #if os(iOS) || os(visionOS) -import UIKit // MARK: - BarAppearanceBridge + UIKit [TBA] diff --git a/Sources/OpenSwiftUITestsSupport/Integration/PlatformAlias.swift b/Sources/OpenSwiftUITestsSupport/Integration/PlatformAlias.swift index 65732914c..12ef841e5 100644 --- a/Sources/OpenSwiftUITestsSupport/Integration/PlatformAlias.swift +++ b/Sources/OpenSwiftUITestsSupport/Integration/PlatformAlias.swift @@ -9,7 +9,6 @@ package import SwiftUI #endif #if os(iOS) || os(visionOS) -package import UIKit package typealias PlatformWindow = UIWindow package typealias PlatformViewController = UIViewController package typealias PlatformView = UIView @@ -24,7 +23,6 @@ extension Color { } } #elseif os(macOS) -package import AppKit package typealias PlatformWindow = NSWindow package typealias PlatformViewController = NSViewController package typealias PlatformView = NSView diff --git a/Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewProxyCompatibilityTests.swift b/Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewProxyCompatibilityTests.swift index 4dfc767e4..aaf38504c 100644 --- a/Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewProxyCompatibilityTests.swift +++ b/Tests/OpenSwiftUICompatibilityTests/View/IdentifiedView/IdentifiedViewProxyCompatibilityTests.swift @@ -3,9 +3,6 @@ // OpenSwiftUICompatibilityTests import Testing -#if os(iOS) || os(visionOS) -import UIKit -#endif @MainActor struct IdentifiedViewProxyCompatibilityTests { diff --git a/Tests/OpenSwiftUITests/Data/Environment/UIKitEnvironmentTests.swift b/Tests/OpenSwiftUITests/Data/Environment/UIKitEnvironmentTests.swift index 40cd4cd55..4576c5e74 100644 --- a/Tests/OpenSwiftUITests/Data/Environment/UIKitEnvironmentTests.swift +++ b/Tests/OpenSwiftUITests/Data/Environment/UIKitEnvironmentTests.swift @@ -5,7 +5,6 @@ #if os(iOS) || os(visionOS) @testable import OpenSwiftUI import Testing -import UIKit @MainActor struct UIKitEnvironmentTests { diff --git a/Tests/OpenSwiftUITests/Event/Focus/FocusNavigatorTests.swift b/Tests/OpenSwiftUITests/Event/Focus/FocusNavigatorTests.swift index 7012e8ee3..de0e1407d 100644 --- a/Tests/OpenSwiftUITests/Event/Focus/FocusNavigatorTests.swift +++ b/Tests/OpenSwiftUITests/Event/Focus/FocusNavigatorTests.swift @@ -3,7 +3,6 @@ // OpenSwiftUITests #if os(macOS) -import AppKit @_spi(Private) @testable import OpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore import OpenSwiftUITestsSupport diff --git a/Tests/OpenSwiftUITests/Event/InputEvent/KeyEventDispatcherTests.swift b/Tests/OpenSwiftUITests/Event/InputEvent/KeyEventDispatcherTests.swift index 6c50658d3..4050c558b 100644 --- a/Tests/OpenSwiftUITests/Event/InputEvent/KeyEventDispatcherTests.swift +++ b/Tests/OpenSwiftUITests/Event/InputEvent/KeyEventDispatcherTests.swift @@ -3,7 +3,6 @@ // OpenSwiftUITests #if os(macOS) -import AppKit @testable import OpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore import OpenSwiftUITestsSupport diff --git a/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewRootTransformTests.swift b/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewRootTransformTests.swift index 1a2544a54..ef57e65d6 100644 --- a/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewRootTransformTests.swift +++ b/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewRootTransformTests.swift @@ -3,7 +3,6 @@ // OpenSwiftUITests #if os(macOS) -import AppKit import OpenAttributeGraphShims @_spi(ForOpenSwiftUIOnly) @testable import OpenSwiftUI diff --git a/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewTests.swift b/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewTests.swift index ef810a796..26467a43a 100644 --- a/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewTests.swift +++ b/Tests/OpenSwiftUITests/Integration/Hosting/AppKit/View/NSHostingViewTests.swift @@ -3,7 +3,6 @@ // OpenSwiftUITests #if os(macOS) -import AppKit import OpenSwiftUI import OpenSwiftUICore import OpenSwiftUITestsSupport diff --git a/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewBaseTests.swift b/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewBaseTests.swift index 4482ca33a..155809266 100644 --- a/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewBaseTests.swift +++ b/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewBaseTests.swift @@ -8,7 +8,6 @@ import Testing import OpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -import UIKit import OpenSwiftUITestsSupport @MainActor diff --git a/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewTests.swift b/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewTests.swift index 54f78399e..90daec404 100644 --- a/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewTests.swift +++ b/Tests/OpenSwiftUITests/Integration/Hosting/UIKit/View/UIHostingViewTests.swift @@ -7,7 +7,6 @@ import OpenSwiftUI import OpenSwiftUICore import OpenSwiftUITestsSupport import Testing -import UIKit @MainActor struct UIHostingViewTests { diff --git a/Tests/OpenSwiftUITests/View/IdentifiedView/IdentifiedViewTreeTests.swift b/Tests/OpenSwiftUITests/View/IdentifiedView/IdentifiedViewTreeTests.swift index 5b3a1ae0b..3d6fc1ebd 100644 --- a/Tests/OpenSwiftUITests/View/IdentifiedView/IdentifiedViewTreeTests.swift +++ b/Tests/OpenSwiftUITests/View/IdentifiedView/IdentifiedViewTreeTests.swift @@ -6,9 +6,6 @@ import Testing import OpenSwiftUI @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if os(iOS) || os(visionOS) -import UIKit -#endif struct IdentifiedViewTreeTests { private func helper(identifier: AnyHashable) -> _IdentifiedViewProxy { diff --git a/Tests/OpenSwiftUITests/View/Image/ImageConversionsTests.swift b/Tests/OpenSwiftUITests/View/Image/ImageConversionsTests.swift index ffed31405..76311fb00 100644 --- a/Tests/OpenSwiftUITests/View/Image/ImageConversionsTests.swift +++ b/Tests/OpenSwiftUITests/View/Image/ImageConversionsTests.swift @@ -8,12 +8,6 @@ import Testing @_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore -#if canImport(AppKit) && !targetEnvironment(macCatalyst) -import AppKit -#elseif canImport(UIKit) -import UIKit -#endif - @MainActor struct ImageConversionsTests { @Test