From 1aba10963e814163b9249ff2b6ad0f06b05d4a39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:11:05 +0200 Subject: [PATCH] chore(deps) Update Tauri Utils (1.x) (#8232) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars --- .../covector-version-or-publish-v1.yml | 5 +- Cargo.lock | 56 ++++++++++--------- core/tauri-build/Cargo.toml | 2 +- core/tauri-codegen/Cargo.toml | 4 +- core/tauri-utils/Cargo.toml | 14 ++--- core/tauri/Cargo.toml | 2 +- tooling/cli/Cargo.toml | 2 +- 7 files changed, 44 insertions(+), 41 deletions(-) diff --git a/.github/workflows/covector-version-or-publish-v1.yml b/.github/workflows/covector-version-or-publish-v1.yml index b9c71a275975..9f29df42c6fd 100644 --- a/.github/workflows/covector-version-or-publish-v1.yml +++ b/.github/workflows/covector-version-or-publish-v1.yml @@ -66,7 +66,7 @@ jobs: cargo update -p serde_spanned --precise 0.6.1 cargo update -p winnow --precise 0.4.1 cargo update -p plist --precise 1.5.1 - cargo update -p serde_with:3.8.3 --precise 3.0.0 + cargo update -p serde_with:3.9.0 --precise 3.0.0 cargo update -p time --precise 0.3.15 cargo update -p ignore --precise 0.4.18 cargo update -p raw-window-handle --precise 0.5.0 @@ -109,9 +109,10 @@ jobs: cargo update -p tokio-stream --precise 0.1.14 cargo update -p tokio-util --precise 0.7.10 cargo update -p os_pipe --precise 1.1.5 - cargo update -p syn:2.0.71 --precise 2.0.67 + cargo update -p syn:2.0.72 --precise 2.0.67 cargo update -p derive_more --precise 0.99.17 cargo update -p native-tls --precise 0.2.11 + cargo update -p ppv-lite86 --precise 0.2.17 - name: test build run: cargo check --target ${{ matrix.platform.target }} --features tracing,compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test diff --git a/Cargo.lock b/Cargo.lock index ad94abdd3663..84ef2dd05159 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -429,9 +429,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -440,9 +440,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1144,6 +1144,15 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1879,15 +1888,6 @@ dependencies = [ "cfb", ] -[[package]] -name = "infer" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847" -dependencies = [ - "cfb", -] - [[package]] name = "inout" version = "0.1.3" @@ -2016,14 +2016,14 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" dependencies = [ + "jsonptr", "serde", "serde_json", "thiserror", - "treediff", ] [[package]] @@ -2037,6 +2037,17 @@ dependencies = [ "serde", ] +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + [[package]] name = "kuchikiki" version = "0.8.2" @@ -4035,7 +4046,7 @@ dependencies = [ "ico", "ignore", "indexmap", - "infer 0.16.0", + "infer", "minisign-verify", "mockito", "nix 0.26.4", @@ -4201,7 +4212,7 @@ dependencies = [ "glob", "heck 0.5.0", "html5ever", - "infer 0.13.0", + "infer", "json-patch", "json5", "kuchikiki", @@ -4580,15 +4591,6 @@ dependencies = [ "petgraph", ] -[[package]] -name = "treediff" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d127780145176e2b5d16611cc25a900150e86e9fd79d3bde6ff3a37359c9cb5" -dependencies = [ - "serde_json", -] - [[package]] name = "try-lock" version = "0.2.5" diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml index 32b366bd5c2a..cb001ec77f1b 100644 --- a/core/tauri-build/Cargo.toml +++ b/core/tauri-build/Cargo.toml @@ -29,7 +29,7 @@ cargo_toml = "0.15" serde = "1" serde_json = "1" heck = "0.5" -json-patch = "1.2" +json-patch = "2" tauri-winres = "0.1" semver = "1" walkdir = "2" diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml index 2ffed639a10f..85d0eb2dc9f4 100644 --- a/core/tauri-codegen/Cargo.toml +++ b/core/tauri-codegen/Cargo.toml @@ -22,13 +22,13 @@ serde_json = "1" tauri-utils = { version = "1.6.0", path = "../tauri-utils", features = [ "build" ] } thiserror = "1" walkdir = "2" -brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] } +brotli = { version = "6", optional = true } regex = { version = "1", optional = true } uuid = { version = "1", features = [ "v4" ] } semver = "1" ico = "0.3" png = "0.17" -json-patch = "1.2" +json-patch = "2" [target."cfg(target_os = \"macos\")".dependencies] plist = "1" diff --git a/core/tauri-utils/Cargo.toml b/core/tauri-utils/Cargo.toml index 35c60026593c..2030323cdd0a 100644 --- a/core/tauri-utils/Cargo.toml +++ b/core/tauri-utils/Cargo.toml @@ -16,28 +16,28 @@ serde = { version = "1", features = [ "derive" ] } serde_json = "1" thiserror = "1" phf = { version = "0.11", features = [ "macros" ] } -brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] } +brotli = { version = "6", optional = true } url = { version = "2", features = [ "serde" ] } -html5ever = "0.26" +html5ever = "0.26" # kuchikiki requires 0.26 still kuchiki = { package = "kuchikiki", version = "0.8" } proc-macro2 = { version = "1", optional = true } quote = { version = "1", optional = true } -schemars = { version = "0.8.18", features = [ "url" ], optional = true } +schemars = { version = "0.8.18", features = [ "url" ], optional = true } # Forcing 0.8.18 as minimum due to breaking changes serde_with = "3" aes-gcm = { version = "0.10", optional = true } getrandom = { version = "0.2", optional = true, features = [ "std" ] } serialize-to-javascript = { version = "=0.1.1", optional = true } ctor = "0.2" json5 = { version = "0.4", optional = true } -toml = { version = "0.7", optional = true } -json-patch = "1.2" +toml = { version = "0.7", optional = true } # the other used toml crates still use 0.7 +json-patch = "2" glob = { version = "0.3", optional = true } walkdir = { version = "2", optional = true } memchr = "2" semver = "1" -infer = "0.13" +infer = "0.13" # 0.14 raised msrv dunce = "1" -log = "0.4.20" +log = "0.4" [target."cfg(target_os = \"linux\")".dependencies] heck = "0.5" diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml index dcd223577002..6ca74073b829 100644 --- a/core/tauri/Cargo.toml +++ b/core/tauri/Cargo.toml @@ -93,7 +93,7 @@ regex = { version = "1", optional = true } glob = "0.3" data-url = { version = "0.3", optional = true } serialize-to-javascript = "=0.1.1" -infer = { version = "0.16", optional = true } +infer = { version = "0.13", optional = true } # 0.14 raised msrv png = { version = "0.17", optional = true } ico = { version = "0.3", optional = true } encoding_rs = "0.8" diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index 987b3a966bc6..96c4fddb1aed 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -51,7 +51,7 @@ notify = "6.1" notify-debouncer-mini = "0.4" shared_child = "1.0" toml_edit = "0.21" -json-patch = "1.2" +json-patch = "2" tauri-utils = { version = "1.6.0", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } toml = "0.8" jsonschema = "0.17"