fix: Bump objc2 to 0.5.0; bring icrate 0.1.0 (#323)

Co-authored-by: Matt Campbell <mattcampbell@pobox.com>
AccessKit · Jan 3, 2024 · 23b3f2f · 23b3f2f
1 parent 52560da
commit 23b3f2f
Show file tree

Hide file tree

Showing 17 changed files with 257 additions and 494 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/platforms/macos/Cargo.toml b/platforms/macos/Cargo.toml
@@ -16,5 +16,19 @@ default-target = "x86_64-apple-darwin"
 [dependencies]
 accesskit = { version = "0.12.1", path = "../../common" }
 accesskit_consumer = { version = "0.16.1", path = "../../consumer" }
-objc2 = ">=0.3.0-beta.3, <0.3.0-beta.4" # Allow `0.3.0-beta.3.patch-leaks`
+objc2 = "0.5.0"
 once_cell = "1.13.0"
+
+[dependencies.icrate]
+version = "0.1.0"
+features = [
+    "AppKit",
+    "AppKit_NSAccessibilityElement",
+    "AppKit_NSView",
+    "AppKit_NSWindow",
+    "Foundation",
+    "Foundation_NSArray",
+    "Foundation_NSMutableDictionary",
+    "Foundation_NSNumber",
+    "Foundation_NSThread",
+]
diff --git a/platforms/macos/src/adapter.rs b/platforms/macos/src/adapter.rs
@@ -5,14 +5,14 @@
 
 use accesskit::{ActionHandler, TreeUpdate};
 use accesskit_consumer::{FilterResult, Tree};
-use objc2::{
-    foundation::{MainThreadMarker, NSArray, NSObject, NSPoint},
-    rc::{Id, Shared, WeakId},
+use icrate::{
+    AppKit::NSView,
+    Foundation::{MainThreadMarker, NSArray, NSObject, NSPoint},
 };
+use objc2::rc::{Id, WeakId};
 use std::{ffi::c_void, ptr::null_mut, rc::Rc};
 
 use crate::{
-    appkit::NSView,
     context::Context,
     event::{EventGenerator, QueuedEvents},
     filters::filter,
@@ -40,7 +40,7 @@ impl Adapter {
         action_handler: Box<dyn ActionHandler>,
     ) -> Self {
         let view = unsafe { Id::retain(view as *mut NSView) }.unwrap();
-        let view = WeakId::new(&view);
+        let view = WeakId::from_id(&view);
         let tree = Tree::new(initial_state, is_view_focused);
         let mtm = MainThreadMarker::new().unwrap();
         Self {
@@ -83,7 +83,7 @@ impl Adapter {
                         self.context.get_or_create_platform_node(node.id()),
                     ))
                 })
-                .collect::<Vec<Id<NSObject, Shared>>>()
+                .collect::<Vec<Id<NSObject>>>()
         };
         let array = NSArray::from_vec(platform_nodes);
         Id::autorelease_return(array)

diff --git a/platforms/macos/src/appkit/accessibility_constants.rs b/platforms/macos/src/appkit/accessibility_constants.rs
diff --git a/platforms/macos/src/appkit/accessibility_element.rs b/platforms/macos/src/appkit/accessibility_element.rs
diff --git a/platforms/macos/src/appkit/accessibility_functions.rs b/platforms/macos/src/appkit/accessibility_functions.rs
diff --git a/platforms/macos/src/appkit/mod.rs b/platforms/macos/src/appkit/mod.rs
diff --git a/platforms/macos/src/appkit/responder.rs b/platforms/macos/src/appkit/responder.rs