From 826c9f6bf66a0ecddd7b149fa31279e07e3f0810 Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Fri, 2 Aug 2024 22:12:01 +0800 Subject: [PATCH] Upgrade to Tauri 2.0.0-rc.0 --- Cargo.lock | 32 +++++++++---------- Cargo.toml | 2 +- examples/app/src-tauri/Cargo.toml | 2 +- examples/app/src-tauri/capabilities/main.json | 2 +- .../custom-plugin/app/src-tauri/Cargo.toml | 2 +- .../app/src-tauri/capabilities/main.json | 2 +- examples/custom-plugin/plugin/Cargo.toml | 2 +- src/event.rs | 6 +--- src/lib.rs | 2 +- 9 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c476e35..cc6bb9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3061,9 +3061,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-beta.25" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4339c67eb7700fe4a80ad6507e3b9af0b4159959f3d74aae48feed298baf4cbf" +checksum = "255e746089a370802ec4eb896dccc6f27c1dd2a203c1dc484fd996db954e2300" dependencies = [ "anyhow", "bytes", @@ -3111,9 +3111,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498f587026501e4bbc5d6273b63f8956b03c37b3d3b2027f9c756fcd468e9c62" +checksum = "85ceb8d082c3b17b4b2eb134a39363a22c696ddba473d6e5c0ab1caadad4cfca" dependencies = [ "anyhow", "cargo_toml", @@ -3133,9 +3133,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bbc731067e319ef60601bf5716d1e706ee9ae28e38c0587f7165c7d6824cdf" +checksum = "2407c7d37a491b16e530445c9611d91091cae198eea2ed424913b740215605f2" dependencies = [ "base64 0.22.1", "brotli", @@ -3160,9 +3160,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b4a44346577ccde75a24c62405a4c3b4f7a3a76614ee6cf1ed14a0b756795c" +checksum = "d210893b693be00f569b4f54456803debe104b7675f368205f2b6e94bac09b34" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3174,9 +3174,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abe0b85472516d1033ba251ac81b9f18f02725aadcaad697c8b727e6505a6ad" +checksum = "b352e4478af27bd7c76724bb426ebb32fc51baafb2186afabed4e706dc9e39d4" dependencies = [ "anyhow", "glob", @@ -3222,9 +3222,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-beta.21" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189510033be50f6fde35cfa50b50c7ab4e0ced0c867ae0f643b4907b8385bbe5" +checksum = "6624fdf383ccafc9e8ad9205fe6e5c976b318efcd6b3662dde658c74e4254792" dependencies = [ "dpi", "gtk", @@ -3241,9 +3241,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-beta.21" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6938bd63b6658e7b08f0fe2151390148ee5a8ccdba100d4dff961d2c8734d9a9" +checksum = "9fd1a785c4281f8231b091593393b40cb3a800810c407b1ffed52de27ff1640a" dependencies = [ "cocoa", "gtk", @@ -3317,9 +3317,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-beta.19" +version = "2.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20e51856f343c503892749b27d34042e6ca83a0369a12de3c5552d9874d04e8" +checksum = "6f435eeaae1e69cf93cf19da0f727989eed2e5eb6fc63a8d21432f59dd3ac4ac" dependencies = [ "brotli", "cargo_metadata", diff --git a/Cargo.toml b/Cargo.toml index f9fd7a9..fd7de2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ todo = { level = "warn", priority = -1 } panic_in_result_fn = { level = "warn", priority = -1 } [workspace.dependencies] -tauri = { version = "=2.0.0-beta.25" } +tauri = { version = "=2.0.0-rc.0" } specta = { version = "=2.0.0-rc.19" } specta-typescript = { version = "0.0.6" } specta-jsdoc = { version = "0.0.6" } diff --git a/examples/app/src-tauri/Cargo.toml b/examples/app/src-tauri/Cargo.toml index a856e18..3087ad2 100644 --- a/examples/app/src-tauri/Cargo.toml +++ b/examples/app/src-tauri/Cargo.toml @@ -10,7 +10,7 @@ rust-version = "1.57" publish = false [build-dependencies] -tauri-build = { version = "2.0.0-beta.18", features = [] } +tauri-build = { version = "=2.0.0-rc.0", features = [] } [dependencies] serde_json = "1.0" diff --git a/examples/app/src-tauri/capabilities/main.json b/examples/app/src-tauri/capabilities/main.json index 52023d9..b17e1a0 100644 --- a/examples/app/src-tauri/capabilities/main.json +++ b/examples/app/src-tauri/capabilities/main.json @@ -3,5 +3,5 @@ "identifier": "main-capability", "description": "Capability for the main window", "windows": ["main"], - "permissions": ["event:default"] + "permissions": ["core:event:default"] } diff --git a/examples/custom-plugin/app/src-tauri/Cargo.toml b/examples/custom-plugin/app/src-tauri/Cargo.toml index 087d255..9b6bf73 100644 --- a/examples/custom-plugin/app/src-tauri/Cargo.toml +++ b/examples/custom-plugin/app/src-tauri/Cargo.toml @@ -8,7 +8,7 @@ repository = "" edition = "2021" [build-dependencies] -tauri-build = { version = "2.0.0-beta.18", features = [] } +tauri-build = { version = "=2.0.0-rc.0", features = [] } [dependencies] tauri = { workspace = true, features = [] } diff --git a/examples/custom-plugin/app/src-tauri/capabilities/main.json b/examples/custom-plugin/app/src-tauri/capabilities/main.json index 0cb7ffa..908593d 100644 --- a/examples/custom-plugin/app/src-tauri/capabilities/main.json +++ b/examples/custom-plugin/app/src-tauri/capabilities/main.json @@ -3,5 +3,5 @@ "identifier": "main-capability", "description": "Capability for the main window", "windows": ["main"], - "permissions": ["event:default", "specta-example:allow-add-numbers"] + "permissions": ["core:event:default", "specta-example:allow-add-numbers"] } diff --git a/examples/custom-plugin/plugin/Cargo.toml b/examples/custom-plugin/plugin/Cargo.toml index ece263b..8a2f584 100644 --- a/examples/custom-plugin/plugin/Cargo.toml +++ b/examples/custom-plugin/plugin/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" links = "tauri-plugin-specta-example" [build-dependencies] -tauri-plugin = { version = "2.0.0-beta.18", features = ["build"] } +tauri-plugin = { version = "=2.0.0-rc.0", features = ["build"] } [dependencies] rand = "0.8.5" diff --git a/src/event.rs b/src/event.rs index 6969969..904aa4c 100644 --- a/src/event.rs +++ b/src/event.rs @@ -1,8 +1,4 @@ -use std::{ - borrow::Cow, - collections::{BTreeSet, HashMap}, - sync::RwLock, -}; +use std::{borrow::Cow, collections::HashMap, sync::RwLock}; use serde::{de::DeserializeOwned, Serialize}; use specta::{NamedType, SpectaID}; diff --git a/src/lib.rs b/src/lib.rs index 4641a9d..cd2735f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -14,7 +14,7 @@ //! //! ```sh //! # Always required -//! cargo add tauri@=2.0.0-beta.25 specta@=2.0.0-rc.19 +//! cargo add tauri@=2.0.0-rc.0 specta@=2.0.0-rc.19 //! //! # Typescript //! cargo add specta-typescript@0.0.6