diff --git a/Cargo.lock b/Cargo.lock index 3362343c7..07ac9bd73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8548,7 +8548,7 @@ dependencies = [ "phf 0.11.3", "plist", "pretty_assertions", - "rand 0.8.5", + "rand 0.9.1", "regex", "resvg", "semver", @@ -8662,7 +8662,7 @@ dependencies = [ "os_pipe", "p12", "plist", - "rand 0.8.5", + "rand 0.9.1", "serde", "serde_json", "tempfile", diff --git a/crates/tauri-cli/Cargo.toml b/crates/tauri-cli/Cargo.toml index 5a4e4e9ab..70dbe2574 100644 --- a/crates/tauri-cli/Cargo.toml +++ b/crates/tauri-cli/Cargo.toml @@ -109,7 +109,7 @@ elf = "0.7" memchr = "2" tempfile = "3" uuid = { version = "1", features = ["v5"] } -rand = "0.8" +rand = "0.9" [dev-dependencies] insta = "1" diff --git a/crates/tauri-cli/src/mobile/ios/build.rs b/crates/tauri-cli/src/mobile/ios/build.rs index 92f1b88f4..2d1b51961 100644 --- a/crates/tauri-cli/src/mobile/ios/build.rs +++ b/crates/tauri-cli/src/mobile/ios/build.rs @@ -30,7 +30,7 @@ use cargo_mobile2::{ opts::{NoiseLevel, Profile}, target::{call_for_targets_with_fallback, TargetInvalid, TargetTrait}, }; -use rand::distributions::{Alphanumeric, DistString}; +use rand::distr::{Alphanumeric, SampleString}; use std::{ env::{set_current_dir, var, var_os}, @@ -367,7 +367,7 @@ fn run_build( // we must force sign the app binary with a dummy certificate just to preserve the entitlements // target.export() will sign it with an actual certificate for us if skip_signing { - let password = Alphanumeric.sample_string(&mut rand::thread_rng(), 16); + let password = Alphanumeric.sample_string(&mut rand::rng(), 16); let certificate = tauri_macos_sign::certificate::generate_self_signed( tauri_macos_sign::certificate::SelfSignedCertificateRequest { algorithm: "rsa".to_string(), diff --git a/crates/tauri-macos-sign/Cargo.toml b/crates/tauri-macos-sign/Cargo.toml index d27288b3e..d163a2619 100644 --- a/crates/tauri-macos-sign/Cargo.toml +++ b/crates/tauri-macos-sign/Cargo.toml @@ -18,7 +18,7 @@ x509-certificate = "0.23" once-cell-regex = "0.2" os_pipe = "1" plist = "1" -rand = "0.8" +rand = "0.9" dirs = "6" log = { version = "0.4.21", features = ["kv"] } apple-codesign = { version = "0.27", default-features = false } diff --git a/crates/tauri-macos-sign/src/keychain.rs b/crates/tauri-macos-sign/src/keychain.rs index 7cebad9e2..32ca9f37e 100644 --- a/crates/tauri-macos-sign/src/keychain.rs +++ b/crates/tauri-macos-sign/src/keychain.rs @@ -10,7 +10,7 @@ use std::{ use crate::{assert_command, CommandExt}; use anyhow::Result; -use rand::distributions::{Alphanumeric, DistString}; +use rand::distr::{Alphanumeric, SampleString}; mod identity; @@ -67,9 +67,9 @@ impl Keychain { 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) + Alphanumeric.sample_string(&mut rand::rng(), 16) )); - let keychain_password = Alphanumeric.sample_string(&mut rand::thread_rng(), 16); + let keychain_password = Alphanumeric.sample_string(&mut rand::rng(), 16); let keychain_list_output = Command::new("security") .args(["list-keychain", "-d", "user"]) diff --git a/crates/tauri-macos-sign/src/provisioning_profile.rs b/crates/tauri-macos-sign/src/provisioning_profile.rs index f79679abc..e9be82a9a 100644 --- a/crates/tauri-macos-sign/src/provisioning_profile.rs +++ b/crates/tauri-macos-sign/src/provisioning_profile.rs @@ -5,7 +5,7 @@ use std::{ffi::OsStr, path::PathBuf, process::Command}; use anyhow::{Context, Result}; -use rand::distributions::{Alphanumeric, DistString}; +use rand::distr::{Alphanumeric, SampleString}; pub struct ProvisioningProfile { path: PathBuf, @@ -22,7 +22,7 @@ impl ProvisioningProfile { let provisioning_profile_path = provisioning_profiles_folder.join(format!( "{}.mobileprovision", - Alphanumeric.sample_string(&mut rand::thread_rng(), 16) + Alphanumeric.sample_string(&mut rand::rng(), 16) )); super::decode_base64(base64, &provisioning_profile_path)?;