Skip to content

Commit

Permalink
feat: migrate to tauri v2 beta
Browse files Browse the repository at this point in the history
  • Loading branch information
shonya3 committed Jun 25, 2024
1 parent 6529d60 commit f32f53a
Show file tree
Hide file tree
Showing 23 changed files with 6,429 additions and 1,622 deletions.
2,872 changes: 1,553 additions & 1,319 deletions Cargo.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
"@divicards/wc": "workspace:^",
"@formkit/auto-animate": "1.0.0-beta.6",
"@shoelace-style/shoelace": "2.15.0",
"@tauri-apps/api": "^1.5.4",
"@tauri-apps/api": "2.0.0-beta.13",
"@tauri-apps/plugin-updater": "2.0.0-beta.5",
"@vueuse/core": "^10.9.0",
"lit": "^3.1.3",
"pinia": "^2.1.7",
"vue": "^3.4.24"
},
"devDependencies": {
"@tauri-apps/cli": "^1.5.11",
"@tauri-apps/cli": "2.0.0-beta.20",
"@vitejs/plugin-vue": "5.0.4",
"typescript": "5.4.5",
"vite": "5.2.10",
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@ edition = "2021"
[lib]
name = "lib"
path = "lib/src/lib.rs"
crate-type = ["lib", "staticlib", "cdylib"]

[build-dependencies]
tauri-build = { version = "1.5", features = [] }
tauri-build = { version = "2.0.0-beta", features = [] }

[dependencies]
divi = {path = "../../../divi"}
googlesheets = {path = "../../../googlesheets"}

tauri = { version = "1.5", features = [ "updater", "api-all"] }
tauri = { version = "2.0.0-beta", features = [] }
tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }

tokio = {version = "1", features = ["full"] }
tracing.workspace = true
Expand Down
16 changes: 16 additions & 0 deletions packages/app/src-tauri/capabilities/migrated.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"identifier": "migrated",
"description": "permissions that were migrated from v1",
"local": true,
"windows": ["main"],
"permissions": [
"path:default",
"event:default",
"window:default",
"app:default",
"resources:default",
"menu:default",
"tray:default",
"updater:default"
]
}
1 change: 1 addition & 0 deletions packages/app/src-tauri/gen/schemas/acl-manifests.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions packages/app/src-tauri/gen/schemas/capabilities.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","updater:default"]}}
Loading

0 comments on commit f32f53a

Please sign in to comment.