Remove symlinking between winit-appkit and winit-uikit (#4530)

winit-appkit/Cargo.toml

@@ -107,7 +107,7 @@ objc2-foundation = { workspace = true, features = [
     "NSThread",
     "NSValue",
 ] }
-winit-common = { workspace = true, features = ["core-foundation", "event-handler"] }
+winit-common = { workspace = true, features = ["core-foundation", "event-handler", "foundation"] }
 
 [dev-dependencies]
 winit.workspace = true

winit-appkit/src/event_loop.rs

@@ -14,6 +14,7 @@ use objc2_foundation::{NSNotificationCenter, NSObjectProtocol};
 use rwh_06::HasDisplayHandle;
 use tracing::debug_span;
 use winit_common::core_foundation::{MainRunLoop, MainRunLoopObserver, tracing_observers};
+use winit_common::foundation::create_observer;
 use winit_core::application::ApplicationHandler;
 use winit_core::cursor::{CustomCursor as CoreCustomCursor, CustomCursorSource};
 use winit_core::error::{EventLoopError, RequestError};
@@ -30,7 +31,6 @@ use super::app_state::AppState;
 use super::cursor::CustomCursor;
 use super::event::dummy_event;
 use super::monitor;
-use super::notification_center::create_observer;
 use crate::ActivationPolicy;
 use crate::window::Window;
 

winit-appkit/src/lib.rs

@@ -76,7 +76,6 @@ mod event_loop;
 mod ffi;
 mod menu;
 mod monitor;
-mod notification_center;
 mod observer;
 mod view;
 mod window;

winit-appkit/src/notification_center.rs

@@ -1,31 +0,0 @@
-// NOTE: This is symlinked to be contained in both the AppKit and UIKit implementations.
-use std::ptr::NonNull;
-
-use block2::RcBlock;
-use objc2::rc::Retained;
-use objc2::runtime::ProtocolObject;
-use objc2_foundation::{
-    NSNotification, NSNotificationCenter, NSNotificationName, NSObjectProtocol,
-};
-
-/// Observe the given notification.
-///
-/// This is used in Winit as an alternative to declaring an application delegate, as we want to
-/// give the user full control over those.
-pub(crate) fn create_observer(
-    center: &NSNotificationCenter,
-    name: &NSNotificationName,
-    handler: impl Fn(&NSNotification) + 'static,
-) -> Retained<ProtocolObject<dyn NSObjectProtocol>> {
-    let block = RcBlock::new(move |notification: NonNull<NSNotification>| {
-        handler(unsafe { notification.as_ref() });
-    });
-    unsafe {
-        center.addObserverForName_object_queue_usingBlock(
-            Some(name),
-            None, // No sender filter
-            None, // No queue, run on posting thread (i.e. main thread)
-            &block,
-        )
-    }
-}