Skip to content

Commit

Permalink
Merge pull request #125 from anatawa12/bump-tauri
Browse files Browse the repository at this point in the history
chore: bump tauri to 2.0.0-rc.2
  • Loading branch information
oscartbeaumont authored Aug 12, 2024
2 parents cc11448 + fa74cdf commit 0931335
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 23 deletions.
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*Please don't submit Tauri version upgrades as PR's, just put a comment on #126*
32 changes: 16 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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

[workspace.dependencies]
tauri = { version = "=2.0.0-rc.0" }
tauri = { version = "=2.0.0-rc.2" }
specta = { version = "=2.0.0-rc.20" }
specta-typescript = { version = "0.0.7" }
specta-jsdoc = { version = "0.0.7" }
Expand All @@ -71,4 +71,4 @@ specta-jsdoc = { version = "0.0.7" }
# tauri-build = { git = "https://github.com/oscartbeaumont/tauri.git", rev = "ddc64b706a7f2db271d40e9b216187b1aa153efa" }
# specta = { path = "../specta/specta" }
# specta-typescript = { path = "../specta/specta-typescript" }
# specta-jsdoc = { path = "../specta/specta-jsdoc" }
# specta-jsdoc = { path = "../specta/specta-jsdoc" }
4 changes: 2 additions & 2 deletions examples/app/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rust-version = "1.57"
publish = false

[build-dependencies]
tauri-build = { version = "=2.0.0-rc.0", features = [] }
tauri-build = { version = "=2.0.0-rc.2", features = [] }

[dependencies]
serde_json = "1.0"
Expand All @@ -20,7 +20,7 @@ tauri = { workspace = true, features = [] }
tauri-specta = { path = "../../../", features = ["derive", "typescript", "javascript"] }
specta-typescript = { workspace = true }
specta-jsdoc = { workspace = true }
tauri-plugin-os = "^2.0.0-beta.3"
tauri-plugin-os = "^2.0.0-alpha.2"
thiserror = "1"

[features]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-plugin/app/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = ""
edition = "2021"

[build-dependencies]
tauri-build = { version = "=2.0.0-rc.0", features = [] }
tauri-build = { version = "=2.0.0-rc.2", features = [] }

[dependencies]
tauri = { workspace = true, features = [] }
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-plugin/plugin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"
links = "tauri-plugin-specta-example"

[build-dependencies]
tauri-plugin = { version = "=2.0.0-rc.0", features = ["build"] }
tauri-plugin = { version = "=2.0.0-rc.2", features = ["build"] }

[dependencies]
rand = "0.8.5"
Expand Down
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 tauri@=2.0.0-rc.0 specta@=2.0.0-rc.20
//! cargo add tauri@=2.0.0-rc.2 specta@=2.0.0-rc.20
//!
//! # Typescript
//! cargo add [email protected]
Expand Down

0 comments on commit 0931335

Please sign in to comment.