Skip to content

Commit

Permalink
chore(deps) Update Tauri Bundler (#1045)
Browse files Browse the repository at this point in the history
Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
  • Loading branch information
3 people committed Oct 17, 2020
1 parent 087c0e8 commit d13dcd9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 31 deletions.
5 changes: 5 additions & 0 deletions .changes/rust-update.md
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Update minimum Rust version to 1.42.0 due to a dependency update.
4 changes: 2 additions & 2 deletions cli/tauri-bundler/Cargo.toml
Expand Up @@ -35,14 +35,14 @@ strsim = "0.10.0"
tar = "0.4"
target_build_utils = "0.3"
term = "0.6.1"
toml = "0.5.6"
toml = "0.5.7"
uuid = { version = "0.8", features = [ "v5" ] }
walkdir = "2"
lazy_static = { version = "1.4" }
handlebars = { version = "3.5" }

[target."cfg(target_os = \"windows\")".dependencies]
attohttpc = { version = "0.15.0" }
attohttpc = { version = "0.16.0" }
regex = { version = "1" }
runas = "0.2"

Expand Down
34 changes: 6 additions & 28 deletions cli/tauri-bundler/src/bundle/settings.rs
Expand Up @@ -646,12 +646,7 @@ impl Settings {

/// Returns the bundle's identifier
pub fn bundle_identifier(&self) -> &str {
self
.bundle_settings
.identifier
.as_ref()
.map(String::as_str)
.unwrap_or("")
self.bundle_settings.identifier.as_deref().unwrap_or("")
}

/// Returns an iterator over the icon files to be used for this bundle.
Expand Down Expand Up @@ -720,7 +715,7 @@ impl Settings {

/// Returns the copyright text.
pub fn copyright_string(&self) -> Option<&str> {
self.bundle_settings.copyright.as_ref().map(String::as_str)
self.bundle_settings.copyright.as_deref()
}

/// Returns the list of authors name.
Expand All @@ -743,12 +738,7 @@ impl Settings {

/// Returns the package's homepage URL, defaulting to "" if not defined.
pub fn homepage_url(&self) -> &str {
&self
.package
.homepage
.as_ref()
.map(String::as_str)
.unwrap_or("")
&self.package.homepage.as_deref().unwrap_or("")
}

/// Returns the app's category.
Expand All @@ -767,11 +757,7 @@ impl Settings {

/// Returns the app's long description.
pub fn long_description(&self) -> Option<&str> {
self
.bundle_settings
.long_description
.as_ref()
.map(String::as_str)
self.bundle_settings.long_description.as_deref()
}

/// Returns the dependencies of the debian bundle.
Expand All @@ -797,20 +783,12 @@ impl Settings {

/// Returns the minimum system version of the macOS bundle.
pub fn osx_minimum_system_version(&self) -> Option<&str> {
self
.bundle_settings
.osx_minimum_system_version
.as_ref()
.map(String::as_str)
self.bundle_settings.osx_minimum_system_version.as_deref()
}

/// Returns the path to the DMG bundle license.
pub fn osx_license(&self) -> Option<&str> {
self
.bundle_settings
.osx_license
.as_ref()
.map(String::as_str)
self.bundle_settings.osx_license.as_deref()
}

/// Returns whether the macOS .app bundle should use the bootstrap script or not.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
1.41.0
1.42.0

0 comments on commit d13dcd9

Please sign in to comment.