From 2e95eef55e89f0738d64f5c1e29d39cd8acdf838 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Wed, 1 May 2024 12:02:09 +0800 Subject: [PATCH] :tada: 2.0.0-rc.5 --- Cargo.lock | 106 +++++------------- Cargo.toml | 6 +- docs/v2.md | 12 +- .../custom-plugin/app/src-tauri/Cargo.toml | 2 +- examples/custom-plugin/plugin/Cargo.toml | 2 +- macros/Cargo.toml | 2 +- 6 files changed, 39 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4bf0b5b..76dd6dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2937,8 +2937,9 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" -version = "2.0.0-beta.16" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" +version = "2.0.0-beta.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fedd5490eddf117253945f0baedafded43474c971cba546a818f527d5c26266" dependencies = [ "anyhow", "bytes", @@ -2950,7 +2951,7 @@ dependencies = [ "getrandom 0.2.10", "glob", "gtk", - "heck 0.4.1", + "heck 0.5.0", "http", "jni", "libc", @@ -2968,11 +2969,11 @@ dependencies = [ "specta", "state", "swift-rs", - "tauri-build 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-build", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-utils", "thiserror", "tokio", "tray-icon", @@ -3000,28 +3001,7 @@ dependencies = [ "semver", "serde", "serde_json", - "tauri-utils 2.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", - "tauri-winres", - "toml 0.8.2", - "walkdir", -] - -[[package]] -name = "tauri-build" -version = "2.0.0-beta.13" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "glob", - "heck 0.5.0", - "json-patch", - "schemars", - "semver", - "serde", - "serde_json", - "tauri-utils 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-utils", "tauri-winres", "toml 0.8.2", "walkdir", @@ -3030,7 +3010,8 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-beta.13" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b383f341efb803852b0235a2f330ca90c4c113f422dd6d646b888685b372cace" dependencies = [ "base64 0.22.0", "brotli", @@ -3045,7 +3026,7 @@ dependencies = [ "serde_json", "sha2", "syn 2.0.60", - "tauri-utils 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-utils", "thiserror", "time", "url", @@ -3056,14 +3037,15 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-beta.13" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71be71718cfe48b149507157bfbad0e2ba0e98ea51658be26c7c677eb188fb0c" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.60", "tauri-codegen", - "tauri-utils 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-utils", ] [[package]] @@ -3078,7 +3060,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "tauri-utils 2.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils", "toml 0.8.2", "walkdir", ] @@ -3115,8 +3097,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.13" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" +version = "2.0.0-beta.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "148b6e6aff8e63fe5d4ae1d50159d50cfc0b4309abdeca64833c887c6b5631ef" dependencies = [ "dpi", "gtk", @@ -3125,7 +3108,7 @@ dependencies = [ "raw-window-handle 0.6.1", "serde", "serde_json", - "tauri-utils 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-utils", "thiserror", "url", "windows 0.56.0", @@ -3133,8 +3116,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.13" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" +version = "2.0.0-beta.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398d065c6e0fbf3c4304583759b6e153bc1e0daeb033bede6834ebe4df371fc3" dependencies = [ "cocoa", "gtk", @@ -3146,7 +3130,7 @@ dependencies = [ "softbuffer", "tao", "tauri-runtime", - "tauri-utils 2.0.0-beta.13 (git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2)", + "tauri-utils", "url", "webkit2gtk", "webview2-com", @@ -3156,7 +3140,7 @@ dependencies = [ [[package]] name = "tauri-specta" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "heck 0.5.0", "indoc", @@ -3176,7 +3160,7 @@ dependencies = [ "serde_json", "specta", "tauri", - "tauri-build 2.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-build", "tauri-plugin-os", "tauri-specta", ] @@ -3188,13 +3172,13 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.0.0-beta.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-build", "tauri-plugin-specta-example", ] [[package]] name = "tauri-specta-macros" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3207,39 +3191,6 @@ name = "tauri-utils" version = "2.0.0-beta.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4709765385f035338ecc330f3fba753b8ee283c659c235da9768949cdb25469" -dependencies = [ - "cargo_metadata", - "ctor", - "dunce", - "glob", - "heck 0.5.0", - "html5ever", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.11.2", - "proc-macro2", - "quote", - "regex", - "schemars", - "semver", - "serde", - "serde_json", - "serde_with", - "swift-rs", - "thiserror", - "toml 0.8.2", - "url", - "urlpattern", - "walkdir", -] - -[[package]] -name = "tauri-utils" -version = "2.0.0-beta.13" -source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" dependencies = [ "brotli", "cargo_metadata", @@ -4359,3 +4310,8 @@ dependencies = [ "once_cell", "pkg-config", ] + +[[patch.unused]] +name = "tauri" +version = "2.0.0-beta.16" +source = "git+https://github.com/tauri-apps/tauri?rev=3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2#3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" diff --git a/Cargo.toml b/Cargo.toml index 3d9992d..cde8109 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-specta" description = "Completely typesafe Tauri commands" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" authors = ["Oscar Beaumont "] edition = "2021" license = "MIT" @@ -23,11 +23,11 @@ typescript = ["specta/typescript", "specta/js_doc"] [dependencies] # Public specta = { version = "=2.0.0-rc.11", features = ["function"] } -tauri-specta-macros = { version = "=2.0.0-rc.4", path = "./macros" } +tauri-specta-macros = { version = "=2.0.0-rc.5", path = "./macros" } serde = "1" serde_json = "1" thiserror = "1" -tauri = { version = "=2.0.0-beta.16", features = ["specta"] } +tauri = { version = "=2.0.0-beta.17", features = ["specta"] } # Private heck = "0.5.0" diff --git a/docs/v2.md b/docs/v2.md index 81a00d6..929dfef 100644 --- a/docs/v2.md +++ b/docs/v2.md @@ -7,18 +7,10 @@ > > However, it's safe to use as long as you lock your versions. -> [!WARNING] -> Until [tauri-apps/tauri #9392](https://github.com/tauri-apps/tauri/pull/9392) is released, you must use the following in your `Cargo.toml` (if your using a Cargo workspace use the root `Cargo.toml`): -> ```toml -> [patch.crates-io] -> tauri = { git = "https://github.com/tauri-apps/tauri", rev = "3f0805488506e013e15cfb3cc1cfc8c2c5f84bd2" } -> tauri-specta = { git = "https://github.com/oscartbeaumont/tauri-specta", rev = "10ceb8716def4c7337e36ed8b8d974c1aefd4aab" } -> ``` - ```bash -cargo add tauri@=2.0.0-beta.16 +cargo add tauri@=2.0.0-beta.17 cargo add specta@=2.0.0-rc.11 -cargo add tauri-specta@=2.0.0-rc.4 --features javascript,typescript +cargo add tauri-specta@=2.0.0-rc.5 --features javascript,typescript ``` ## Adding Specta to custom types diff --git a/examples/custom-plugin/app/src-tauri/Cargo.toml b/examples/custom-plugin/app/src-tauri/Cargo.toml index 584d758..0ded051 100644 --- a/examples/custom-plugin/app/src-tauri/Cargo.toml +++ b/examples/custom-plugin/app/src-tauri/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" tauri-build = { version = "2.0.0-beta.13", features = [] } [dependencies] -tauri = { version = "=2.0.0-beta.16", features = [] } +tauri = { version = "=2.0.0-beta.17", features = [] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" tauri-plugin-specta-example = { path = "../../plugin" } diff --git a/examples/custom-plugin/plugin/Cargo.toml b/examples/custom-plugin/plugin/Cargo.toml index 243560f..52b16e9 100644 --- a/examples/custom-plugin/plugin/Cargo.toml +++ b/examples/custom-plugin/plugin/Cargo.toml @@ -11,5 +11,5 @@ tauri-plugin = { version = "=2.0.0-beta.13", features = ["build"] } rand = "0.8.5" serde = "1" specta = "=2.0.0-rc.11" -tauri = "=2.0.0-beta.16" +tauri = "=2.0.0-beta.17" tauri-specta = { path = "../../../", features = ["typescript"] } diff --git a/macros/Cargo.toml b/macros/Cargo.toml index e633c72..81182b8 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-specta-macros" description = "Completely typesafe Tauri commands" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" authors = ["Oscar Beaumont "] edition = "2021" license = "MIT"