Skip to content

Commit 81716be

Browse files
ImUrXloucass003
andauthored
Migrate to tauri logger (#1537)
Co-authored-by: lucas lelievre <[email protected]>
1 parent 1d273ac commit 81716be

File tree

25 files changed

+3464
-2368
lines changed

25 files changed

+3464
-2368
lines changed

Cargo.lock

Lines changed: 570 additions & 96 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ members = ["gui/src-tauri"]
99
[workspace.package]
1010
edition = "2021"
1111
license = "MIT OR Apache-2.0"
12-
rust-version = "1.75" # Tauri's MSRV
12+
rust-version = "1.82" # Tauri's MSRV
1313
repository = "https://github.com/SlimeVR/SlimeVR-Server"
1414

1515
[profile.release]

flake.lock

Lines changed: 57 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
enable = true;
130130
toolchain = fenixpkgs.fromToolchainName {
131131
name = rust_toolchain.toolchain.channel;
132-
sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
132+
sha256 = "sha256-+9FmLhAOezBZCOziO0Qct1NOrfpjNsXxc/8I0c7BdKE=";
133133
};
134134
components = rust_toolchain.toolchain.components;
135135
};

gui/package.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
"@sentry/vite-plugin": "^2.22.7",
1717
"@tailwindcss/typography": "^0.5.15",
1818
"@tanstack/react-query": "^5.48.0",
19-
"@tauri-apps/api": "^2.0.2",
20-
"@tauri-apps/plugin-dialog": "^2.0.0",
21-
"@tauri-apps/plugin-fs": "2.4.1",
22-
"@tauri-apps/plugin-http": "^2.5.0",
23-
"@tauri-apps/plugin-os": "^2.0.0",
24-
"@tauri-apps/plugin-shell": "^2.0.0",
25-
"@tauri-apps/plugin-store": "^2.0.0",
19+
"@tauri-apps/api": "~2",
20+
"@tauri-apps/plugin-dialog": "~2",
21+
"@tauri-apps/plugin-fs": "~2",
22+
"@tauri-apps/plugin-http": "~2",
23+
"@tauri-apps/plugin-log": "~2",
24+
"@tauri-apps/plugin-opener": "~2",
25+
"@tauri-apps/plugin-os": "~2",
26+
"@tauri-apps/plugin-shell": "~2",
27+
"@tauri-apps/plugin-store": "~2",
2628
"@tweenjs/tween.js": "^25.0.0",
2729
"@twemoji/svg": "^15.0.0",
2830
"browser-fs-access": "^0.35.0",
@@ -70,8 +72,9 @@
7072
"@openapi-codegen/cli": "^2.0.2",
7173
"@openapi-codegen/typescript": "^8.0.2",
7274
"@tailwindcss/forms": "^0.5.9",
73-
"@tauri-apps/cli": "^2.0.2",
75+
"@tauri-apps/cli": "~2",
7476
"@types/file-saver": "^2.0.7",
77+
"@types/node": "^24.3.1",
7578
"@types/react": "^18.3.11",
7679
"@types/react-dom": "^18.3.0",
7780
"@types/react-helmet": "^6.1.11",

gui/src-tauri/Cargo.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ shadow-rs = "0.35"
2828
[dependencies]
2929
serde_json = "1"
3030
serde = { version = "1", features = ["derive"] }
31-
tauri = { version = "2.0", features = ["devtools", "tray-icon", "image-png", "rustls-tls"] }
32-
tauri-runtime = "2.0"
33-
tauri-plugin-dialog = "2.0"
34-
tauri-plugin-fs = "2.4.1"
35-
tauri-plugin-os = "2.0"
36-
tauri-plugin-shell = "2.0"
37-
tauri-plugin-store = "2.0"
38-
flexi_logger = "0.29"
31+
tauri = { version = "2", features = ["devtools", "tray-icon", "image-png", "rustls-tls"] }
32+
tauri-runtime = "2"
33+
tauri-plugin-dialog = "2"
34+
tauri-plugin-fs = "2"
35+
tauri-plugin-http = "2"
36+
tauri-plugin-opener = "2"
37+
tauri-plugin-os = "2"
38+
tauri-plugin-shell = "2"
39+
tauri-plugin-store = "2"
3940
log-panics = { version = "2", features = ["with-backtrace"] }
4041
log = "0.4"
4142
clap = { version = "4.0.29", features = ["derive"] }
@@ -54,7 +55,7 @@ dirs-next = "2.0.0"
5455
discord-sdk = "0.3.6"
5556
tokio = { version = "1.37.0", features = ["time"] }
5657
itertools = "0.13.0"
57-
tauri-plugin-http = "2.5.0"
58+
tauri-plugin-log = "2"
5859

5960
[target.'cfg(windows)'.dependencies]
6061
win32job = "1"

gui/src-tauri/capabilities/migrated.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"identifier": "migrated",
33
"description": "permissions that were migrated from v1",
44
"local": true,
5-
"windows": ["main"],
5+
"windows": [
6+
"main"
7+
],
68
"permissions": [
79
"core:default",
810
"core:window:allow-close",
@@ -30,7 +32,14 @@
3032
"fs:allow-exists",
3133
{
3234
"identifier": "fs:scope",
33-
"allow": [{ "path": "$APPDATA" }, { "path": "$APPDATA/**" }]
35+
"allow": [
36+
{
37+
"path": "$APPDATA"
38+
},
39+
{
40+
"path": "$APPDATA/**"
41+
}
42+
]
3443
},
3544
{
3645
"identifier": "http:default",
@@ -39,6 +48,8 @@
3948
"url": "https://github.com/SlimeVR/SlimeVR-Tracker-ESP/releases/download/*"
4049
}
4150
]
42-
}
51+
},
52+
"opener:default",
53+
"log:default"
4354
]
44-
}
55+
}

0 commit comments

Comments
 (0)