Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Tauri (2.2.0) and plugin dependencies #234

Merged
merged 20 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f85a795
Update Tauri (2.2.0) and plugins
ItsEeleeya Jan 9, 2025
3b5dc7d
enable"specta" feature on tauri and remove unnecessary code
ItsEeleeya Jan 9, 2025
e5e98eb
preparescript: avoid re-download if sidecar exists
ItsEeleeya Jan 9, 2025
347a9e1
Merge branch 'main' into fix-windows-inner-size
ItsEeleeya Jan 9, 2025
a241590
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 13, 2025
57c9042
Update Cargo.lock
ItsEeleeya Jan 13, 2025
cc5bfac
Update Cargo.lock
ItsEeleeya Jan 13, 2025
3442833
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 13, 2025
60cca2f
Remove unused wrong import and update cargo lock
ItsEeleeya Jan 13, 2025
8e4a836
display_for_window and get_monitor_refresh_rate platform impls
ItsEeleeya Jan 13, 2025
63d3b25
more windows impl
ItsEeleeya Jan 13, 2025
ff0bc5e
Windows hw device
ItsEeleeya Jan 14, 2025
ea81267
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 14, 2025
3670144
Update todo comment
ItsEeleeya Jan 14, 2025
3822f7a
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 14, 2025
a298990
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 14, 2025
e17ca16
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 14, 2025
fb25e29
Merge remote-tracking branch 'upstream/main' into fix-windows-inner-size
ItsEeleeya Jan 18, 2025
da00339
Bump tauri version, fixing specta version
ItsEeleeya Jan 19, 2025
462ceff
Merge branch 'main' into fix-windows-inner-size
Brendonovich Jan 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading