chore(deps): Use objc2 v0.6 (#1468)

Author: madsmtm

.changes/objc2-v6.md

@@ -0,0 +1,7 @@
+---
+wry: patch
+---
+
+Update to `objc2` v0.6.
+
+This bumps MSRV on macOS/iOS to 1.71.

Cargo.toml

@@ -92,11 +92,13 @@ features = [
   "Win32_UI_Input_KeyboardAndMouse",
 ]
 
-[target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
+[target.'cfg(target_vendor = "apple")'.dependencies]
 url = "2.5"
-block2 = "0.5"
-objc2 = { version = "0.5", features = ["exception"] }
-objc2-web-kit = { version = "0.2.0", features = [
+block2 = "0.6"
+objc2 = { version = "0.6", features = ["exception"] }
+objc2-web-kit = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "objc2-core-foundation",
   "objc2-app-kit",
   "block2",
   "WKWebView",
@@ -122,7 +124,13 @@ objc2-web-kit = { version = "0.2.0", features = [
   "WKUserScript",
   "WKHTTPCookieStore",
 ] }
-objc2-foundation = { version = "0.2.0", features = [
+objc2-core-foundation = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "CFCGTypes",
+] }
+objc2-foundation = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "objc2-core-foundation",
   "NSURLRequest",
   "NSURL",
   "NSString",
@@ -131,6 +139,7 @@ objc2-foundation = { version = "0.2.0", features = [
   "NSDictionary",
   "NSObject",
   "NSData",
+  "NSEnumerator",
   "NSKeyValueObserving",
   "NSThread",
   "NSJSONSerialization",
@@ -142,8 +151,10 @@ objc2-foundation = { version = "0.2.0", features = [
   "NSRunLoop",
 ] }
 
-[target."cfg(target_os = \"ios\")".dependencies]
-objc2-ui-kit = { version = "0.2.2", features = [
+[target.'cfg(target_os = "ios")'.dependencies]
+objc2-ui-kit = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "objc2-core-foundation",
   "UIResponder",
   "UIScrollView",
   "UIView",
@@ -152,8 +163,10 @@ objc2-ui-kit = { version = "0.2.2", features = [
   "UIEvent",
 ] }
 
-[target."cfg(target_os = \"macos\")".dependencies]
-objc2-app-kit = { version = "0.2.0", features = [
+[target.'cfg(target_os = "macos")'.dependencies]
+objc2-app-kit = { version = "0.3.0", default-features = false, features = [
+  "std",
+  "objc2-core-foundation",
   "NSApplication",
   "NSButton",
   "NSControl",

src/wkwebview/class/document_title_changed_observer.rs

@@ -5,11 +5,10 @@
 use std::{ffi::c_void, ptr::null_mut};
 
 use objc2::{
-  declare_class, msg_send, msg_send_id,
-  mutability::InteriorMutable,
+  define_class, msg_send,
   rc::Retained,
   runtime::{AnyObject, NSObject},
-  ClassType, DeclaredClass,
+  AllocAnyThread, DefinedClass,
 };
 use objc2_foundation::{
   NSDictionary, NSKeyValueChangeKey, NSKeyValueObservingOptions,
@@ -22,21 +21,15 @@ pub struct DocumentTitleChangedObserverIvars {
   pub handler: Box<dyn Fn(String)>,
 }
 
-declare_class!(
+define_class!(
+  #[unsafe(super(NSObject))]
+  #[name = "DocumentTitleChangedObserver"]
+  #[ivars = DocumentTitleChangedObserverIvars]
   pub struct DocumentTitleChangedObserver;
 
-  unsafe impl ClassType for DocumentTitleChangedObserver {
-    type Super = NSObject;
-    type Mutability = InteriorMutable;
-    const NAME: &'static str = "DocumentTitleChangedObserver";
-  }
-
-  impl DeclaredClass for DocumentTitleChangedObserver {
-    type Ivars = DocumentTitleChangedObserverIvars;
-  }
-
-  unsafe impl DocumentTitleChangedObserver {
-    #[method(observeValueForKeyPath:ofObject:change:context:)]
+  /// NSKeyValueObserving.
+  impl DocumentTitleChangedObserver {
+    #[unsafe(method(observeValueForKeyPath:ofObject:change:context:))]
     fn observe_value_for_key_path(
       &self,
       key_path: Option<&NSString>,
@@ -49,8 +42,8 @@ declare_class!(
           unsafe {
             let handler = &self.ivars().handler;
             // if !handler.is_null() {
-              let title: *const NSString = msg_send![object, title];
-              handler((*title).to_string());
+            let title: *const NSString = msg_send![object, title];
+            handler((*title).to_string());
             // }
           }
         }
@@ -68,7 +61,7 @@ impl DocumentTitleChangedObserver {
       handler,
     });
 
-    let observer: Retained<Self> = unsafe { msg_send_id![super(observer), init] };
+    let observer: Retained<Self> = unsafe { msg_send![super(observer), init] };
 
     unsafe {
       observer
@@ -77,7 +70,7 @@ impl DocumentTitleChangedObserver {
         .addObserver_forKeyPath_options_context(
           &observer,
           &NSString::from_str("title"),
-          NSKeyValueObservingOptions::NSKeyValueObservingOptionNew,
+          NSKeyValueObservingOptions::New,
           null_mut(),
         );
     }

src/wkwebview/class/url_scheme_handler.rs

@@ -7,7 +7,6 @@ use std::{
   ffi::{c_char, c_void, CStr},
   panic::AssertUnwindSafe,
   ptr::NonNull,
-  slice,
 };
 
 use http::{
@@ -17,7 +16,7 @@ use http::{
 use objc2::{
   rc::Retained,
   runtime::{AnyClass, AnyObject, ClassBuilder, ProtocolObject},
-  ClassType,
+  AllocAnyThread, ClassType,
 };
 use objc2_foundation::{
   NSData, NSHTTPURLResponse, NSMutableDictionary, NSObject, NSObjectProtocol, NSString, NSURL,
@@ -29,12 +28,13 @@ use crate::{wkwebview::WEBVIEW_IDS, RequestAsyncResponder, WryWebView};
 
 pub fn create(name: &str) -> &AnyClass {
   unsafe {
-    let scheme_name = format!("{}URLSchemeHandler", name);
+    let scheme_name = format!("{}URLSchemeHandler\0", name);
+    let scheme_name = CStr::from_bytes_with_nul(scheme_name.as_bytes()).unwrap();
     let cls = ClassBuilder::new(&scheme_name, NSObject::class());
     match cls {
       Some(mut cls) => {
-        cls.add_ivar::<*mut c_void>("function");
-        cls.add_ivar::<*mut c_char>("webview_id");
+        cls.add_ivar::<*mut c_void>(CStr::from_bytes_with_nul(b"function\0").unwrap());
+        cls.add_ivar::<*mut c_char>(CStr::from_bytes_with_nul(b"webview_id\0").unwrap());
         cls.add_method(
           objc2::sel!(webView:startURLSchemeTask:),
           start_task as extern "C" fn(_, _, _, _),
@@ -54,7 +54,7 @@ pub fn create(name: &str) -> &AnyClass {
 extern "C" fn start_task(
   this: &AnyObject,
   _sel: objc2::runtime::Sel,
-  webview: &'static mut WryWebView,
+  webview: &'static WryWebView,
   task: &'static ProtocolObject<dyn WKURLSchemeTask>,
 ) {
   unsafe {
@@ -65,14 +65,20 @@ extern "C" fn start_task(
     let task_key = task.hash(); // hash by task object address
     let task_uuid = webview.add_custom_task_key(task_key);
 
-    let ivar = this.class().instance_variable("webview_id").unwrap();
+    let ivar = this
+      .class()
+      .instance_variable(CStr::from_bytes_with_nul(b"webview_id\0").unwrap())
+      .unwrap();
     let webview_id_ptr: *mut c_char = *ivar.load(this);
     let webview_id = CStr::from_ptr(webview_id_ptr)
       .to_str()
       .ok()
       .unwrap_or_default();
 
-    let ivar = this.class().instance_variable("function").unwrap();
+    let ivar = this
+      .class()
+      .instance_variable(CStr::from_bytes_with_nul(b"function\0").unwrap())
+      .unwrap();
     let function: &*mut c_void = ivar.load(this);
     if !function.is_null() {
       let function = &mut *(*function
@@ -98,9 +104,7 @@ extern "C" fn start_task(
       let body = request.HTTPBody();
       let body_stream = request.HTTPBodyStream();
       if let Some(body) = body {
-        let length = body.length();
-        let data_bytes = body.bytes();
-        sent_form_body = slice::from_raw_parts(data_bytes.as_ptr(), length).to_vec();
+        sent_form_body = body.to_vec();
       } else if let Some(body_stream) = body_stream {
         body_stream.open();
 
@@ -121,7 +125,7 @@ extern "C" fn start_task(
       // get all our headers values and inject them in our request
       if let Some(all_headers) = all_headers {
         for current_header in all_headers.allKeys().to_vec() {
-          let header_value = all_headers.valueForKey(current_header).unwrap();
+          let header_value = all_headers.valueForKey(&current_header).unwrap();
           // inject the header into the request
           http_request = http_request.header(current_header.to_string(), header_value.to_string());
         }
@@ -196,7 +200,7 @@ extern "C" fn start_task(
                 // FIXME: though we give it a static lifetime, it's not guaranteed to be valid.
                 task: &'static ProtocolObject<dyn WKURLSchemeTask>,
                 // FIXME: though we give it a static lifetime, it's not guaranteed to be valid.
-                webview: &'static mut WryWebView,
+                webview: &'static WryWebView,
                 task_key: usize,
                 task_uuid: Retained<NSUUID>,
                 webview_id: &str,
@@ -215,24 +219,24 @@ extern "C" fn start_task(
                 // default to HTTP/1.1
                 let wanted_version = format!("{:#?}", sent_response.version());
 
-                let mut headers = NSMutableDictionary::new();
+                let headers = NSMutableDictionary::new();
                 if let Some(mime) = wanted_mime {
-                  headers.insert_id(
-                    NSString::from_str(CONTENT_TYPE.as_str()).as_ref(),
-                    NSString::from_str(mime.to_str().unwrap()),
+                  headers.insert(
+                    &*NSString::from_str(CONTENT_TYPE.as_str()),
+                    &*NSString::from_str(mime.to_str().unwrap()),
                   );
                 }
-                headers.insert_id(
-                  NSString::from_str(CONTENT_LENGTH.as_str()).as_ref(),
-                  NSString::from_str(&content.len().to_string()),
+                headers.insert(
+                  &*NSString::from_str(CONTENT_LENGTH.as_str()),
+                  &*NSString::from_str(&content.len().to_string()),
                 );
 
                 // add headers
                 for (name, value) in sent_response.headers().iter() {
                   if let Ok(value) = value.to_str() {
-                    headers.insert_id(
-                      NSString::from_str(name.as_str()).as_ref(),
-                      NSString::from_str(value),
+                    headers.insert(
+                      &*NSString::from_str(name.as_str()),
+                      &*NSString::from_str(value),
                     );
                   }
                 }
@@ -334,7 +338,7 @@ extern "C" fn start_task(
 extern "C" fn stop_task(
   _this: &ProtocolObject<dyn WKURLSchemeHandler>,
   _sel: objc2::runtime::Sel,
-  webview: &mut WryWebView,
+  webview: &WryWebView,
   task: &ProtocolObject<dyn WKURLSchemeTask>,
 ) {
   webview.remove_custom_task_key(task.hash());

src/wkwebview/class/wry_download_delegate.rs

@@ -4,10 +4,7 @@
 
 use std::{cell::RefCell, path::PathBuf, rc::Rc};
 
-use objc2::{
-  declare_class, msg_send_id, mutability::MainThreadOnly, rc::Retained, runtime::NSObject,
-  ClassType, DeclaredClass,
-};
+use objc2::{define_class, msg_send, rc::Retained, runtime::NSObject, MainThreadOnly};
 use objc2_foundation::{
   MainThreadMarker, NSData, NSError, NSObjectProtocol, NSString, NSURLResponse, NSURL,
 };
@@ -20,23 +17,17 @@ pub struct WryDownloadDelegateIvars {
   pub completed: Option<Rc<dyn Fn(String, Option<PathBuf>, bool) + 'static>>,
 }
 
-declare_class!(
+define_class!(
+  #[unsafe(super(NSObject))]
+  #[name = "WryDownloadDelegate"]
+  #[thread_kind = MainThreadOnly]
+  #[ivars = WryDownloadDelegateIvars]
   pub struct WryDownloadDelegate;
 
-  unsafe impl ClassType for WryDownloadDelegate {
-    type Super = NSObject;
-    type Mutability = MainThreadOnly;
-    const NAME: &'static str = "WryDownloadDelegate";
-  }
-
-  impl DeclaredClass for WryDownloadDelegate {
-    type Ivars = WryDownloadDelegateIvars;
-  }
-
   unsafe impl NSObjectProtocol for WryDownloadDelegate {}
 
   unsafe impl WKDownloadDelegate for WryDownloadDelegate {
-    #[method(download:decideDestinationUsingResponse:suggestedFilename:completionHandler:)]
+    #[unsafe(method(download:decideDestinationUsingResponse:suggestedFilename:completionHandler:))]
     fn download_policy(
       &self,
       download: &WKDownload,
@@ -47,18 +38,13 @@ declare_class!(
       download_policy(self, download, response, suggested_path, handler);
     }
 
-    #[method(downloadDidFinish:)]
+    #[unsafe(method(downloadDidFinish:))]
     fn download_did_finish(&self, download: &WKDownload) {
       download_did_finish(self, download);
     }
 
-    #[method(download:didFailWithError:resumeData:)]
-    fn download_did_fail(
-      &self,
-      download: &WKDownload,
-      error: &NSError,
-      resume_data: &NSData,
-    ) {
+    #[unsafe(method(download:didFailWithError:resumeData:))]
+    fn download_did_fail(&self, download: &WKDownload, error: &NSError, resume_data: &NSData) {
       download_did_fail(self, download, error, resume_data);
     }
   }
@@ -77,6 +63,6 @@ impl WryDownloadDelegate {
         completed: download_completed_handler,
       });
 
-    unsafe { msg_send_id![super(delegate), init] }
+    unsafe { msg_send![super(delegate), init] }
   }
 }

src/wkwebview/class/wry_navigation_delegate.rs

@@ -4,10 +4,7 @@
 
 use std::sync::{Arc, Mutex};
 
-use objc2::{
-  declare_class, msg_send_id, mutability::MainThreadOnly, rc::Retained, runtime::NSObject,
-  ClassType, DeclaredClass,
-};
+use objc2::{define_class, msg_send, rc::Retained, runtime::NSObject, MainThreadOnly};
 use objc2_foundation::{MainThreadMarker, NSObjectProtocol};
 use objc2_web_kit::{
   WKDownload, WKNavigation, WKNavigationAction, WKNavigationActionPolicy, WKNavigationDelegate,
@@ -40,23 +37,17 @@ pub struct WryNavigationDelegateIvars {
   pub on_page_load_handler: Option<Box<dyn Fn(PageLoadEvent)>>,
 }
 
-declare_class!(
+define_class!(
+  #[unsafe(super(NSObject))]
+  #[name = "WryNavigationDelegate"]
+  #[thread_kind = MainThreadOnly]
+  #[ivars = WryNavigationDelegateIvars]
   pub struct WryNavigationDelegate;
 
-  unsafe impl ClassType for WryNavigationDelegate {
-    type Super = NSObject;
-    type Mutability = MainThreadOnly;
-    const NAME: &'static str = "WryNavigationDelegate";
-  }
-
-  impl DeclaredClass for WryNavigationDelegate {
-    type Ivars = WryNavigationDelegateIvars;
-  }
-
   unsafe impl NSObjectProtocol for WryNavigationDelegate {}
 
   unsafe impl WKNavigationDelegate for WryNavigationDelegate {
-    #[method(webView:decidePolicyForNavigationAction:decisionHandler:)]
+    #[unsafe(method(webView:decidePolicyForNavigationAction:decisionHandler:))]
     fn navigation_policy(
       &self,
       webview: &WKWebView,
@@ -66,7 +57,7 @@ declare_class!(
       navigation_policy(self, webview, action, handler);
     }
 
-    #[method(webView:decidePolicyForNavigationResponse:decisionHandler:)]
+    #[unsafe(method(webView:decidePolicyForNavigationResponse:decisionHandler:))]
     fn navigation_policy_response(
       &self,
       webview: &WKWebView,
@@ -76,25 +67,17 @@ declare_class!(
       navigation_policy_response(self, webview, response, handler);
     }
 
-    #[method(webView:didFinishNavigation:)]
-    fn did_finish_navigation(
-      &self,
-      webview: &WKWebView,
-      navigation: &WKNavigation,
-    ) {
+    #[unsafe(method(webView:didFinishNavigation:))]
+    fn did_finish_navigation(&self, webview: &WKWebView, navigation: &WKNavigation) {
       did_finish_navigation(self, webview, navigation);
     }
 
-    #[method(webView:didCommitNavigation:)]
-    fn did_commit_navigation(
-      &self,
-      webview: &WKWebView,
-      navigation: &WKNavigation,
-    ) {
+    #[unsafe(method(webView:didCommitNavigation:))]
+    fn did_commit_navigation(&self, webview: &WKWebView, navigation: &WKNavigation) {
       did_commit_navigation(self, webview, navigation);
     }
 
-    #[method(webView:navigationAction:didBecomeDownload:)]
+    #[unsafe(method(webView:navigationAction:didBecomeDownload:))]
     fn navigation_download_action(
       &self,
       webview: &WKWebView,
@@ -104,7 +87,7 @@ declare_class!(
       navigation_download_action(self, webview, action, download);
     }
 
-    #[method(webView:navigationResponse:didBecomeDownload:)]
+    #[unsafe(method(webView:navigationResponse:didBecomeDownload:))]
     fn navigation_download_response(
       &self,
       webview: &WKWebView,
@@ -159,6 +142,6 @@ impl WryNavigationDelegate {
         on_page_load_handler,
       });
 
-    unsafe { msg_send_id![super(delegate), init] }
+    unsafe { msg_send![super(delegate), init] }
   }
 }

src/wkwebview/class/wry_web_view.rs

@@ -2,13 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use std::collections::HashMap;
+use std::{cell::RefCell, collections::HashMap};
 
 #[cfg(target_os = "macos")]
 use objc2::runtime::ProtocolObject;
-use objc2::{
-  declare_class, mutability::MainThreadOnly, rc::Retained, runtime::Bool, ClassType, DeclaredClass,
-};
+use objc2::{define_class, rc::Retained, runtime::Bool, DeclaredClass};
 #[cfg(target_os = "macos")]
 use objc2_app_kit::{NSDraggingDestination, NSEvent};
 use objc2_foundation::{NSObjectProtocol, NSUUID};
@@ -31,28 +29,19 @@ pub struct WryWebViewIvars {
   pub(crate) drag_drop_handler: Box<dyn Fn(DragDropEvent) -> bool>,
   #[cfg(target_os = "macos")]
   pub(crate) accept_first_mouse: objc2::runtime::Bool,
-  pub(crate) custom_protocol_task_ids: HashMap<usize, Retained<NSUUID>>,
+  pub(crate) custom_protocol_task_ids: RefCell<HashMap<usize, Retained<NSUUID>>>,
 }
 
-declare_class!(
+define_class!(
+  #[unsafe(super(WKWebView))]
+  #[name = "WryWebView"]
+  #[ivars = WryWebViewIvars]
   pub struct WryWebView;
 
-  unsafe impl ClassType for WryWebView {
-    type Super = WKWebView;
-    type Mutability = MainThreadOnly;
-    const NAME: &'static str = "WryWebView";
-  }
-
-  impl DeclaredClass for WryWebView {
-    type Ivars = WryWebViewIvars;
-  }
-
-  unsafe impl WryWebView {
-    #[method(performKeyEquivalent:)]
-    fn perform_key_equivalent(
-      &self,
-      event: &NSEvent,
-    ) -> Bool {
+  /// Overridden NSView methods.
+  impl WryWebView {
+    #[unsafe(method(performKeyEquivalent:))]
+    fn perform_key_equivalent(&self, event: &NSEvent) -> Bool {
       // This is a temporary workaround for https://github.com/tauri-apps/tauri/issues/9426
       // FIXME: When the webview is a child webview, performKeyEquivalent always return YES
       // and stop propagating the event to the window, hence the menu shortcut won't be
@@ -61,94 +50,90 @@ declare_class!(
       if self.ivars().is_child {
         Bool::NO
       } else {
-        unsafe {
-          objc2::msg_send![super(self), performKeyEquivalent: event]
-        }
+        unsafe { objc2::msg_send![super(self), performKeyEquivalent: event] }
       }
     }
 
     #[cfg(target_os = "macos")]
-    #[method(acceptsFirstMouse:)]
-    fn accept_first_mouse(
-      &self,
-      _event: &NSEvent,
-    ) -> Bool {
-        self.ivars().accept_first_mouse
+    #[unsafe(method(acceptsFirstMouse:))]
+    fn accept_first_mouse(&self, _event: &NSEvent) -> Bool {
+      self.ivars().accept_first_mouse
     }
   }
   unsafe impl NSObjectProtocol for WryWebView {}
 
   // Drag & Drop
   #[cfg(target_os = "macos")]
   unsafe impl NSDraggingDestination for WryWebView {
-    #[method(draggingEntered:)]
+    #[unsafe(method(draggingEntered:))]
     fn dragging_entered(
       &self,
       drag_info: &ProtocolObject<dyn objc2_app_kit::NSDraggingInfo>,
     ) -> objc2_app_kit::NSDragOperation {
       drag_drop::dragging_entered(self, drag_info)
     }
 
-    #[method(draggingUpdated:)]
+    #[unsafe(method(draggingUpdated:))]
     fn dragging_updated(
       &self,
       drag_info: &ProtocolObject<dyn objc2_app_kit::NSDraggingInfo>,
     ) -> objc2_app_kit::NSDragOperation {
       drag_drop::dragging_updated(self, drag_info)
     }
 
-    #[method(performDragOperation:)]
+    #[unsafe(method(performDragOperation:))]
     fn perform_drag_operation(
       &self,
       drag_info: &ProtocolObject<dyn objc2_app_kit::NSDraggingInfo>,
     ) -> Bool {
       drag_drop::perform_drag_operation(self, drag_info)
     }
 
-    #[method(draggingExited:)]
-    fn dragging_exited(
-      &self,
-      drag_info: &ProtocolObject<dyn objc2_app_kit::NSDraggingInfo>,
-    ) {
+    #[unsafe(method(draggingExited:))]
+    fn dragging_exited(&self, drag_info: &ProtocolObject<dyn objc2_app_kit::NSDraggingInfo>) {
       drag_drop::dragging_exited(self, drag_info)
     }
   }
 
   // Synthetic mouse events
   #[cfg(target_os = "macos")]
-  unsafe impl WryWebView {
-    #[method(otherMouseDown:)]
-    fn other_mouse_down(
-      &self,
-      event: &NSEvent,
-    ) {
+  impl WryWebView {
+    #[unsafe(method(otherMouseDown:))]
+    fn other_mouse_down(&self, event: &NSEvent) {
       synthetic_mouse_events::other_mouse_down(self, event)
     }
 
-    #[method(otherMouseUp:)]
-    fn other_mouse_up(
-      &self,
-      event: &NSEvent,
-    ) {
+    #[unsafe(method(otherMouseUp:))]
+    fn other_mouse_up(&self, event: &NSEvent) {
       synthetic_mouse_events::other_mouse_up(self, event)
     }
   }
 );
 
 // Custom Protocol Task Checker
 impl WryWebView {
-  pub(crate) fn add_custom_task_key(&mut self, task_id: usize) -> Retained<NSUUID> {
+  pub(crate) fn add_custom_task_key(&self, task_id: usize) -> Retained<NSUUID> {
     let task_uuid = NSUUID::new();
     self
-      .ivars_mut()
+      .ivars()
       .custom_protocol_task_ids
+      .borrow_mut()
       .insert(task_id, task_uuid.clone());
     task_uuid
   }
-  pub(crate) fn remove_custom_task_key(&mut self, task_id: usize) {
-    self.ivars_mut().custom_protocol_task_ids.remove(&task_id);
+  pub(crate) fn remove_custom_task_key(&self, task_id: usize) {
+    self
+      .ivars()
+      .custom_protocol_task_ids
+      .borrow_mut()
+      .remove(&task_id);
   }
   pub(crate) fn get_custom_task_uuid(&self, task_id: usize) -> Option<Retained<NSUUID>> {
-    self.ivars().custom_protocol_task_ids.get(&task_id).cloned()
+    self
+      .ivars()
+      .custom_protocol_task_ids
+      .borrow()
+      .get(&task_id)
+      .cloned()
   }
 }

src/wkwebview/class/wry_web_view_delegate.rs

@@ -6,11 +6,10 @@ use std::ffi::CStr;
 
 use http::Request;
 use objc2::{
-  declare_class, msg_send_id,
-  mutability::MainThreadOnly,
+  define_class, msg_send,
   rc::Retained,
   runtime::{NSObject, ProtocolObject},
-  ClassType, DeclaredClass,
+  DeclaredClass, MainThreadOnly,
 };
 use objc2_foundation::{MainThreadMarker, NSObjectProtocol, NSString};
 use objc2_web_kit::{WKScriptMessage, WKScriptMessageHandler, WKUserContentController};
@@ -22,24 +21,18 @@ pub struct WryWebViewDelegateIvars {
   pub ipc_handler: Box<dyn Fn(Request<String>)>,
 }
 
-declare_class!(
+define_class!(
+  #[unsafe(super(NSObject))]
+  #[name = "WryWebViewDelegate"]
+  #[thread_kind = MainThreadOnly]
+  #[ivars = WryWebViewDelegateIvars]
   pub struct WryWebViewDelegate;
 
-  unsafe impl ClassType for WryWebViewDelegate {
-    type Super = NSObject;
-    type Mutability = MainThreadOnly;
-    const NAME: &'static str = "WryWebViewDelegate";
-  }
-
-  impl DeclaredClass for WryWebViewDelegate {
-    type Ivars = WryWebViewDelegateIvars;
-  }
-
   unsafe impl NSObjectProtocol for WryWebViewDelegate {}
 
   unsafe impl WKScriptMessageHandler for WryWebViewDelegate {
     // Function for ipc handler
-    #[method(userContentController:didReceiveScriptMessage:)]
+    #[unsafe(method(userContentController:didReceiveScriptMessage:))]
     fn did_receive(
       this: &WryWebViewDelegate,
       _controller: &WKUserContentController,
@@ -52,9 +45,7 @@ declare_class!(
 
         let ipc_handler = &this.ivars().ipc_handler;
         let body = msg.body();
-        let is_string = Retained::cast::<NSObject>(body.clone()).isKindOfClass(NSString::class());
-        if is_string {
-          let body = Retained::cast::<NSString>(body);
+        if let Ok(body) = body.downcast::<NSString>() {
           let js_utf8 = body.UTF8String();
 
           let frame_info = msg.frameInfo();
@@ -92,9 +83,9 @@ impl WryWebViewDelegate {
         controller,
       });
 
-    let delegate: Retained<Self> = unsafe { msg_send_id![super(delegate), init] };
+    let delegate: Retained<Self> = unsafe { msg_send![super(delegate), init] };
 
-    let proto_delegate = ProtocolObject::from_ref(delegate.as_ref());
+    let proto_delegate = ProtocolObject::from_ref(&*delegate);
     unsafe {
       // this will increate the retain count of the delegate
       delegate.ivars().controller.addScriptMessageHandler_name(

src/wkwebview/class/wry_web_view_parent.rs

@@ -4,9 +4,7 @@
 
 use std::cell::Cell;
 
-use objc2::{
-  declare_class, msg_send_id, mutability::MainThreadOnly, rc::Retained, ClassType, DeclaredClass,
-};
+use objc2::{define_class, msg_send, rc::Retained, DefinedClass, MainThreadOnly};
 #[cfg(target_os = "macos")]
 use objc2_app_kit::{NSApplication, NSEvent, NSView, NSWindow, NSWindowButton};
 use objc2_foundation::MainThreadMarker;
@@ -20,26 +18,17 @@ pub struct WryWebViewParentIvars {
   traffic_light_inset: Cell<Option<(f64, f64)>>,
 }
 
-declare_class!(
+define_class!(
+  #[unsafe(super(NSView))]
+  #[name = "WryWebViewParent"]
+  #[ivars = WryWebViewParentIvars]
   pub struct WryWebViewParent;
 
-  unsafe impl ClassType for WryWebViewParent {
-    type Super = NSView;
-    type Mutability = MainThreadOnly;
-    const NAME: &'static str = "WryWebViewParent";
-  }
-
-  impl DeclaredClass for WryWebViewParent {
-    type Ivars = WryWebViewParentIvars;
-  }
-
-  unsafe impl WryWebViewParent {
+  /// Overridden NSView methods.
+  impl WryWebViewParent {
     #[cfg(target_os = "macos")]
-    #[method(keyDown:)]
-    fn key_down(
-      &self,
-      event: &NSEvent,
-    ) {
+    #[unsafe(method(keyDown:))]
+    fn key_down(&self, event: &NSEvent) {
       let mtm = MainThreadMarker::new().unwrap();
       let app = NSApplication::sharedApplication(mtm);
       unsafe {
@@ -50,10 +39,10 @@ declare_class!(
     }
 
     #[cfg(target_os = "macos")]
-    #[method(drawRect:)]
+    #[unsafe(method(drawRect:))]
     fn draw(&self, _dirty_rect: NSRect) {
       if let Some((x, y)) = self.ivars().traffic_light_inset.get() {
-        unsafe {inset_traffic_lights(&self.window().unwrap(), x, y)};
+        unsafe { inset_traffic_lights(&self.window().unwrap(), x, y) };
       }
     }
   }
@@ -62,13 +51,11 @@ declare_class!(
 impl WryWebViewParent {
   #[allow(dead_code)]
   pub fn new(mtm: MainThreadMarker) -> Retained<Self> {
-    let delegate = mtm
-      .alloc::<WryWebViewParent>()
-      .set_ivars(WryWebViewParentIvars {
-        #[cfg(target_os = "macos")]
-        traffic_light_inset: Default::default(),
-      });
-    unsafe { msg_send_id![super(delegate), init] }
+    let delegate = WryWebViewParent::alloc(mtm).set_ivars(WryWebViewParentIvars {
+      #[cfg(target_os = "macos")]
+      traffic_light_inset: Default::default(),
+    });
+    unsafe { msg_send![super(delegate), init] }
   }
 
   #[cfg(target_os = "macos")]
@@ -89,13 +76,13 @@ impl WryWebViewParent {
 #[cfg(target_os = "macos")]
 pub unsafe fn inset_traffic_lights(window: &NSWindow, x: f64, y: f64) {
   let close = window
-    .standardWindowButton(NSWindowButton::NSWindowCloseButton)
+    .standardWindowButton(NSWindowButton::CloseButton)
     .unwrap();
   let miniaturize = window
-    .standardWindowButton(NSWindowButton::NSWindowMiniaturizeButton)
+    .standardWindowButton(NSWindowButton::MiniaturizeButton)
     .unwrap();
   let zoom = window
-    .standardWindowButton(NSWindowButton::NSWindowZoomButton)
+    .standardWindowButton(NSWindowButton::ZoomButton)
     .unwrap();
 
   let title_bar_container_view = close.superview().unwrap().superview().unwrap();

src/wkwebview/class/wry_web_view_ui_delegate.rs

@@ -6,10 +6,7 @@
 use std::ptr::null_mut;
 
 use block2::Block;
-use objc2::{
-  declare_class, msg_send_id, mutability::MainThreadOnly, rc::Retained, runtime::NSObject,
-  ClassType, DeclaredClass,
-};
+use objc2::{define_class, msg_send, rc::Retained, runtime::NSObject, MainThreadOnly};
 #[cfg(target_os = "macos")]
 use objc2_app_kit::{NSModalResponse, NSModalResponseOK, NSOpenPanel};
 use objc2_foundation::{MainThreadMarker, NSObjectProtocol};
@@ -26,30 +23,24 @@ use crate::WryWebView;
 
 pub struct WryWebViewUIDelegateIvars {}
 
-declare_class!(
+define_class!(
+  #[unsafe(super(NSObject))]
+  #[name = "WryWebViewUIDelegate"]
+  #[thread_kind = MainThreadOnly]
+  #[ivars = WryWebViewUIDelegateIvars]
   pub struct WryWebViewUIDelegate;
 
-  unsafe impl ClassType for WryWebViewUIDelegate {
-    type Super = NSObject;
-    type Mutability = MainThreadOnly;
-    const NAME: &'static str = "WryWebViewUIDelegate";
-  }
-
-  impl DeclaredClass for WryWebViewUIDelegate {
-    type Ivars = WryWebViewUIDelegateIvars;
-  }
-
   unsafe impl NSObjectProtocol for WryWebViewUIDelegate {}
 
   unsafe impl WKUIDelegate for WryWebViewUIDelegate {
     #[cfg(target_os = "macos")]
-    #[method(webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:)]
+    #[unsafe(method(webView:runOpenPanelWithParameters:initiatedByFrame:completionHandler:))]
     fn run_file_upload_panel(
       &self,
       _webview: &WryWebView,
       open_panel_params: &WKOpenPanelParameters,
       _frame: &WKFrameInfo,
-      handler: &block2::Block<dyn Fn(*const NSArray<NSURL>)>
+      handler: &block2::Block<dyn Fn(*const NSArray<NSURL>)>,
     ) {
       unsafe {
         if let Some(mtm) = MainThreadMarker::new() {
@@ -70,14 +61,14 @@ declare_class!(
       }
     }
 
-    #[method(webView:requestMediaCapturePermissionForOrigin:initiatedByFrame:type:decisionHandler:)]
+    #[unsafe(method(webView:requestMediaCapturePermissionForOrigin:initiatedByFrame:type:decisionHandler:))]
     fn request_media_capture_permission(
       &self,
       _webview: &WryWebView,
       _origin: &WKSecurityOrigin,
       _frame: &WKFrameInfo,
       _capture_type: WKMediaCaptureType,
-      decision_handler: &Block<dyn Fn(WKPermissionDecision)>
+      decision_handler: &Block<dyn Fn(WKPermissionDecision)>,
     ) {
       //https://developer.apple.com/documentation/webkit/wkpermissiondecision?language=objc
       (*decision_handler).call((WKPermissionDecision::Grant,));
@@ -90,6 +81,6 @@ impl WryWebViewUIDelegate {
     let delegate = mtm
       .alloc::<WryWebViewUIDelegate>()
       .set_ivars(WryWebViewUIDelegateIvars {});
-    unsafe { msg_send_id![super(delegate), init] }
+    unsafe { msg_send![super(delegate), init] }
   }
 }

src/wkwebview/download.rs

@@ -22,7 +22,7 @@ pub(crate) fn navigation_download_action(
 ) {
   unsafe {
     if let Some(delegate) = &this.ivars().download_delegate {
-      let proto_delegate = ProtocolObject::from_ref(delegate.as_ref());
+      let proto_delegate = ProtocolObject::from_ref(&**delegate);
       download.setDelegate(Some(proto_delegate));
     }
   }
@@ -37,7 +37,7 @@ pub(crate) fn navigation_download_response(
 ) {
   unsafe {
     if let Some(delegate) = &this.ivars().download_delegate {
-      let proto_delegate = ProtocolObject::from_ref(delegate.as_ref());
+      let proto_delegate = ProtocolObject::from_ref(&**delegate);
       download.setDelegate(Some(proto_delegate));
     }
   }

src/wkwebview/drag_drop.rs

@@ -5,8 +5,7 @@
 use std::{ffi::CStr, path::PathBuf};
 
 use objc2::{
-  rc::Id,
-  runtime::{AnyObject, Bool, ProtocolObject},
+  runtime::{Bool, ProtocolObject},
   DeclaredClass,
 };
 use objc2_app_kit::{NSDragOperation, NSDraggingInfo, NSFilenamesPboardType};
@@ -23,8 +22,9 @@ pub(crate) unsafe fn collect_paths(drag_info: &ProtocolObject<dyn NSDraggingInfo
 
   if pb.availableTypeFromArray(&types).is_some() {
     let paths = pb.propertyListForType(NSFilenamesPboardType).unwrap();
-    let paths: Id<NSArray<NSString>> = Id::<AnyObject>::cast(paths.clone());
-    for path in paths.to_vec() {
+    let paths = paths.downcast::<NSArray>().unwrap();
+    for path in paths {
+      let path = path.downcast::<NSString>().unwrap();
       let path = CStr::from_ptr(path.UTF8String()).to_string_lossy();
       drag_drop_paths.push(PathBuf::from(path.into_owned()));
     }

src/wkwebview/ios/WKWebView.rs

@@ -35,14 +35,15 @@ use objc2::runtime::Bool;
 use objc2::{
   rc::Retained,
   runtime::{AnyObject, NSObject, ProtocolObject},
-  ClassType, DeclaredClass,
+  AllocAnyThread, DeclaredClass, MainThreadOnly, Message,
 };
 #[cfg(target_os = "macos")]
 use objc2_app_kit::{NSApplication, NSAutoresizingMaskOptions, NSTitlebarSeparatorStyle, NSView};
 #[cfg(target_os = "macos")]
-use objc2_foundation::CGSize;
+use objc2_core_foundation::CGSize;
+use objc2_core_foundation::{CGPoint, CGRect};
 use objc2_foundation::{
-  ns_string, CGPoint, CGRect, MainThreadMarker, NSArray, NSBundle, NSDate, NSError, NSHTTPCookie,
+  ns_string, MainThreadMarker, NSArray, NSBundle, NSDate, NSError, NSHTTPCookie,
   NSHTTPCookieSameSiteLax, NSHTTPCookieSameSiteStrict, NSJSONSerialization, NSMutableURLRequest,
   NSNumber, NSObjectNSKeyValueCoding, NSObjectProtocol, NSString, NSUTF8StringEncoding, NSURL,
   NSUUID,
@@ -70,8 +71,8 @@ use once_cell::sync::Lazy;
 use raw_window_handle::{HasWindowHandle, RawWindowHandle};
 
 use std::{
-  collections::{HashMap, HashSet},
-  ffi::{c_void, CString},
+  collections::HashSet,
+  ffi::{c_void, CStr, CString},
   net::Ipv4Addr,
   os::raw::c_char,
   panic::AssertUnwindSafe,
@@ -114,6 +115,7 @@ pub struct PrintOptions {
 
 pub(crate) struct InnerWebView {
   id: String,
+  mtm: MainThreadMarker,
   pub webview: Retained<WryWebView>,
   pub manager: Retained<WKUserContentController>,
   data_store: Retained<WKWebsiteDataStore>,
@@ -194,7 +196,7 @@ impl InnerWebView {
 
     // Safety: objc runtime calls are unsafe
     unsafe {
-      let config = WKWebViewConfiguration::new();
+      let config = WKWebViewConfiguration::new(mtm);
 
       // Incognito mode
       let (os_major_version, _, _) = util::operating_system_version();
@@ -208,14 +210,14 @@ impl InnerWebView {
         custom_data_store_available,
         pl_attrs.data_store_identifier,
       ) {
-        (true, _, _) => WKWebsiteDataStore::nonPersistentDataStore(),
+        (true, _, _) => WKWebsiteDataStore::nonPersistentDataStore(mtm),
         // if data_store_identifier is given and custom data stores are available, use custom store
         (false, true, Some(data_store)) => {
           let identifier = NSUUID::from_bytes(data_store);
-          WKWebsiteDataStore::dataStoreForIdentifier(&identifier)
+          WKWebsiteDataStore::dataStoreForIdentifier(&identifier, mtm)
         }
         // default data store
-        _ => WKWebsiteDataStore::defaultDataStore(),
+        _ => WKWebsiteDataStore::defaultDataStore(mtm),
       };
 
       // Register Custom Protocols
@@ -226,11 +228,17 @@ impl InnerWebView {
         let function = Box::into_raw(Box::new(function));
         protocol_ptrs.push(function);
 
-        let ivar = (*handler).class().instance_variable("function").unwrap();
+        let ivar = (*handler)
+          .class()
+          .instance_variable(CStr::from_bytes_with_nul(b"function\0").unwrap())
+          .unwrap();
         let ivar_delegate = ivar.load_mut(&mut *handler);
         *ivar_delegate = function as *mut _ as *mut c_void;
 
-        let ivar = (*handler).class().instance_variable("webview_id").unwrap();
+        let ivar = (*handler)
+          .class()
+          .instance_variable(CStr::from_bytes_with_nul(b"webview_id\0").unwrap())
+          .unwrap();
         let ivar_delegate: &mut *mut c_char = ivar.load_mut(&mut *handler);
         *ivar_delegate = CString::new(webview_id.as_bytes()).unwrap().into_raw();
 
@@ -247,7 +255,7 @@ impl InnerWebView {
 
       // WebView and manager
       let manager = config.userContentController();
-      let webview = mtm.alloc::<WryWebView>().set_ivars(WryWebViewIvars {
+      let webview = WryWebView::alloc(mtm).set_ivars(WryWebViewIvars {
         is_child,
         #[cfg(target_os = "macos")]
         drag_drop_handler: match attributes.drag_drop_handler {
@@ -256,7 +264,7 @@ impl InnerWebView {
         },
         #[cfg(target_os = "macos")]
         accept_first_mouse: Bool::new(attributes.accept_first_mouse),
-        custom_protocol_task_ids: HashMap::new(),
+        custom_protocol_task_ids: Default::default(),
       });
 
       config.setWebsiteDataStore(&data_store);
@@ -289,9 +297,7 @@ impl InnerWebView {
       config.setValue_forKey(Some(&_yes), ns_string!("allowsInlineMediaPlayback"));
 
       if attributes.autoplay {
-        config.setMediaTypesRequiringUserActionForPlayback(
-          WKAudiovisualMediaTypes::WKAudiovisualMediaTypeNone,
-        );
+        config.setMediaTypesRequiringUserActionForPlayback(WKAudiovisualMediaTypes::None);
       }
 
       #[cfg(feature = "transparent")]
@@ -341,14 +347,14 @@ impl InnerWebView {
           size: CGSize::new(w as f64, h as f64),
         };
         let webview: Retained<WryWebView> =
-          objc2::msg_send_id![super(webview), initWithFrame:frame configuration:&**config];
+          objc2::msg_send![super(webview), initWithFrame: frame, configuration: &**config];
         webview
       };
       #[cfg(target_os = "ios")]
       let webview = {
         let frame = ns_view.frame();
         let webview: Retained<WryWebView> =
-          objc2::msg_send_id![super(webview), initWithFrame:frame configuration:&**config];
+          objc2::msg_send![super(webview), initWithFrame: frame, configuration: &**config];
         webview
       };
 
@@ -382,12 +388,12 @@ impl InnerWebView {
       {
         if is_child {
           // fixed element
-          webview.setAutoresizingMask(NSAutoresizingMaskOptions::NSViewMinYMargin);
+          webview.setAutoresizingMask(NSAutoresizingMaskOptions::ViewMinYMargin);
         } else {
           // Auto-resize
           webview.setAutoresizingMask(
-            NSAutoresizingMaskOptions::NSViewHeightSizable
-              | NSAutoresizingMaskOptions::NSViewWidthSizable,
+            NSAutoresizingMaskOptions::ViewHeightSizable
+              | NSAutoresizingMaskOptions::ViewWidthSizable,
           );
         }
 
@@ -406,7 +412,7 @@ impl InnerWebView {
         // disable scroll bounce by default
         // https://developer.apple.com/documentation/webkit/wkwebview/1614784-scrollview?language=objc
         // But not exist in objc2-web-kit
-        let scroll_view: Retained<UIScrollView> = objc2::msg_send_id![&webview, scrollView];
+        let scroll_view: Retained<UIScrollView> = objc2::msg_send![&webview, scrollView];
         // let scroll_view: Retained<UIScrollView> = webview.ivars().scrollView; // FIXME: not test yet
         scroll_view.setBounces(false)
       }
@@ -471,12 +477,11 @@ impl InnerWebView {
         mtm,
       );
 
-      let proto_navigation_policy_delegate =
-        ProtocolObject::from_ref(navigation_policy_delegate.as_ref());
+      let proto_navigation_policy_delegate = ProtocolObject::from_ref(&*navigation_policy_delegate);
       webview.setNavigationDelegate(Some(proto_navigation_policy_delegate));
 
       let ui_delegate: Retained<WryWebViewUIDelegate> = WryWebViewUIDelegate::new(mtm);
-      let proto_ui_delegate = ProtocolObject::from_ref(ui_delegate.as_ref());
+      let proto_ui_delegate = ProtocolObject::from_ref(&*ui_delegate);
       webview.setUIDelegate(Some(proto_ui_delegate));
 
       // ns window is required for the print operation
@@ -492,6 +497,7 @@ impl InnerWebView {
 
       let mut w = Self {
         id: webview_id,
+        mtm,
         webview: webview.clone(),
         manager: manager.clone(),
         ns_view: ns_view.retain(),
@@ -547,8 +553,8 @@ r#"Object.defineProperty(window, 'ipc', {
           }
 
           parent_view.setAutoresizingMask(
-            NSAutoresizingMaskOptions::NSViewHeightSizable
-              | NSAutoresizingMaskOptions::NSViewWidthSizable,
+            NSAutoresizingMaskOptions::ViewHeightSizable
+              | NSAutoresizingMaskOptions::ViewWidthSizable,
           );
           parent_view.addSubview(&webview.clone());
 
@@ -607,7 +613,7 @@ r#"Object.defineProperty(window, 'ipc', {
             if !val.is_null() {
               let json_ns_data = NSJSONSerialization::dataWithJSONObject_options_error(
                 &*val,
-                objc2_foundation::NSJSONWritingOptions::NSJSONWritingFragmentsAllowed,
+                objc2_foundation::NSJSONWritingOptions::FragmentsAllowed,
               )
               .unwrap();
               let json_string = NSString::alloc();
@@ -647,7 +653,7 @@ r#"Object.defineProperty(window, 'ipc', {
   fn init(&self, js: &str, for_main_only: bool) {
     // Safety: objc runtime calls are unsafe
     unsafe {
-      let userscript = WKUserScript::alloc();
+      let userscript = WKUserScript::alloc(self.mtm);
       let script = WKUserScript::initWithSource_injectionTime_forMainFrameOnly(
         userscript,
         &NSString::from_str(js),
@@ -675,7 +681,7 @@ r#"Object.defineProperty(window, 'ipc', {
     unsafe {
       let config = self.webview.configuration();
       let store = config.websiteDataStore();
-      let all_data_types = WKWebsiteDataStore::allWebsiteDataTypes();
+      let all_data_types = WKWebsiteDataStore::allWebsiteDataTypes(self.mtm);
       let date = NSDate::dateWithTimeIntervalSince1970(0.0);
       let handler = block2::RcBlock::new(|| {});
       store.removeDataOfTypes_modifiedSince_completionHandler(&all_data_types, &date, &handler);
@@ -687,7 +693,7 @@ r#"Object.defineProperty(window, 'ipc', {
     // Safety: objc runtime calls are unsafe
     unsafe {
       let url = NSURL::URLWithString(&NSString::from_str(url)).unwrap();
-      let mut request = NSMutableURLRequest::requestWithURL(&url);
+      let request = NSMutableURLRequest::requestWithURL(&url);
       if let Some(headers) = headers {
         for (name, value) in headers.iter() {
           let key = NSString::from_str(name.as_str());
@@ -763,7 +769,7 @@ r#"Object.defineProperty(window, 'ipc', {
     #[cfg(target_os = "macos")]
     unsafe {
       // taken from <https://github.com/WebKit/WebKit/blob/784f93cb80a386c29186c510bba910b67ce3adc1/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm#L1939>
-      let tool: Retained<AnyObject> = objc2::msg_send_id![&self.webview, _inspector];
+      let tool: Retained<AnyObject> = objc2::msg_send![&self.webview, _inspector];
       let () = objc2::msg_send![&tool, show];
     }
   }
@@ -773,7 +779,7 @@ r#"Object.defineProperty(window, 'ipc', {
     #[cfg(target_os = "macos")]
     unsafe {
       // taken from <https://github.com/WebKit/WebKit/blob/784f93cb80a386c29186c510bba910b67ce3adc1/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm#L1939>
-      let tool: Retained<AnyObject> = objc2::msg_send_id![&self.webview, _inspector];
+      let tool: Retained<AnyObject> = objc2::msg_send![&self.webview, _inspector];
       let () = objc2::msg_send![&tool, close];
     }
   }
@@ -783,7 +789,7 @@ r#"Object.defineProperty(window, 'ipc', {
     #[cfg(target_os = "macos")]
     unsafe {
       // taken from <https://github.com/WebKit/WebKit/blob/784f93cb80a386c29186c510bba910b67ce3adc1/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm#L1939>
-      let tool: Retained<AnyObject> = objc2::msg_send_id![&self.webview, _inspector];
+      let tool: Retained<AnyObject> = objc2::msg_send![&self.webview, _inspector];
       let is_visible: bool = objc2::msg_send![&tool, isVisible];
       is_visible
     }
@@ -889,8 +895,8 @@ r#"Object.defineProperty(window, 'ipc', {
 
     let same_site = cookie.sameSitePolicy();
     let same_site = match same_site {
-      Some(policy) if policy.as_ref() == NSHTTPCookieSameSiteLax => cookie::SameSite::Lax,
-      Some(policy) if policy.as_ref() == NSHTTPCookieSameSiteStrict => cookie::SameSite::Strict,
+      Some(policy) if &*policy == NSHTTPCookieSameSiteLax => cookie::SameSite::Lax,
+      Some(policy) if &*policy == NSHTTPCookieSameSiteStrict => cookie::SameSite::Strict,
       _ => cookie::SameSite::None,
     };
     cookie_builder = cookie_builder.same_site(same_site);
@@ -948,7 +954,7 @@ r#"Object.defineProperty(window, 'ipc', {
             let cookies = cookies
               .to_vec()
               .into_iter()
-              .map(|cookie| Self::cookie_from_wkwebview(cookie))
+              .map(|cookie| Self::cookie_from_wkwebview(&cookie))
               .collect();
             let _ = tx.send(cookies);
           },
@@ -1003,7 +1009,7 @@ pub fn platform_webview_version() -> Result<String> {
     let webkit_version = dict
       .objectForKey(&NSString::from_str("CFBundleVersion"))
       .unwrap();
-    let webkit_version = Retained::cast::<NSString>(webkit_version);
+    let webkit_version = webkit_version.downcast::<NSString>().unwrap();
 
     bundle.unload();
     Ok(webkit_version.to_string())