diff --git a/Cargo.lock b/Cargo.lock index 7b577713..5810e68b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4140,19 +4140,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swift-rs" -version = "0.3.0" -source = "git+https://github.com/Brendonovich/swift-rs?rev=56b14aa4aa61e93d0fddf695d0cad78b6dd392b4#56b14aa4aa61e93d0fddf695d0cad78b6dd392b4" -dependencies = [ - "base64 0.13.1", - "serde", - "serde_json", -] - -[[package]] -name = "swift-rs" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc903dccb086f72f6e93a12e149d84aceda2ad4b08647e14e0330a3bfea61e2b" +checksum = "806ff0904302a8a91644422fcfeee4828c3a9dbcfd1757ba495f1a755c2ac873" dependencies = [ "base64 0.21.0", "serde", @@ -4269,7 +4259,7 @@ dependencies = [ [[package]] name = "tauri" version = "2.0.0-alpha.3" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "anyhow", "attohttpc", @@ -4299,7 +4289,7 @@ dependencies = [ "serde_repr", "serialize-to-javascript", "state", - "swift-rs 0.3.0", + "swift-rs", "tar", "tauri-build", "tauri-macros", @@ -4319,7 +4309,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "anyhow", "cargo_toml", @@ -4329,7 +4319,7 @@ dependencies = [ "semver 1.0.16", "serde", "serde_json", - "swift-rs 0.3.0", + "swift-rs", "tauri-utils", "tauri-winres", "walkdir", @@ -4338,7 +4328,7 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "base64 0.21.0", "brotli", @@ -4363,7 +4353,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "heck", "proc-macro2", @@ -4452,7 +4442,7 @@ dependencies = [ "serde", "serde_json", "serde_repr", - "swift-rs 1.0.0", + "swift-rs", "tauri", "tauri-build", "time 0.3.15", @@ -4584,7 +4574,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "gtk", "http", @@ -4605,7 +4595,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" version = "0.13.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "cocoa", "gtk", @@ -4625,7 +4615,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=feat/update-swiftrs#a0a5eb2170ec829f5951d4aea40c90a4bb732ef4" +source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541" dependencies = [ "brotli", "ctor", diff --git a/Cargo.toml b/Cargo.toml index 5e4a5bcd..46b0ee6a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { git = "https://github.com/tauri-apps/tauri", branch = "feat/update-swiftrs" } -tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "feat/update-swiftrs" } +tauri = { git = "https://github.com/tauri-apps/tauri", branch = "next" } +tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next" } serde_json = "1" thiserror = "1" diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index 1190ce1c..864618ea 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -26,7 +26,7 @@ fern = "0.6" android_logger = "0.11" [target."cfg(target_os = \"ios\")".dependencies] -swift-rs = "1" +swift-rs = "1.0.1" [features] colored = ["fern/colored"] \ No newline at end of file