diff --git a/tooling/bundler/Cargo.lock b/tooling/bundler/Cargo.lock index 39e8276d1396..42abaa08b86f 100644 --- a/tooling/bundler/Cargo.lock +++ b/tooling/bundler/Cargo.lock @@ -708,24 +708,24 @@ dependencies = [ ] [[package]] -name = "dirs-next" -version = "2.0.0" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "cfg-if", - "dirs-sys-next", + "dirs-sys", ] [[package]] -name = "dirs-sys-next" -version = "0.1.2" +name = "dirs-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys", ] [[package]] @@ -1853,6 +1853,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "os_pipe" version = "1.1.4" @@ -3142,7 +3148,7 @@ version = "1.6.0" dependencies = [ "anyhow", "ar", - "dirs-next", + "dirs", "dunce", "flate2", "glob", diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index a1cf4b44d9ae..6855f5ff5563 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -18,21 +18,21 @@ exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] [dependencies] tauri-utils = { version = "1.6.0", path = "../../core/tauri-utils", features = [ "resources" ] } -image = "0.25.0" +image = "0.25" flate2 = "1.0" anyhow = "1.0" thiserror = "1.0" serde_json = "1.0" serde = { version = "1.0", features = [ "derive" ] } -strsim = "0.11.0" -tar = "0.4.40" +strsim = "0.11" +tar = "0.4" walkdir = "2" -handlebars = "4.5" -tempfile = "3.8.1" -log = { version = "0.4.21", features = [ "kv" ] } -dirs-next = "2.0" +handlebars = "4" # v5 raised msrv +tempfile = "3" +log = { version = "0.4.21", features = [ "kv" ] } # Force min version due to breaking changes +dirs = "5" os_pipe = "1" -ureq = { version = "2.9.1", default-features = false, features = [ "socks-proxy" ] } +ureq = { version = "2", default-features = false, features = [ "socks-proxy" ] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" @@ -43,7 +43,7 @@ dunce = "1" [target."cfg(target_os = \"windows\")".dependencies] uuid = { version = "1", features = [ "v4", "v5" ] } -windows-registry = "0.2.0" +windows-registry = "0.2" glob = "0.3" [target."cfg(target_os = \"windows\")".dependencies.windows-sys] @@ -63,8 +63,8 @@ regex = "1" [target."cfg(target_os = \"linux\")".dependencies] heck = "0.5" -ar = "0.9.0" -md5 = "0.7.0" +ar = "0.9" +md5 = "0.7" rpm = "0.14" # 0.15 raised msrv [lib] diff --git a/tooling/bundler/src/bundle/linux/appimage.rs b/tooling/bundler/src/bundle/linux/appimage.rs index b97d95420ccb..cb0aebd5d2f2 100644 --- a/tooling/bundler/src/bundle/linux/appimage.rs +++ b/tooling/bundler/src/bundle/linux/appimage.rs @@ -59,7 +59,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result> { let tauri_tools_path = settings .local_tools_directory() .map(|d| d.join(".tauri")) - .unwrap_or_else(|| dirs_next::cache_dir().unwrap().join("tauri")); + .unwrap_or_else(|| dirs::cache_dir().unwrap().join("tauri")); std::fs::create_dir_all(&tauri_tools_path)?; let tauri_tools_path_str = tauri_tools_path.to_string_lossy(); diff --git a/tooling/bundler/src/bundle/macos/app.rs b/tooling/bundler/src/bundle/macos/app.rs index 74e4995f909b..9c0bf9626dcf 100644 --- a/tooling/bundler/src/bundle/macos/app.rs +++ b/tooling/bundler/src/bundle/macos/app.rs @@ -310,7 +310,7 @@ fn copy_frameworks_to_bundle( framework ))); } - if let Some(home_dir) = dirs_next::home_dir() { + if let Some(home_dir) = dirs::home_dir() { if copy_framework_from(&dest_dir, framework, &home_dir.join("Library/Frameworks/"))? { continue; } diff --git a/tooling/bundler/src/bundle/macos/sign.rs b/tooling/bundler/src/bundle/macos/sign.rs index 8892fcffc869..5d4a750624b7 100644 --- a/tooling/bundler/src/bundle/macos/sign.rs +++ b/tooling/bundler/src/bundle/macos/sign.rs @@ -427,7 +427,7 @@ pub fn notarize_auth() -> Result { let mut key_path = None; let mut search_paths = vec!["./private_keys".into()]; - if let Some(home_dir) = dirs_next::home_dir() { + if let Some(home_dir) = dirs::home_dir() { search_paths.push(home_dir.join("private_keys")); search_paths.push(home_dir.join(".private_keys")); search_paths.push(home_dir.join(".appstoreconnect").join("private_keys")); diff --git a/tooling/bundler/src/bundle/windows/msi.rs b/tooling/bundler/src/bundle/windows/msi.rs index c94476bac31f..a56a7147dd37 100644 --- a/tooling/bundler/src/bundle/windows/msi.rs +++ b/tooling/bundler/src/bundle/windows/msi.rs @@ -29,7 +29,7 @@ pub fn bundle_project(settings: &Settings, updater: bool) -> crate::Result crate::Result