Skip to content

Commit

Permalink
Merge pull request #137 from lucasfernog/feat/tauri-v2-stable
Browse files Browse the repository at this point in the history
feat: update to Tauri v2 stable
  • Loading branch information
oscartbeaumont authored Oct 15, 2024
2 parents e4189bd + d91f8a7 commit da6ab6e
Show file tree
Hide file tree
Showing 8 changed files with 546 additions and 718 deletions.
361 changes: 241 additions & 120 deletions Cargo.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ todo = { level = "warn", priority = -1 }
panic_in_result_fn = { level = "warn", priority = -1 }

[workspace.dependencies]
tauri = { version = "=2.0.0-rc.16" }
tauri-build = { version = "=2.0.0-rc.13" }
tauri-plugin = { version = "=2.0.0-rc.13" }
tauri = { version = "2.0" }
tauri-build = { version = "2.0" }
tauri-plugin = { version = "2.0" }
specta = { version = "=2.0.0-rc.20" }
specta-typescript = { version = "0.0.7" }
specta-jsdoc = { version = "0.0.7" }
8 changes: 4 additions & 4 deletions examples/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "next"
"@tauri-apps/api": "^2.0.2"
},
"devDependencies": {
"@tauri-apps/cli": "next",
"typescript": "^5.6.2",
"vite": "^5.4.8"
"@tauri-apps/cli": "^2.0.3",
"typescript": "^5.6.3",
"vite": "^5.4.9"
}
}
10 changes: 5 additions & 5 deletions examples/custom-plugin/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
},
"license": "MIT",
"dependencies": {
"@tauri-apps/api": "next",
"solid-js": "^1.9.1",
"@tauri-apps/api": "^2.0.2",
"solid-js": "^1.9.2",
"tauri-specta-custom-plugin": "workspace:*"
},
"devDependencies": {
"@tauri-apps/cli": "next",
"typescript": "^5.6.2",
"vite": "^5.4.8",
"@tauri-apps/cli": "^2.0.3",
"typescript": "^5.6.3",
"vite": "^5.4.9",
"vite-plugin-solid": "^2.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/custom-plugin/plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
"codegen": "cargo test && pnpm build"
},
"devDependencies": {
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "0.0.0",
"scripts": {},
"dependencies": {
"@tauri-apps/api": "next"
"@tauri-apps/api": "^2.0.2"
}
}
873 changes: 290 additions & 583 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
//!
//! ```sh
//! # Always required
//! cargo add [email protected].0-rc.15 specta@=2.0.0-rc.20
//! cargo add [email protected] specta@=2.0.0-rc.20
//!
//! # Typescript
//! cargo add [email protected]
Expand Down

0 comments on commit da6ab6e

Please sign in to comment.