From c2ba0c8b7611f57bb07eda1958aabdae1394ce63 Mon Sep 17 00:00:00 2001 From: Tw93 Date: Sun, 10 Nov 2024 22:25:37 +0800 Subject: [PATCH] :construction: tauri 2.0 --- src-tauri/Cargo.lock | 38 +++++++++++++------------------ src-tauri/Cargo.toml | 18 +++++++-------- src-tauri/src/app/menu.rs | 2 +- src-tauri/tauri.conf.json | 14 ++++++------ src-tauri/tauri.linux.conf.json | 36 ++++++++++++++--------------- src-tauri/tauri.macos.conf.json | 1 + src-tauri/tauri.windows.conf.json | 1 + 7 files changed, 53 insertions(+), 57 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index e75a04d..231fd77 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -293,9 +293,9 @@ dependencies = [ [[package]] name = "cargo-bloat" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac0d2f3bae7849957392be201f47a0f70409a2e1b335b17a7c85e3ce48a6e092" +checksum = "56e2c483ab55e38021c2c701061e078cc6c28d563932cbdf6bc4efaa28ab117e" dependencies = [ "binfarce", "json", @@ -363,7 +363,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.11.0", + "uuid", ] [[package]] @@ -2030,9 +2030,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2096,9 +2096,9 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "ndk" @@ -2476,13 +2476,13 @@ dependencies = [ [[package]] name = "pdb" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f4d162ecaaa1467de5afbe62d597757b674b51da8bb4e587430c5fdb2af7aa" +checksum = "82040a392923abe6279c00ab4aff62d5250d1c8555dc780e4b02783a7aa74863" dependencies = [ "fallible-iterator", "scroll", - "uuid 0.8.2", + "uuid", ] [[package]] @@ -3139,7 +3139,7 @@ dependencies = [ "serde", "serde_json", "url", - "uuid 1.11.0", + "uuid", ] [[package]] @@ -3162,9 +3162,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" [[package]] name = "selectors" @@ -3734,7 +3734,7 @@ dependencies = [ "thiserror 2.0.2", "time", "url", - "uuid 1.11.0", + "uuid", "walkdir", ] @@ -3802,7 +3802,7 @@ dependencies = [ "tauri-plugin", "thiserror 1.0.69", "url", - "uuid 1.11.0", + "uuid", ] [[package]] @@ -3950,7 +3950,7 @@ dependencies = [ "toml 0.8.2", "url", "urlpattern", - "uuid 1.11.0", + "uuid", "walkdir", ] @@ -4388,12 +4388,6 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - [[package]] name = "uuid" version = "1.11.0" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 2045277..1bdafb3 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -16,21 +16,21 @@ crate-type = ["staticlib", "cdylib", "lib"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.0-rc.0", features = [] } +tauri-build = { version = "2.0.3", features = [] } [dependencies] -serde_json = "1.0.116" -serde = { version = "1.0.200", features = ["derive"] } -tauri = { version = "2.0.0-rc.0", features = ["tray-icon", "image-ico", "image-png", "macos-proxy"] } -tauri-plugin-window-state = "2.0.0" +serde_json = "1.0.132" +serde = { version = "1.0.214", features = ["derive"] } +tauri = { version = "2.1.0", features = ["tray-icon", "image-ico", "image-png", "macos-proxy"] } +tauri-plugin-window-state = "2.0.2" tauri-plugin-oauth = "2" -tauri-plugin-clipboard-manager = "2.0.0" -tauri-plugin-http = "2.0.0" +tauri-plugin-clipboard-manager = "2.0.2" +tauri-plugin-http = "2.0.3" [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] -tauri-plugin-global-shortcut = { version = "2.0.0" } +tauri-plugin-global-shortcut = { version = "2.0.1" } [dev-dependencies] -cargo-bloat = "0.11.1" +cargo-bloat = "0.12.1" [features] # this feature is used for development builds from development cli diff --git a/src-tauri/src/app/menu.rs b/src-tauri/src/app/menu.rs index 62b3ec3..d74eba3 100644 --- a/src-tauri/src/app/menu.rs +++ b/src-tauri/src/app/menu.rs @@ -1,7 +1,7 @@ use tauri::{ image::Image, menu::{MenuBuilder, MenuItemBuilder}, - tray::{MouseButtonState, TrayIconBuilder, TrayIconEvent, MouseButton}, + tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent}, AppHandle, Manager, }; use tauri_plugin_window_state::{AppHandleExt, StateFlags}; diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c9dbd77..59a0268 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,13 +1,8 @@ { - "build": { - "beforeBuildCommand": "", - "frontendDist": "../dist", - "beforeDevCommand": "" - }, - "plugins": {}, "productName": "WeRead", - "identifier":"com.pake.weread", + "identifier": "com.pake.weread", "version": "1.0.0", + "plugins": {}, "app": { "security": { "csp": null @@ -18,5 +13,10 @@ "id": "pake-tray" }, "withGlobalTauri": true + }, + "build": { + "beforeBuildCommand": "", + "frontendDist": "../dist", + "beforeDevCommand": "" } } diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index d33a345..cb9f1f2 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -1,21 +1,21 @@ { + "productName": "weread", "identifier": "com.pake.weread", - - "bundle": { - "icon": ["png/weread_512.png"], - "active": true, - "category": "DeveloperTool", - "copyright": "", - "linux": { - "deb": { - "depends": ["curl", "wget"], - "files": { "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop" } - } - }, - "externalBin": [], - "longDescription": "", - "resources": [], - "shortDescription": "", - "targets": ["deb", "appimage"] - } + "bundle": { + "icon": ["png/weread_512.png"], + "active": true, + "category": "DeveloperTool", + "copyright": "", + "linux": { + "deb": { + "depends": ["curl", "wget"], + "files": { "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop" } + } + }, + "externalBin": [], + "longDescription": "", + "resources": [], + "shortDescription": "", + "targets": ["deb", "appimage"] + } } diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 90b3605..278cbfb 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,4 +1,5 @@ { + "productName": "WeRead", "identifier": "com.pake.weread", "bundle": { "icon": ["icons/weread.icns"], diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index fc59125..5c060dd 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -1,5 +1,6 @@ { "identifier": "com.pake.weread", + "productName": "WeRead", "bundle": { "icon": ["png/weread_256.ico", "png/weread_32.ico"], "active": true,