From fa6316e7e6bb779c2367ac0199205ac805b7f193 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 11:17:38 +0000 Subject: [PATCH 1/2] chore(deps): update rust crate dirs to v6 --- crates/tauri-build/Cargo.toml | 2 +- crates/tauri-bundler/Cargo.toml | 2 +- crates/tauri/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/tauri-build/Cargo.toml b/crates/tauri-build/Cargo.toml index f8fc0b1fa3c3..b6e3918c43c2 100644 --- a/crates/tauri-build/Cargo.toml +++ b/crates/tauri-build/Cargo.toml @@ -41,7 +41,7 @@ json-patch = "3" walkdir = "2" tauri-winres = "0.2" semver = "1" -dirs = "5" +dirs = "6" glob = "0.3" toml = "0.8" # Our code requires at least 0.8.18 so don't simplify this to 0.8 diff --git a/crates/tauri-bundler/Cargo.toml b/crates/tauri-bundler/Cargo.toml index 7e983acf71df..c3ccd18d71c9 100644 --- a/crates/tauri-bundler/Cargo.toml +++ b/crates/tauri-bundler/Cargo.toml @@ -30,7 +30,7 @@ walkdir = "2" handlebars = "6" tempfile = "3" log = { version = "0.4.21", features = ["kv"] } -dirs = "5" +dirs = "6" os_pipe = "1" ureq = { version = "2", default-features = false, features = ["socks-proxy"] } native-tls = { version = "0.2", optional = true } diff --git a/crates/tauri/Cargo.toml b/crates/tauri/Cargo.toml index 6a9b40ee5fdb..fc6c1d2e6136 100644 --- a/crates/tauri/Cargo.toml +++ b/crates/tauri/Cargo.toml @@ -66,7 +66,7 @@ tauri-runtime-wry = { version = "2.3.0", path = "../tauri-runtime-wry", optional getrandom = "0.2" serde_repr = "0.1" http = "1" -dirs = "5" +dirs = "6" percent-encoding = "2" reqwest = { version = "0.12", default-features = false, features = [ "json", From 76d5bc7d46a8dcfb0993f870b96962153c0c42f7 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 23 Jan 2025 13:36:57 +0100 Subject: [PATCH 2/2] lockfile --- Cargo.lock | 49 ++++++++++++------- crates/tauri-macos-sign/Cargo.toml | 2 +- crates/tauri-macos-sign/src/keychain.rs | 3 +- .../src/provisioning_profile.rs | 2 +- supply-chain/config.toml | 4 -- 5 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5adbdfd2af8..ddb37ed1fe28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -247,7 +247,7 @@ dependencies = [ "anyhow", "base64 0.21.7", "clap", - "dirs", + "dirs 5.0.1", "env_logger 0.10.2", "jsonwebtoken", "log", @@ -299,7 +299,7 @@ dependencies = [ "dialoguer", "difference", "digest", - "dirs", + "dirs 5.0.1", "elliptic-curve 0.13.8", "env_logger 0.10.2", "figment", @@ -2410,17 +2410,16 @@ version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys 0.5.0", ] [[package]] @@ -2431,19 +2430,20 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", "option-ext", - "redox_users", + "redox_users 0.4.6", "windows-sys 0.48.0", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", - "redox_users", - "winapi", + "option-ext", + "redox_users 0.5.0", + "windows-sys 0.59.0", ] [[package]] @@ -7188,6 +7188,17 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror 2.0.10", +] + [[package]] name = "ref-cast" version = "1.0.23" @@ -9004,7 +9015,7 @@ dependencies = [ "bytes", "cargo_toml", "data-url", - "dirs", + "dirs 6.0.0", "dunce", "embed_plist", "futures-util", @@ -9062,7 +9073,7 @@ version = "2.0.5" dependencies = [ "anyhow", "cargo_toml", - "dirs", + "dirs 6.0.0", "glob", "heck 0.5.0", "json-patch 3.0.1", @@ -9085,7 +9096,7 @@ dependencies = [ "anyhow", "ar", "bitness", - "dirs", + "dirs 6.0.0", "dunce", "flate2", "glob", @@ -9285,7 +9296,7 @@ dependencies = [ "anyhow", "apple-codesign", "chrono", - "dirs-next", + "dirs 6.0.0", "log", "once-cell-regex", "os_pipe", @@ -10030,7 +10041,7 @@ checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b" dependencies = [ "core-graphics", "crossbeam-channel", - "dirs", + "dirs 5.0.1", "libappindicator", "muda", "objc2", diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index fb824c681335..9ef871a53df6 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -19,7 +19,7 @@ once-cell-regex = "0.2" os_pipe = "1" plist = "1" rand = "0.8" -dirs-next = "2" +dirs = "6" log = { version = "0.4.21", features = ["kv"] } apple-codesign = "0.27" chrono = "0.4" diff --git a/crates/tauri-macos-sign/src/keychain.rs b/crates/tauri-macos-sign/src/keychain.rs index 2ef256d32cd9..7cebad9e2de3 100644 --- a/crates/tauri-macos-sign/src/keychain.rs +++ b/crates/tauri-macos-sign/src/keychain.rs @@ -64,8 +64,7 @@ impl Keychain { } pub fn with_certificate_file(cert_path: &Path, certificate_password: &OsString) -> Result { - let home_dir = - dirs_next::home_dir().ok_or_else(|| anyhow::anyhow!("failed to resolve home dir"))?; + let home_dir = dirs::home_dir().ok_or_else(|| anyhow::anyhow!("failed to resolve home dir"))?; let keychain_path = home_dir.join("Library").join("Keychains").join(format!( "{}.keychain-db", Alphanumeric.sample_string(&mut rand::thread_rng(), 16) diff --git a/crates/tauri-macos-sign/src/provisioning_profile.rs b/crates/tauri-macos-sign/src/provisioning_profile.rs index 1e9d0af37596..f79679abc18c 100644 --- a/crates/tauri-macos-sign/src/provisioning_profile.rs +++ b/crates/tauri-macos-sign/src/provisioning_profile.rs @@ -13,7 +13,7 @@ pub struct ProvisioningProfile { impl ProvisioningProfile { pub fn from_base64(base64: &OsStr) -> Result { - let home_dir = dirs_next::home_dir().unwrap(); + let home_dir = dirs::home_dir().unwrap(); let provisioning_profiles_folder = home_dir .join("Library") .join("MobileDevice") diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 1566d975260a..ef23ca62e600 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -206,10 +206,6 @@ criteria = "safe-to-deploy" version = "0.3.11" criteria = "safe-to-deploy" -[[exemptions.dirs-next]] -version = "2.0.0" -criteria = "safe-to-deploy" - [[exemptions.dirs-sys-next]] version = "0.1.2" criteria = "safe-to-deploy"