Skip to content

Commit

Permalink
downgrade handlebars again
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianLars committed Aug 5, 2024
1 parent e1765dd commit 61fae47
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 37 deletions.
26 changes: 16 additions & 10 deletions tooling/bundler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions tooling/bundler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/linux/appimage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
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();

Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/macos/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/macos/sign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ pub fn notarize_auth() -> Result<NotarizeAuth, NotarizeAuthError> {
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"));
Expand Down
2 changes: 1 addition & 1 deletion tooling/bundler/src/bundle/windows/msi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub fn bundle_project(settings: &Settings, updater: bool) -> crate::Result<Vec<P
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"));

let wix_path = tauri_tools_path.join("WixTools314");

Expand Down
4 changes: 2 additions & 2 deletions tooling/bundler/src/bundle/windows/nsis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ pub fn bundle_project(settings: &Settings, updater: bool) -> crate::Result<Vec<P
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"));

if !tauri_tools_path.exists() {
create_dir_all(&tauri_tools_path)?;
Expand Down Expand Up @@ -184,7 +184,7 @@ fn build_nsis_app_installer(

#[cfg(not(target_os = "windows"))]
{
let mut dir = dirs_next::cache_dir().unwrap();
let mut dir = dirs::cache_dir().unwrap();
dir.extend(["tauri", "NSIS", "Plugins", "x86-unicode"]);
data.insert("additional_plugins_path", to_json(dir));
}
Expand Down
26 changes: 16 additions & 10 deletions tooling/cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 61fae47

Please sign in to comment.