Skip to content

Commit

Permalink
Apply Version Updates From Current Changes (v1) (#9074)
Browse files Browse the repository at this point in the history
Co-authored-by: lucasfernog <[email protected]>
  • Loading branch information
github-actions[bot] and lucasfernog authored Mar 7, 2024
1 parent 97a0514 commit b705f89
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 76 deletions.
5 changes: 0 additions & 5 deletions .changes/escape-paths-wix.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/log-stable-features.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changes/taurignore-ignoring-folders-not-working-for-watch.md

This file was deleted.

7 changes: 7 additions & 0 deletions tooling/bundler/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# 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]

### New Features
Expand Down
45 changes: 22 additions & 23 deletions tooling/bundler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,42 +1,38 @@
workspace = {}
workspace = { }

[package]
name = "tauri-bundler"
version = "1.5.0"
version = "1.5.1"
authors = [
"George Burton <[email protected]>",
"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"
keywords = ["bundle", "cargo", "tauri"]
keywords = [ "bundle", "cargo", "tauri" ]
repository = "https://github.com/tauri-apps/tauri"
description = "Wrap rust executables in OS-specific app bundles for Tauri"
edition = "2021"
rust-version = "1.60"
exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]
exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]

[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"
flate2 = "1.0"
anyhow = "1.0"
thiserror = "1.0"
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0", features = [ "derive" ] }
strsim = "0.10.0"
tar = "0.4.40"
walkdir = "2"
handlebars = "4.5"
tempfile = "3.8.1"
log = { version = "0.4.21", features = ["kv"] }
log = { version = "0.4.21", features = [ "kv" ] }
dirs-next = "2.0"
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 }
hex = "0.4"
semver = "1"
Expand All @@ -46,17 +42,20 @@ zip = "0.6"
dunce = "1"

[target."cfg(target_os = \"windows\")".dependencies]
uuid = { version = "1", features = ["v4", "v5"] }
uuid = { version = "1", features = [ "v4", "v5" ] }
winreg = "0.51"
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]
icns = { package = "tauri-icns", version = "0.1" }
time = { version = "0.3", features = ["formatting"] }
time = { version = "0.3", features = [ "formatting" ] }
plist = "1"

[target."cfg(any(target_os = \"macos\", target_os = \"windows\"))".dependencies]
Expand All @@ -72,7 +71,7 @@ name = "tauri_bundler"
path = "src/lib.rs"

[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 changes: 11 additions & 0 deletions tooling/cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# 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 `[email protected]`

## \[1.5.10]

### New Features
Expand Down
4 changes: 2 additions & 2 deletions tooling/cli/Cargo.lock

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

53 changes: 21 additions & 32 deletions tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[workspace]
members = ["node"]
members = [ "node" ]

[package]
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"
rust-version = "1.60"
categories = ["gui", "web-programming"]
categories = [ "gui", "web-programming" ]
license = "Apache-2.0 OR MIT"
homepage = "https://tauri.app"
repository = "https://github.com/tauri-apps/tauri"
Expand All @@ -20,7 +20,7 @@ include = [
"*.rs",
"tauri.gitignore",
"tauri-dev-watcher.gitignore",
"LICENSE*",
"LICENSE*"
]

[package.metadata.binstall]
Expand All @@ -40,63 +40,52 @@ path = "src/main.rs"

[dependencies]
clap_complete = "4"
clap = { version = "4.4", features = ["derive"] }
clap = { version = "4.4", features = [ "derive" ] }
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"
once_cell = "1"
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"
notify = "6.1"
notify-debouncer-mini = "0.4"
shared_child = "1.0"
toml_edit = "0.21"
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"
jsonschema = "0.17"
handlebars = "4.4"
include_dir = "0.7"
minisign = "=0.7.3"
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"
semver = "1.0"
regex = "1.10.2"
unicode-width = "0.1"
zeroize = "1.6"
heck = { version = "0.4", features = ["unicode"] }
heck = { version = "0.4", features = [ "unicode" ] }
dialoguer = "0.11"
url = { version = "2.4", features = ["serde"] }
url = { version = "2.4", features = [ "serde" ] }
os_pipe = "1"
ignore = "0.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"
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"
kuchiki = { package = "kuchikiki", version = "0.8" }
tokio = { version = "1", features = ["macros", "sync"] }
tokio = { version = "1", features = [ "macros", "sync" ] }
common-path = "1"
serde-value = "0.7.0"
itertools = "0.11"
glob = "0.3"

[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"

[target."cfg(unix)".dependencies]
Expand All @@ -106,7 +95,7 @@ libc = "0.2"
lto = true

[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" ]
2 changes: 1 addition & 1 deletion tooling/cli/metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cli.js": {
"version": "1.5.10",
"version": "1.5.11",
"node": ">= 10.0.0"
},
"tauri": "1.6.1",
Expand Down
10 changes: 10 additions & 0 deletions tooling/cli/node/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# 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 `[email protected]`

## \[1.5.10]

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion tooling/cli/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/cli",
"version": "1.5.10",
"version": "1.5.11",
"description": "Command line interface for building Tauri apps",
"funding": {
"type": "opencollective",
Expand Down

0 comments on commit b705f89

Please sign in to comment.