upgrade to tauri 2.2.0

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "creddy"
-version = "0.6.4"
+version = "0.6.5"
 description = "A friendly AWS credentials manager"
 authors = ["Joseph Montanaro"]
 license = ""
@@ -27,11 +27,11 @@ windows = { version = "0.51.1", features = ["Win32_Foundation", "Win32_System_Pi
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta", features = [] }
+tauri-build = { version = "2.0.4", features = [] }
 
 [dependencies]
 creddy_cli = { path = "./creddy_cli" }
-tauri = { version = "2.0.0-beta", features = ["tray-icon", "test"] }
+tauri = { version = "2.2.0", features = ["tray-icon", "test"] }
 sodiumoxide = "0.2.7"
 sysinfo = "0.26.8"
 aws-config = "1.5.3"
@@ -49,9 +49,9 @@ argon2 = { version = "0.5.0", features = ["std"] }
 chacha20poly1305 = { version = "0.10.1", features = ["std"] }
 which = "4.4.0"
 time = "0.3.31"
-tauri-plugin-global-shortcut = "2.0.0-beta.6"
-tauri-plugin-os = "2.0.0-beta.6"
-tauri-plugin-dialog = "2.0.0-beta.9"
+tauri-plugin-global-shortcut = "2.2.0"
+tauri-plugin-os = "2.2.0"
+tauri-plugin-dialog = "2.2.0"
 rfd = "0.13.0"
 ssh-agent-lib = "0.4.0"
 ssh-key = { version = "0.6.6", features = ["rsa", "ed25519", "encryption"] }

src-tauri/capabilities/migrated.json

@@ -6,13 +6,13 @@
     "main"
   ],
   "permissions": [
-    "path:default",
-    "event:default",
-    "window:default",
-    "app:default",
-    "resources:default",
-    "menu:default",
-    "tray:default",
+    "core:path:default",
+    "core:event:default",
+    "core:window:default",
+    "core:app:default",
+    "core:resources:default",
+    "core:menu:default",
+    "core:tray:default",
     "os:allow-os-type",
     "dialog:allow-open"
   ]

src-tauri/creddy_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "creddy_cli"
-version = "0.6.4"
+version = "0.6.5"
 edition = "2021"
 
 [dependencies]

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","os:allow-os-type","dialog:allow-open"]}}
+{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","os:allow-os-type","dialog:allow-open"]}}

src-tauri/src/config.rs

@@ -111,7 +111,6 @@ impl AppConfig {
     pub async fn match_auto_launch(&mut self, pool: &SqlitePool) -> Result<(), SetupError> {
         let mgr = self.auto_launch_manager()?;
         let is_enabled = mgr.is_enabled()?;
-        dbg!(is_enabled);
         if is_enabled != self.start_on_login {
             self.start_on_login = is_enabled;
             self.save(pool).await?;

src-tauri/src/shortcuts.rs

@@ -44,10 +44,7 @@ fn launch_terminal() {
 pub fn register_hotkeys(hotkeys: &HotkeysConfig) -> Result<(), ShortcutError> {
     let app = APP.get().unwrap();
     let shortcuts = app.global_shortcut();
-    shortcuts.unregister_all([
-        hotkeys.show_window.keys.as_str(),
-        hotkeys.launch_terminal.keys.as_str(),
-    ])?;
+    shortcuts.unregister_all()?;
 
     if hotkeys.show_window.enabled {
         shortcuts.on_shortcut(

src-tauri/src/srv/mod.rs

@@ -3,6 +3,7 @@ use std::future::Future;
 use tauri::{
     AppHandle,
     async_runtime as rt,
+    Emitter,
     Manager,
     Runtime,
 };

src-tauri/src/state.rs

@@ -11,6 +11,7 @@ use ssh_agent_lib::proto::message::Identity;
 use sqlx::SqlitePool;
 use sqlx::types::Uuid;
 use tauri::{
+    Emitter,
     Manager,
     async_runtime as rt,
 };

src-tauri/src/terminal.rs

@@ -1,7 +1,11 @@
 use std::process::Command;
 use std::time::Duration;
 
-use tauri::{AppHandle, Manager};
+use tauri::{
+    AppHandle,
+    Listener,
+    Manager,
+};
 use tokio::time::sleep;
 
 use crate::app::APP;

src-tauri/src/tray.rs

@@ -11,6 +11,7 @@ use tauri::menu::{
     MenuItemBuilder,
     PredefinedMenuItem,
 };
+use tauri::tray::TrayIconBuilder;
 
 use crate::app;
 use crate::state::AppState;
@@ -67,11 +68,14 @@ pub fn setup(app: &App) -> tauri::Result<()> {
     let exit = MenuItemBuilder::with_id("exit", "Exit").build(app)?;
 
     let menu = MenuBuilder::new(app)
-        .items(&[&status, &sep, &show_hide, &exit]);
+        .items(&[&status, &sep, &show_hide, &exit])
+        .build()?;
 
-    let tray = app.tray_by_id("main").unwrap();
-    tray.set_menu(Some(menu.build()?))?;
-    tray.on_menu_event(handle_event);
+    TrayIconBuilder::new()
+        .icon(app.default_window_icon().unwrap().clone())
+        .menu(&menu)
+        .on_menu_event(handle_event)
+        .build(app)?;
 
     // stash these so we can find them later to change the text
     app.manage(MenuItems { status, show_hide });

src-tauri/tauri.conf.json

@@ -50,7 +50,7 @@
     }
   },
   "productName": "creddy",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "identifier": "creddy",
   "plugins": {},
   "app": {
@@ -65,11 +65,6 @@
         "visible": false
       }
     ],
-    "trayIcon": {
-      "id": "main",
-      "iconPath": "icons/icon.png",
-      "iconAsTemplate": true
-    },
     "security": {
       "csp": {
         "style-src": [