Refactors in windows.rs, Bump tauri and tauri plugin and objc2-* crate versions

Cargo.toml

@@ -1,6 +1,11 @@
 [workspace]
 resolver = "2"
-members = ["apps/cli", "apps/desktop/src-tauri", "crates/*", "crates/workspace-hack"]
+members = [
+    "apps/cli",
+    "apps/desktop/src-tauri",
+    "crates/*",
+    "crates/workspace-hack",
+]
 
 [workspace.dependencies]
 anyhow = { version = "1.0.86" }
@@ -17,7 +22,7 @@ tokio = { version = "1.39.3", features = [
     "rt-multi-thread",
     "time",
 ] }
-tauri = { version = "2.5.0", features = ["specta"] }
+tauri = { version = "2.9.3", features = ["specta"] }
 specta = { version = "=2.0.0-rc.20", features = [
     "derive",
     "serde_json",
@@ -52,6 +57,7 @@ cidre = { git = "https://github.com/CapSoftware/cidre", rev = "bf84b67079a8", fe
     "async",
     "dispatch",
 ], default-features = false }
+objc2 = "0.6.1"
 
 windows = "0.60.0"
 windows-core = "0.60"

apps/desktop/package.json

@@ -73,7 +73,7 @@
 	"devDependencies": {
 		"@fontsource/geist-sans": "^5.0.3",
 		"@iconify/json": "^2.2.239",
-		"@tauri-apps/cli": ">=2.1.0",
+		"@tauri-apps/cli": "^2.9.4",
 		"@total-typescript/ts-reset": "^0.6.1",
 		"@types/dom-webcodecs": "^0.1.11",
 		"@types/uuid": "^9.0.8",

apps/desktop/src-tauri/Cargo.toml

@@ -20,30 +20,30 @@ swift-rs = { version = "1.0.6", features = ["build"] }
 
 [dependencies]
 tauri = { workspace = true, features = [
-	"macos-private-api",
-	"protocol-asset",
-	"tray-icon",
-	"image-png",
-	"devtools",
+    "macos-private-api",
+    "protocol-asset",
+    "tray-icon",
+    "image-png",
+    "devtools",
 ] }
 tauri-specta = { version = "=2.0.0-rc.20", features = ["derive", "typescript"] }
-tauri-plugin-dialog = "2.2.0"
-tauri-plugin-fs = "2.2.0"
-tauri-plugin-global-shortcut = "2.2.0"
-tauri-plugin-http = "2.2.0"
-tauri-plugin-notification = "2.2.0"
-tauri-plugin-os = "2.2.0"
-tauri-plugin-process = "2.2.0"
-tauri-plugin-shell = "2.2.0"
-tauri-plugin-single-instance = { version = "2.2.0", features = ["deep-link"] }
-tauri-plugin-store = "2.2.0"
+tauri-plugin-dialog = "2.4.0"
+tauri-plugin-fs = "2.4.2"
+tauri-plugin-global-shortcut = "2.3.0"
+tauri-plugin-http = "2.5.2"
+tauri-plugin-notification = "2.3.1"
+tauri-plugin-os = "2.3.1"
+tauri-plugin-process = "2.3.0"
+tauri-plugin-shell = "2.3.1"
+tauri-plugin-single-instance = { version = "2.3.4", features = ["deep-link"] }
+tauri-plugin-store = "2.4.0"
 tauri-plugin-updater = "2.9.0"
 tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "v2" }
-tauri-plugin-window-state = "2.2.0"
-tauri-plugin-positioner = "2.2.0"
-tauri-plugin-deep-link = "2.2.0"
-tauri-plugin-clipboard-manager = "2.2.1"
-tauri-plugin-opener = "2.2.6"
+tauri-plugin-window-state = "2.4.0"
+tauri-plugin-positioner = "2.3.0"
+tauri-plugin-deep-link = "2.4.3"
+tauri-plugin-clipboard-manager = "2.3.0"
+tauri-plugin-opener = "2.5.0"
 
 serde = { workspace = true }
 serde_json = "1.0.111"
@@ -109,32 +109,34 @@ async-stream = "0.3.6"
 tracing-futures = { version = "0.2.5", features = ["futures-03"] }
 tracing-opentelemetry = "0.32.0"
 opentelemetry = "0.31.0"
-opentelemetry-otlp = "0.31.0" #{ version = , features = ["http-proto", "reqwest-client"] }
+opentelemetry-otlp = "0.31.0"                                                 #{ version = , features = ["http-proto", "reqwest-client"] }
 opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio", "trace"] }
 posthog-rs = "0.3.7"
 workspace-hack = { version = "0.1", path = "../../../crates/workspace-hack" }
 
 
 [target.'cfg(target_os = "macos")'.dependencies]
-core-graphics = "0.24.0"
-core-foundation = "0.10.0"
-objc2-app-kit = { version = "0.3.0", features = [
-	"NSWindow",
-	"NSResponder",
-	"NSHapticFeedback",
+objc2.workspace = true
+dispatch2 = "0.3.0"
+block2 = "0.6.2"
+objc2-foundation = "0.3.2"
+objc2-application-services = "0.3.2"
+objc2-core-foundation = "0.3.2"
+objc2-core-graphics = "0.3.2"
+objc2-app-kit = { version = "0.3.2", features = [
+    "NSWindow",
+    "NSResponder",
+    "NSHapticFeedback",
 ] }
-cocoa = "0.26.0"
-objc = "0.2.7"
-swift-rs = "1.0.6"
 tauri-nspanel = { git = "https://github.com/ahkohd/tauri-nspanel", branch = "v2" }
 cidre = { workspace = true }
 
 [target.'cfg(target_os= "windows")'.dependencies]
 windows = { workspace = true, features = [
-	"Win32_Foundation",
-	"Win32_System",
-	"Win32_UI_WindowsAndMessaging",
-	"Win32_Graphics_Gdi",
+    "Win32_Foundation",
+    "Win32_System",
+    "Win32_UI_WindowsAndMessaging",
+    "Win32_Graphics_Gdi",
 ] }
 windows-sys = { workspace = true }
 

apps/desktop/src-tauri/src/deeplink_actions.rs

@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 use tauri::{AppHandle, Manager, Url};
 use tracing::trace;
 
-use crate::{App, ArcLock, recording::StartRecordingInputs, windows::ShowCapWindow};
+use crate::{App, ArcLock, recording::StartRecordingInputs, windows::CapWindow};
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -150,7 +150,7 @@ impl DeepLinkAction {
                 crate::open_project_from_path(Path::new(&project_path), app.clone())
             }
             DeepLinkAction::OpenSettings { page } => {
-                crate::show_window(app.clone(), ShowCapWindow::Settings { page }).await
+                crate::show_window(app.clone(), CapWindow::Settings { page }).await
             }
         }
     }

apps/desktop/src-tauri/src/hotkeys.rs

@@ -1,6 +1,6 @@
 use crate::{
     RequestOpenRecordingPicker, RequestStartRecording, recording,
-    recording_settings::RecordingTargetMode, windows::ShowCapWindow,
+    recording_settings::RecordingTargetMode, windows::CapWindow,
 };
 use global_hotkey::HotKeyState;
 use serde::{Deserialize, Serialize};
@@ -96,7 +96,7 @@ pub fn init(app: &AppHandle) {
                 if shortcut.key == Code::Comma && shortcut.mods == Modifiers::META {
                     let app = app.clone();
                     tokio::spawn(async move {
-                        let _ = ShowCapWindow::Settings { page: None }.show(&app).await;
+                        let _ = CapWindow::Settings { page: None }.show(&app).await;
                     });
                 }