diff --git a/Cargo.lock b/Cargo.lock index 5dee643e..b1d8993f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4246,8 +4246,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.0.0-alpha.6" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "2.0.0-alpha.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25eefe4ca0a396a73fd0309f778eeb22a19953a3169bf316b893abadc2118fb" dependencies = [ "anyhow", "bytes 1.4.0", @@ -4297,8 +4298,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-alpha.3" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "2.0.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c492211c72b95f8866e5c1fbc0a915080a5ebb9f03f9b250a1c936534b680a76" dependencies = [ "anyhow", "cargo_toml", @@ -4316,8 +4318,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.3" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "2.0.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "818c570932ebc2ff6d498be89d93494b89ff142131937a7e56d7cfb9c8ef0ad0" dependencies = [ "base64 0.21.0", "brotli", @@ -4341,8 +4344,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.3" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "2.0.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b596485d89003d2d7869469b2830e9a846de9ac2eecd69bc7c24890234aefc" dependencies = [ "heck", "proc-macro2", @@ -4562,8 +4566,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.13.0-alpha.3" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "0.13.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "404367cd32a5a8d33368448aab7da54bb2187b6a632526f1019de3fd13591cc2" dependencies = [ "gtk", "http", @@ -4583,8 +4588,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.13.0-alpha.3" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "0.13.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "203764d673b440877dea87b972772be4091ee0ab25141748008646ca774a20dc" dependencies = [ "cocoa", "gtk", @@ -4603,8 +4609,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.3" -source = "git+http://github.com/tauri-apps/tauri?branch=next#f436cf860963fcee0dd32aa06f22484741f5c530" +version = "2.0.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fa79bc56f04ece491268a64273de945f65627bcda30d9e8ecc8708b89bca26" dependencies = [ "brotli", "ctor", @@ -5657,9 +5664,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.27.0" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26712b3ea99abb29c3b0067b284515e2ccdf5d6df7ac5e21129d71550eb9c3e6" +checksum = "e8cf0dbfa7ccbd2e3832a3098b19d4b552360ea00a40b244a99caef46bffd84f" dependencies = [ "base64 0.13.1", "block", @@ -5673,6 +5680,7 @@ dependencies = [ "gtk", "html5ever", "http", + "javascriptcore-rs", "kuchiki", "libc", "log", diff --git a/Cargo.toml b/Cargo.toml index 1d3c58fb..5f7de541 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "2.0.0-alpha.6" -tauri-build = "2.0.0-alpha.3" +tauri = "2.0.0-alpha.8" +tauri-build = "2.0.0-alpha.4" serde_json = "1" thiserror = "1" @@ -15,7 +15,3 @@ edition = "2021" authors = [ "Tauri Programme within The Commons Conservancy" ] license = "Apache-2.0 OR MIT" rust-version = "1.64" - -[patch.crates-io] -tauri = { git = "http://github.com/tauri-apps/tauri", branch = "next" } -tauri-build = { git = "http://github.com/tauri-apps/tauri", branch = "next" } \ No newline at end of file diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index 2446653b..40d08d7f 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -12,11 +12,11 @@ rust-version = "1.57" [dependencies] serde_json = "1.0" serde = { version = "1.0", features = [ "derive" ] } -tauri = { version = "1", features = ["api-all"] } +tauri = { version = "2.0.0-alpha.8", features = ["api-all"] } tauri-plugin-single-instance = { path = "../../../" } [build-dependencies] -tauri-build = { version = "1", features = [] } +tauri-build = { version = "2.0.0-alpha.4", features = [] } [features] default = [ "custom-protocol" ] diff --git a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml index 48960dc1..e1d77550 100644 --- a/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml +++ b/plugins/websocket/examples/svelte-app/src-tauri/Cargo.toml @@ -9,14 +9,14 @@ edition = "2021" [dependencies] serde = { version = "1", features = ["derive"] } serde_json = "1" -tauri = { version = "1", features = [] } +tauri = { version = "2.0.0-alpha.8", features = [] } tokio = { version = "1.11", features = ["net"] } futures-util = "0.3" tauri-plugin-websocket = { path = "../../../" } tokio-tungstenite = "0.15" [build-dependencies] -tauri-build = { version = "1", features = [] } +tauri-build = { version = "2.0.0-alpha.4", features = [] } [features] default = [ "custom-protocol" ]