Skip to content

Commit

Permalink
Update Tauri (2.2.0) and plugin dependencies (#234)
Browse files Browse the repository at this point in the history
* Update Tauri (2.2.0) and plugins

* enable"specta" feature on tauri and remove unnecessary code

* preparescript: avoid re-download if sidecar exists

* Update Cargo.lock

* Update Cargo.lock

* Remove unused wrong import and update cargo lock

* display_for_window and get_monitor_refresh_rate platform impls

* more windows impl

* Windows hw device

* Update todo comment

* Bump tauri version, fixing specta version

---------

Co-authored-by: Brendan Allan <[email protected]>
  • Loading branch information
ItsEeleeya and Brendonovich authored Jan 20, 2025
1 parent 3c13469 commit 9658ba8
Show file tree
Hide file tree
Showing 11 changed files with 201 additions and 225 deletions.
105 changes: 47 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ tokio = { version = "1.39.3", features = [
"rt-multi-thread",
"time",
] }
tauri = { version = "2.1.1" }
specta = { version = "=2.0.0-rc.20" }
tauri = { version = "2.2.3", features = [ "specta" ] }
specta = { version = "=2.0.0-rc.20", features = [ "derive" ] }

scap = { git = "https://github.com/CapSoftware/scap", rev = "58d4410bf52f" }
nokhwa = { git = "https://github.com/CapSoftware/nokhwa", rev = "d37141b1883d", features = [
"input-native",
Expand Down
3 changes: 1 addition & 2 deletions apps/desktop/scripts/prepare.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,7 @@ async function main() {
}

main().catch((err) => {
console.error("--- Preparation Failed");
console.error("\n--- Preparation Failed");
console.error(err);
console.error("---");
process.exit(1);
});
19 changes: 9 additions & 10 deletions apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,17 @@ tauri = { workspace = true, features = [
"image-png",
] }
tauri-specta = { version = "=2.0.0-rc.20", features = ["derive", "typescript"] }
tauri-plugin-dialog = "2.0.0"
tauri-plugin-dialog = "2.2.0"
tauri-plugin-fs = "2.2.0"
tauri-plugin-global-shortcut = "2.1.0"
tauri-plugin-http = "2.1.0"
tauri-plugin-notification = "2.1.0"
tauri-plugin-os = "2.1.0"
tauri-plugin-process = "2.0.1"
tauri-plugin-shell = "2.1.0"
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\"))".dependencies]
tauri-plugin-single-instance = { version = "2.2.1", features = ["deep-link"] }
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 = "2.2.0"
tauri-plugin-store = "2.2.0"
tauri-plugin-updater = "2.2.0"
tauri-plugin-updater = "2.3.1"
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"
Expand Down
Loading

1 comment on commit 9658ba8

@vercel
Copy link

@vercel vercel bot commented on 9658ba8 Jan 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.