From 0b42d3f554bad063602df4176b50190a1c120e88 Mon Sep 17 00:00:00 2001 From: Jonas Kruckenberg Date: Fri, 13 Jan 2023 12:43:19 +0100 Subject: [PATCH] update Tauri to alpha version --- Cargo.lock | 92 +++++++++++++++++++++++++++++++++++++++++++++++------- Cargo.toml | 2 +- 2 files changed, 81 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 631e3994..bb4c2849 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,6 +78,24 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "android_log-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" + +[[package]] +name = "android_logger" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ec2333c185d826313162cee39d3fcc6a84ba08114a839bebf53b961e7e75773" +dependencies = [ + "android_log-sys", + "env_logger 0.7.1", + "lazy_static", + "log", +] + [[package]] name = "android_system_properties" version = "0.1.5" @@ -227,6 +245,21 @@ dependencies = [ "num-traits", ] +[[package]] +name = "attohttpc" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b85f766c20e6ae766956f7a2fcc4e0931e79a7e1f48b29132b5d647021114914" +dependencies = [ + "flate2", + "http", + "log", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + [[package]] name = "atty" version = "0.2.14" @@ -1118,6 +1151,29 @@ dependencies = [ "syn", ] +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -1826,6 +1882,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.14.23" @@ -4226,15 +4288,18 @@ dependencies = [ [[package]] name = "tauri" -version = "1.2.3" +version = "2.0.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b48820ee3bb6a5031a83b2b6e11f8630bdc5a2f68cb841ab8ebc7a15a916679" +checksum = "c8dca2d7a5853ab98d1453bf74078308f175634934e2fd1f427433c56c179da5" dependencies = [ + "android_logger", "anyhow", + "attohttpc", "cocoa", "dirs-next", "embed_plist", "encoding_rs", + "env_logger 0.9.3", "flate2", "futures-util", "glib", @@ -4243,8 +4308,10 @@ dependencies = [ "heck 0.4.0", "http", "ignore", + "log", "objc", "once_cell", + "paste", "percent-encoding", "rand 0.8.5", "raw-window-handle", @@ -4271,9 +4338,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.2.1" +version = "2.0.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +checksum = "8e78b01de486c5aefb99d2623d856b3d3afb88499bc9b8514e246762505006c1" dependencies = [ "base64 0.13.1", "brotli", @@ -4290,15 +4357,16 @@ dependencies = [ "tauri-utils", "thiserror", "time 0.3.17", + "url", "uuid 1.2.2", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.1" +version = "2.0.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +checksum = "df039672c40713ded0f7991efd1d7d6219e008c73137483d6dd2d9988f39472e" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -4513,9 +4581,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.12.1" +version = "0.13.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +checksum = "010bdd6bb6585b647afe262d3e43ec612969f328d32c9ce20f9cfaefccb5e7a9" dependencies = [ "gtk", "http", @@ -4533,9 +4601,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.12.2" +version = "0.13.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +checksum = "2dadf5f22694dbb5a1fd9496fe28f48ba4288ed4cb8c2584911a81cd57e24e90" dependencies = [ "cocoa", "gtk", @@ -4553,9 +4621,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.2.1" +version = "2.0.0-alpha.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" +checksum = "8c7ee9f908d975a116f2fe3db47d65b18e568aa7913aa333b7a5cd990f179e5e" dependencies = [ "brotli", "ctor", diff --git a/Cargo.toml b/Cargo.toml index fc6c8ed9..917dd183 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "1" +tauri = "2.0.0-alpha.2" tauri-build = "1" serde_json = "1" thiserror = "1"