Skip to content

Commit b3d5b72

Browse files
committed
feat: upgrade tauri 2.0
1 parent 2694518 commit b3d5b72

23 files changed

+10109
-850
lines changed

.idea/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

Cargo.toml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
11
[package]
22
name = "rsql"
3-
version = "1.0.0-beta.3"
3+
version = "1.0.0"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
77
[dependencies]
88
leptos = { version = "0.6", features = ["csr", "nightly"] }
99
leptos_devtools = { git = "https://github.com/luoxiaozero/leptos-devtools" }
1010
serde = { version = "1.0.192", features = ["derive"] }
11-
serde-wasm-bindgen = "0.6.3"
12-
wasm-bindgen = { version ="0.2.91", features = ["serde-serialize"] }
13-
js-sys = "0.3.68"
11+
wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
1412
leptos-use = { version = "^0.13.4" }
1513
leptos_icons = "0.3.0" # https://carlosted.github.io/icondata/
16-
serde_json = "1.0.113"
17-
wasm-bindgen-futures = "0.4.39"
1814
monaco = "0.4.0"
19-
tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys", features = ["all"] }
15+
tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys", features = [
16+
"all",
17+
], branch = "v2" }
2018
thaw = { version = "0.3", features = ["csr"] }
2119
common = { path = "common" }
2220
futures = "0.3.30"
23-
async-stream = "0.3.5"
2421
icondata = "0.3.0"
2522
ahash = { version = "0.8.11", features = ["serde"] }
2623
leptos_toaster = { version = "0.1.6", features = ["builtin_toast"] }

common/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
[package]
22
name = "common"
3-
version = "1.0.0-beta.3"
3+
version = "1.0.0"
44
edition = "2021"
55

66
[dependencies]
7-
js-sys = "0.3.67"
87
serde = "1.0.193"
9-
wasm-bindgen = "0.2.90"

proc-macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "proc-macros"
3-
version = "0.1.0"
3+
version = "1.0.0"
44
edition = "2021"
55

66
[dependencies]

src-tauri/Cargo.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "backend"
3-
version = "1.0.0-beta.3"
3+
version = "1.0.0"
44
description = "PostgreSQL GUI written in Rust"
55
authors = ["Daniel Boros"]
66
license = ""
@@ -10,23 +10,21 @@ edition = "2021"
1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

1212
[build-dependencies]
13-
tauri-build = { version = "1.5.2", features = [] }
13+
tauri-build = { version = "2", features = [] }
1414

1515
[dependencies]
1616
common = { path = "../common" }
17-
tauri = { version = "1.6.6", features = ["shell-open", "fs-all"] }
18-
serde = { version = "1.0.193", features = ["derive"] }
19-
serde_json = "1.0.108"
17+
tauri = { version = "2", features = [] }
2018
tokio = "1.37.0"
2119
tokio-postgres = "0.7.10"
2220
chrono = "0.4.31"
2321
sled = "0.34.7"
24-
anyhow = "1.0.83"
2522
tracing = "0.1.40"
2623
tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
27-
ahash = { version = "0.8.11", features = ["serde"] }
2824
bincode = "1.3.3"
29-
25+
tauri-plugin-shell = "2"
26+
tauri-plugin-fs = "2"
27+
serde_json = "1.0.133"
3028

3129

3230
[features]

src-tauri/capabilities/migrated.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"identifier": "migrated",
3+
"description": "permissions that were migrated from v1",
4+
"local": true,
5+
"windows": [
6+
"main"
7+
],
8+
"permissions": [
9+
"core:default",
10+
"fs:allow-read-file",
11+
"fs:allow-write-file",
12+
"fs:allow-read-dir",
13+
"fs:allow-copy-file",
14+
"fs:allow-mkdir",
15+
"fs:allow-remove",
16+
"fs:allow-remove",
17+
"fs:allow-rename",
18+
"fs:allow-exists",
19+
{
20+
"identifier": "fs:scope",
21+
"allow": [
22+
"$APPDATA/*"
23+
]
24+
},
25+
"shell:allow-open",
26+
"shell:default",
27+
"fs:default"
28+
]
29+
}

src-tauri/gen/schemas/acl-manifests.json

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default","fs:allow-read-file","fs:allow-write-file","fs:allow-read-dir","fs:allow-copy-file","fs:allow-mkdir","fs:allow-remove","fs:allow-remove","fs:allow-rename","fs:allow-exists",{"identifier":"fs:scope","allow":["$APPDATA/*"]},"shell:allow-open","shell:default","fs:default"]}}

0 commit comments

Comments
 (0)