Browse Source

Apply Version Updates From Current Changes (v1) (#9074)

Co-authored-by: lucasfernog <lucasfernog@users.noreply.github.com>
github-actions[bot] 1 year ago
parent
commit
b705f89a10

+ 0 - 5
.changes/escape-paths-wix.md

@@ -1,5 +0,0 @@
----
-"tauri-bundler": patch:bug
----
-
-On Windows, fix building WiX installer when resources contains an XML charcter that should be escaped.

+ 0 - 6
.changes/log-stable-features.md

@@ -1,6 +0,0 @@
----
-'tauri-cli': 'patch:bug'
-'tauri-bundler': 'patch:bug'
----
-
-Fix compilation error due to dependency on unstable features of `log` crate.

+ 0 - 6
.changes/taurignore-ignoring-folders-not-working-for-watch.md

@@ -1,6 +0,0 @@
----
-'tauri-cli': patch:bug
-'@tauri-apps/cli': patch:bug
----
-
-Fix `.taurignore` failing to ignore in some cases.

+ 7 - 0
tooling/bundler/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 # Changelog
 
 
+## \[1.5.1]
+
+### Bug Fixes
+
+- [`516386158`](https://www.github.com/tauri-apps/tauri/commit/5163861588b229fe2e13e61bf65fbf5b88743bb3)([#9040](https://www.github.com/tauri-apps/tauri/pull/9040)) On Windows, fix building WiX installer when resources contains an XML charcter that should be escaped.
+- [`97a05145f`](https://www.github.com/tauri-apps/tauri/commit/97a05145fbb24533526eba6589594f03046e11df)([#9119](https://www.github.com/tauri-apps/tauri/pull/9119)) Fix compilation error due to dependency on unstable features of `log` crate.
+
 ## \[1.5.0]
 ## \[1.5.0]
 
 
 ### New Features
 ### New Features

+ 22 - 23
tooling/bundler/Cargo.toml

@@ -1,42 +1,38 @@
-workspace = {}
+workspace = { }
 
 
 [package]
 [package]
 name = "tauri-bundler"
 name = "tauri-bundler"
-version = "1.5.0"
+version = "1.5.1"
 authors = [
 authors = [
   "George Burton <burtonageo@gmail.com>",
   "George Burton <burtonageo@gmail.com>",
-  "Tauri Programme within The Commons Conservancy",
+  "Tauri Programme within The Commons Conservancy"
 ]
 ]
-categories = ["command-line-utilities", "development-tools::cargo-plugins"]
+categories = [ "command-line-utilities", "development-tools::cargo-plugins" ]
 license = "Apache-2.0 OR MIT"
 license = "Apache-2.0 OR MIT"
-keywords = ["bundle", "cargo", "tauri"]
+keywords = [ "bundle", "cargo", "tauri" ]
 repository = "https://github.com/tauri-apps/tauri"
 repository = "https://github.com/tauri-apps/tauri"
 description = "Wrap rust executables in OS-specific app bundles for Tauri"
 description = "Wrap rust executables in OS-specific app bundles for Tauri"
 edition = "2021"
 edition = "2021"
 rust-version = "1.60"
 rust-version = "1.60"
-exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]
+exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]
 
 
 [dependencies]
 [dependencies]
-tauri-utils = { version = "1.5.3", path = "../../core/tauri-utils", features = [
-  "resources",
-] }
+tauri-utils = { version = "1.5.3", path = "../../core/tauri-utils", features = [ "resources" ] }
 image = "0.24.7"
 image = "0.24.7"
 flate2 = "1.0"
 flate2 = "1.0"
 anyhow = "1.0"
 anyhow = "1.0"
 thiserror = "1.0"
 thiserror = "1.0"
 serde_json = "1.0"
 serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", features = [ "derive" ] }
 strsim = "0.10.0"
 strsim = "0.10.0"
 tar = "0.4.40"
 tar = "0.4.40"
 walkdir = "2"
 walkdir = "2"
 handlebars = "4.5"
 handlebars = "4.5"
 tempfile = "3.8.1"
 tempfile = "3.8.1"
-log = { version = "0.4.21", features = ["kv"] }
+log = { version = "0.4.21", features = [ "kv" ] }
 dirs-next = "2.0"
 dirs-next = "2.0"
 os_pipe = "1"
 os_pipe = "1"
-ureq = { version = "2.9.1", default-features = false, features = [
-  "socks-proxy",
-] }
+ureq = { version = "2.9.1", default-features = false, features = [ "socks-proxy" ] }
 native-tls = { version = "0.2", optional = true }
 native-tls = { version = "0.2", optional = true }
 hex = "0.4"
 hex = "0.4"
 semver = "1"
 semver = "1"
@@ -46,17 +42,20 @@ zip = "0.6"
 dunce = "1"
 dunce = "1"
 
 
 [target."cfg(target_os = \"windows\")".dependencies]
 [target."cfg(target_os = \"windows\")".dependencies]
-uuid = { version = "1", features = ["v4", "v5"] }
+uuid = { version = "1", features = [ "v4", "v5" ] }
 winreg = "0.51"
 winreg = "0.51"
 glob = "0.3"
 glob = "0.3"
 
 
-[target."cfg(target_os = \"windows\")".dependencies.windows-sys]
-version = "0.48"
-features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"]
+  [target."cfg(target_os = \"windows\")".dependencies.windows-sys]
+  version = "0.48"
+  features = [
+  "Win32_System_SystemInformation",
+  "Win32_System_Diagnostics_Debug"
+]
 
 
 [target."cfg(target_os = \"macos\")".dependencies]
 [target."cfg(target_os = \"macos\")".dependencies]
 icns = { package = "tauri-icns", version = "0.1" }
 icns = { package = "tauri-icns", version = "0.1" }
-time = { version = "0.3", features = ["formatting"] }
+time = { version = "0.3", features = [ "formatting" ] }
 plist = "1"
 plist = "1"
 
 
 [target."cfg(any(target_os = \"macos\", target_os = \"windows\"))".dependencies]
 [target."cfg(any(target_os = \"macos\", target_os = \"windows\"))".dependencies]
@@ -72,7 +71,7 @@ name = "tauri_bundler"
 path = "src/lib.rs"
 path = "src/lib.rs"
 
 
 [features]
 [features]
-default = ["rustls"]
-native-tls = ["ureq/native-tls"]
-native-tls-vendored = ["native-tls", "native-tls/vendored"]
-rustls = ["ureq/tls"]
+default = [ "rustls" ]
+native-tls = [ "ureq/native-tls" ]
+native-tls-vendored = [ "native-tls", "native-tls/vendored" ]
+rustls = [ "ureq/tls" ]

+ 11 - 0
tooling/cli/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 # Changelog
 
 
+## \[1.5.11]
+
+### Bug Fixes
+
+- [`97a05145f`](https://www.github.com/tauri-apps/tauri/commit/97a05145fbb24533526eba6589594f03046e11df)([#9119](https://www.github.com/tauri-apps/tauri/pull/9119)) Fix compilation error due to dependency on unstable features of `log` crate.
+- [`b15948b11`](https://www.github.com/tauri-apps/tauri/commit/b15948b11c0e362eea7ef57a4606f15f7dbd886b)([#8903](https://www.github.com/tauri-apps/tauri/pull/8903)) Fix `.taurignore` failing to ignore in some cases.
+
+### Dependencies
+
+- Upgraded to `tauri-bundler@1.5.1`
+
 ## \[1.5.10]
 ## \[1.5.10]
 
 
 ### New Features
 ### New Features

+ 2 - 2
tooling/cli/Cargo.lock

@@ -3346,7 +3346,7 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "tauri-bundler"
 name = "tauri-bundler"
-version = "1.5.0"
+version = "1.5.1"
 dependencies = [
 dependencies = [
  "anyhow",
  "anyhow",
  "ar",
  "ar",
@@ -3386,7 +3386,7 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "tauri-cli"
 name = "tauri-cli"
-version = "1.5.10"
+version = "1.5.11"
 dependencies = [
 dependencies = [
  "anyhow",
  "anyhow",
  "axum",
  "axum",

+ 21 - 32
tooling/cli/Cargo.toml

@@ -1,13 +1,13 @@
 [workspace]
 [workspace]
-members = ["node"]
+members = [ "node" ]
 
 
 [package]
 [package]
 name = "tauri-cli"
 name = "tauri-cli"
-version = "1.5.10"
-authors = ["Tauri Programme within The Commons Conservancy"]
+version = "1.5.11"
+authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
 edition = "2021"
 rust-version = "1.60"
 rust-version = "1.60"
-categories = ["gui", "web-programming"]
+categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"
 license = "Apache-2.0 OR MIT"
 homepage = "https://tauri.app"
 homepage = "https://tauri.app"
 repository = "https://github.com/tauri-apps/tauri"
 repository = "https://github.com/tauri-apps/tauri"
@@ -20,7 +20,7 @@ include = [
   "*.rs",
   "*.rs",
   "tauri.gitignore",
   "tauri.gitignore",
   "tauri-dev-watcher.gitignore",
   "tauri-dev-watcher.gitignore",
-  "LICENSE*",
+  "LICENSE*"
 ]
 ]
 
 
 [package.metadata.binstall]
 [package.metadata.binstall]
@@ -40,63 +40,52 @@ path = "src/main.rs"
 
 
 [dependencies]
 [dependencies]
 clap_complete = "4"
 clap_complete = "4"
-clap = { version = "4.4", features = ["derive"] }
+clap = { version = "4.4", features = [ "derive" ] }
 anyhow = "1.0"
 anyhow = "1.0"
-tauri-bundler = { version = "1.5.0", path = "../bundler", default-features = false }
+tauri-bundler = { version = "1.5.1", path = "../bundler", default-features = false }
 colored = "2.0"
 colored = "2.0"
 once_cell = "1"
 once_cell = "1"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 serde_json = "1.0"
 notify = "6.1"
 notify = "6.1"
 notify-debouncer-mini = "0.4"
 notify-debouncer-mini = "0.4"
 shared_child = "1.0"
 shared_child = "1.0"
 toml_edit = "0.21"
 toml_edit = "0.21"
 json-patch = "1.2"
 json-patch = "1.2"
-tauri-utils = { version = "1.5.3", path = "../../core/tauri-utils", features = [
-  "isolation",
-  "schema",
-  "config-json5",
-  "config-toml",
-] }
+tauri-utils = { version = "1.5.3", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
 toml = "0.8"
 toml = "0.8"
 jsonschema = "0.17"
 jsonschema = "0.17"
 handlebars = "4.4"
 handlebars = "4.4"
 include_dir = "0.7"
 include_dir = "0.7"
 minisign = "=0.7.3"
 minisign = "=0.7.3"
 base64 = "0.21.5"
 base64 = "0.21.5"
-ureq = { version = "2.9.1", default-features = false, features = ["gzip"] }
+ureq = { version = "2.9.1", default-features = false, features = [ "gzip" ] }
 os_info = "3"
 os_info = "3"
 semver = "1.0"
 semver = "1.0"
 regex = "1.10.2"
 regex = "1.10.2"
 unicode-width = "0.1"
 unicode-width = "0.1"
 zeroize = "1.6"
 zeroize = "1.6"
-heck = { version = "0.4", features = ["unicode"] }
+heck = { version = "0.4", features = [ "unicode" ] }
 dialoguer = "0.11"
 dialoguer = "0.11"
-url = { version = "2.4", features = ["serde"] }
+url = { version = "2.4", features = [ "serde" ] }
 os_pipe = "1"
 os_pipe = "1"
 ignore = "0.4"
 ignore = "0.4"
 ctrlc = "3.4"
 ctrlc = "3.4"
-log = { version = "0.4.21", features = ["kv", "kv_std"] }
+log = { version = "0.4.21", features = [ "kv", "kv_std" ] }
 env_logger = "0.10.0"
 env_logger = "0.10.0"
 icns = { package = "tauri-icns", version = "0.1" }
 icns = { package = "tauri-icns", version = "0.1" }
-image = { version = "0.24", default-features = false, features = ["ico"] }
-axum = { version = "0.6.20", features = ["ws"] }
+image = { version = "0.24", default-features = false, features = [ "ico" ] }
+axum = { version = "0.6.20", features = [ "ws" ] }
 html5ever = "0.26"
 html5ever = "0.26"
 kuchiki = { package = "kuchikiki", version = "0.8" }
 kuchiki = { package = "kuchikiki", version = "0.8" }
-tokio = { version = "1", features = ["macros", "sync"] }
+tokio = { version = "1", features = [ "macros", "sync" ] }
 common-path = "1"
 common-path = "1"
 serde-value = "0.7.0"
 serde-value = "0.7.0"
 itertools = "0.11"
 itertools = "0.11"
 glob = "0.3"
 glob = "0.3"
 
 
 [target."cfg(windows)".dependencies]
 [target."cfg(windows)".dependencies]
-winapi = { version = "0.3", features = [
-  "handleapi",
-  "processenv",
-  "winbase",
-  "wincon",
-  "winnt",
-] }
+winapi = { version = "0.3", features = [ "handleapi", "processenv", "winbase", "wincon", "winnt" ] }
 cc = "1"
 cc = "1"
 
 
 [target."cfg(unix)".dependencies]
 [target."cfg(unix)".dependencies]
@@ -106,7 +95,7 @@ libc = "0.2"
 lto = true
 lto = true
 
 
 [features]
 [features]
-default = ["rustls"]
-native-tls = ["tauri-bundler/native-tls", "ureq/native-tls"]
-native-tls-vendored = ["native-tls", "tauri-bundler/native-tls-vendored"]
-rustls = ["tauri-bundler/rustls", "ureq/tls"]
+default = [ "rustls" ]
+native-tls = [ "tauri-bundler/native-tls", "ureq/native-tls" ]
+native-tls-vendored = [ "native-tls", "tauri-bundler/native-tls-vendored" ]
+rustls = [ "tauri-bundler/rustls", "ureq/tls" ]

+ 1 - 1
tooling/cli/metadata.json

@@ -1,6 +1,6 @@
 {
 {
   "cli.js": {
   "cli.js": {
-    "version": "1.5.10",
+    "version": "1.5.11",
     "node": ">= 10.0.0"
     "node": ">= 10.0.0"
   },
   },
   "tauri": "1.6.1",
   "tauri": "1.6.1",

+ 10 - 0
tooling/cli/node/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 # Changelog
 
 
+## \[1.5.11]
+
+### Bug Fixes
+
+- [`b15948b11`](https://www.github.com/tauri-apps/tauri/commit/b15948b11c0e362eea7ef57a4606f15f7dbd886b)([#8903](https://www.github.com/tauri-apps/tauri/pull/8903)) Fix `.taurignore` failing to ignore in some cases.
+
+### Dependencies
+
+- Upgraded to `tauri-cli@1.5.11`
+
 ## \[1.5.10]
 ## \[1.5.10]
 
 
 ### Bug Fixes
 ### Bug Fixes

+ 1 - 1
tooling/cli/node/package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "@tauri-apps/cli",
   "name": "@tauri-apps/cli",
-  "version": "1.5.10",
+  "version": "1.5.11",
   "description": "Command line interface for building Tauri apps",
   "description": "Command line interface for building Tauri apps",
   "funding": {
   "funding": {
     "type": "opencollective",
     "type": "opencollective",