From e92eef782d0c06f35e4d3c6c0e7ef4208be27661 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 11 May 2023 07:28:41 -0300 Subject: [PATCH] next branch --- examples/api/src-tauri/Cargo.lock | 14 +++++++------- examples/api/src-tauri/Cargo.toml | 4 ++-- plugins/fs/Cargo.toml | 2 +- plugins/http/Cargo.toml | 2 +- plugins/updater/Cargo.toml | 5 +---- plugins/updater/tests/app-updater/Cargo.toml | 2 +- 6 files changed, 13 insertions(+), 16 deletions(-) diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock index 82858795..a83fefe3 100644 --- a/examples/api/src-tauri/Cargo.lock +++ b/examples/api/src-tauri/Cargo.lock @@ -3603,7 +3603,7 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" [[package]] name = "tauri" version = "2.0.0-alpha.8" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "anyhow", "bytes", @@ -3659,7 +3659,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "anyhow", "cargo_toml", @@ -3680,7 +3680,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "base64 0.21.0", "brotli", @@ -3705,7 +3705,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -3897,7 +3897,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.13.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "gtk", "http", @@ -3918,7 +3918,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.13.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "cocoa", "gtk", @@ -3938,7 +3938,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.4" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/channel#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" +source = "git+https://github.com/tauri-apps/tauri?branch=next#9122e27ed863a5cb2bf13dc0dd0433c7387e141b" dependencies = [ "aes-gcm", "brotli", diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 4e894dc0..4d30e57d 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -30,8 +30,8 @@ tauri-plugin-shell = { path = "../../../plugins/shell" } tauri-plugin-updater = { path = "../../../plugins/updater" } [patch.crates-io] -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "feat/channel" } -tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "feat/channel" } +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } +tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next" } [dependencies.tauri] version = "2.0.0-alpha.8" diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml index 99d26cde..6e2add71 100644 --- a/plugins/fs/Cargo.toml +++ b/plugins/fs/Cargo.toml @@ -18,5 +18,5 @@ edition = "2021" #thiserror.workspace = true serde = "1" thiserror = "1" -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "feat/channel" } +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } anyhow = "1" diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index 8b072aac..ef5741c6 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" #tauri.workspace = true #log.workspace = true #thiserror.workspace = true -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "feat/channel" } +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } serde = "1" serde_json = "1" thiserror = "1" diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index e3e69dcf..a7da0aeb 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" #serde.workspace = true #serde_json.workspace = true #thiserror.workspace = true -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "feat/channel", features = ["updater", "fs-extract-api"] } +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next", features = ["updater", "fs-extract-api"] } serde = "1" serde_json = "1" thiserror = "1" @@ -37,6 +37,3 @@ tokio-test = "0.4.2" native-tls = [ "reqwest/native-tls" ] native-tls-vendored = [ "reqwest/native-tls-vendored" ] rustls-tls = [ "reqwest/rustls-tls" ] - -[patch.'https://github.com/tauri-apps/tauri'] -tauri = { path = "../../../tauri/core/tauri" } diff --git a/plugins/updater/tests/app-updater/Cargo.toml b/plugins/updater/tests/app-updater/Cargo.toml index a5f9f1f1..72c1e1f7 100644 --- a/plugins/updater/tests/app-updater/Cargo.toml +++ b/plugins/updater/tests/app-updater/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" tauri-build = { path = "../../../../../tauri/core/tauri-build", features = [] } [dependencies] -tauri = { path = "../../../../../tauri/core/tauri", features = [] } +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } tauri-plugin-updater = { path = "../.." } tiny_http = "0.11" serde = "1"