Move UIKit backend to winit-uikit

Author: madsmtm

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 /winit-android                      @MarijnS95
 
 # Apple (AppKit + UIKit)
-/src/platform/ios.rs                @madsmtm
+/winit-uikit                        @madsmtm
 /src/platform/macos.rs              @madsmtm
 /src/platform_impl/apple            @madsmtm
 /winit-common/src/core_foundation   @madsmtm

.github/workflows/ci.yml

@@ -201,6 +201,11 @@ jobs:
       if: contains(matrix.platform.target, 'redox')
       run: cargo test -p winit-orbital
 
+    - name: Test winit UIKit
+      if: contains(matrix.platform.target, 'ios')
+      # TODO: Run on Simulator
+      run: cargo $CMD test -p winit-uikit --target=${{ matrix.platform.target }} --no-run
+
     - name: Test winit Win32
       if: contains(matrix.platform.target, 'windows')
       run: cargo $CMD test -p winit-win32 --target=${{ matrix.platform.target }}

Cargo.toml

@@ -16,6 +16,7 @@ winit-android = { version = "0.0.0", path = "winit-android" }
 winit-common = { version = "0.0.0", path = "winit-common" }
 winit-core = { version = "0.0.0", path = "winit-core" }
 winit-orbital = { version = "0.0.0", path = "winit-orbital" }
+winit-uikit = { version = "0.0.0", path = "winit-uikit" }
 winit-win32 = { version = "0.0.0", path = "winit-win32" }
 
 # Core dependencies.
@@ -164,6 +165,7 @@ serde = [
     "dpi/serde",
     "bitflags/serde",
     "winit-core/serde",
+    "winit-uikit/serde",
 ]
 wayland = [
     "wayland-client",
@@ -296,52 +298,8 @@ objc2-foundation = { workspace = true, features = [
     "NSValue",
 ] }
 
-# UIKit
 [target.'cfg(all(target_vendor = "apple", not(target_os = "macos")))'.dependencies]
-objc2-core-foundation = { workspace = true, features = [
-    "std",
-    "CFCGTypes",
-    "CFBase",
-    "CFRunLoop",
-    "CFString",
-] }
-objc2-foundation = { workspace = true, features = [
-    "std",
-    "block2",
-    "objc2-core-foundation",
-    "NSArray",
-    "NSEnumerator",
-    "NSGeometry",
-    "NSObjCRuntime",
-    "NSOperation",
-    "NSString",
-    "NSThread",
-    "NSSet",
-] }
-objc2-ui-kit = { workspace = true, features = [
-    "std",
-    "objc2-core-foundation",
-    "UIApplication",
-    "UIDevice",
-    "UIEvent",
-    "UIGeometry",
-    "UIGestureRecognizer",
-    "UITextInput",
-    "UITextInputTraits",
-    "UIOrientation",
-    "UIPanGestureRecognizer",
-    "UIPinchGestureRecognizer",
-    "UIResponder",
-    "UIRotationGestureRecognizer",
-    "UIScreen",
-    "UIScreenMode",
-    "UITapGestureRecognizer",
-    "UITouch",
-    "UITraitCollection",
-    "UIView",
-    "UIViewController",
-    "UIWindow",
-] }
+winit-uikit.workspace = true
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winit-win32.workspace = true

src/platform/mod.rs

@@ -5,7 +5,7 @@
 #[cfg(android_platform)]
 pub use winit_android as android;
 #[cfg(ios_platform)]
-pub mod ios;
+pub use winit_uikit as ios;
 #[cfg(macos_platform)]
 pub mod macos;
 #[cfg(orbital_platform)]

src/platform_impl/apple/mod.rs

@@ -1,11 +1,6 @@
 #[cfg(target_os = "macos")]
 mod appkit;
-#[cfg(not(target_os = "macos"))]
-mod uikit;
 
 #[allow(unused_imports)]
 #[cfg(target_os = "macos")]
 pub use self::appkit::*;
-#[allow(unused_imports)]
-#[cfg(not(target_os = "macos"))]
-pub use self::uikit::*;

src/platform_impl/apple/uikit/mod.rs

@@ -1,17 +1,19 @@
 #[cfg(android_platform)]
 pub(crate) use winit_android as platform;
-#[cfg(target_vendor = "apple")]
+#[cfg(macos_platform)]
 mod apple;
 #[cfg(any(x11_platform, wayland_platform))]
 mod linux;
 #[cfg(orbital_platform)]
 pub(crate) use winit_orbital as platform;
+#[cfg(ios_platform)]
+pub(crate) use winit_uikit as platform;
 #[cfg(web_platform)]
 mod web;
 #[cfg(windows_platform)]
 pub(crate) use winit_win32 as platform;
 
-#[cfg(target_vendor = "apple")]
+#[cfg(macos_platform)]
 use self::apple as platform;
 #[cfg(any(x11_platform, wayland_platform))]
 use self::linux as platform;

src/platform_impl/apple/uikit/notification_center.rs

@@ -0,0 +1,72 @@
+[package]
+description = "Winit's UIKit (iOS/tvOS/visionOS) backend"
+documentation = "https://docs.rs/winit-uikit"
+edition.workspace = true
+license.workspace = true
+name = "winit-uikit"
+repository.workspace = true
+rust-version.workspace = true
+version = "0.0.0"
+
+[features]
+serde = ["dep:serde", "bitflags/serde", "smol_str/serde", "dpi/serde"]
+
+[dependencies]
+bitflags.workspace = true
+dpi.workspace = true
+rwh_06.workspace = true
+serde = { workspace = true, optional = true }
+smol_str.workspace = true
+tracing.workspace = true
+winit-common = { workspace = true, features = ["core-foundation", "event-handler"] }
+winit-core.workspace = true
+
+# Platform-specific
+[target.'cfg(target_vendor = "apple")'.dependencies]
+block2.workspace = true
+dispatch2.workspace = true
+objc2.workspace = true
+objc2-core-foundation = { workspace = true, features = [
+    "std",
+    "CFCGTypes",
+    "CFBase",
+    "CFRunLoop",
+    "CFString",
+] }
+objc2-foundation = { workspace = true, features = [
+    "std",
+    "block2",
+    "objc2-core-foundation",
+    "NSArray",
+    "NSEnumerator",
+    "NSGeometry",
+    "NSObjCRuntime",
+    "NSOperation",
+    "NSString",
+    "NSThread",
+    "NSSet",
+] }
+objc2-ui-kit = { workspace = true, features = [
+    "std",
+    "objc2-core-foundation",
+    "UIApplication",
+    "UIDevice",
+    "UIEvent",
+    "UIGeometry",
+    "UIGestureRecognizer",
+    "UITextInput",
+    "UITextInputTraits",
+    "UIOrientation",
+    "UIPanGestureRecognizer",
+    "UIPinchGestureRecognizer",
+    "UIResponder",
+    "UIRotationGestureRecognizer",
+    "UIScreen",
+    "UIScreenMode",
+    "UITapGestureRecognizer",
+    "UITouch",
+    "UITraitCollection",
+    "UIView",
+    "UIViewController",
+    "UIWindow",
+] }

src/platform_impl/mod.rs

@@ -0,0 +1 @@
+../README.md