From 916a26c2a193cab5092969d8261e1df68fe02dbf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 17:02:21 -0300 Subject: [PATCH] apply version updates (#9913) --- .changes/pre.json | 1 + tooling/bundler/CHANGELOG.md | 6 ++++ tooling/bundler/Cargo.toml | 47 ++++++++++++++------------- tooling/cli/CHANGELOG.md | 6 ++++ tooling/cli/Cargo.lock | 4 +-- tooling/cli/Cargo.toml | 60 +++++++++++++++-------------------- tooling/cli/metadata-v2.json | 2 +- tooling/cli/node/CHANGELOG.md | 6 ++++ tooling/cli/node/package.json | 2 +- 9 files changed, 71 insertions(+), 63 deletions(-) diff --git a/.changes/pre.json b/.changes/pre.json index b6e2bae02ae..167f3ea5315 100644 --- a/.changes/pre.json +++ b/.changes/pre.json @@ -173,6 +173,7 @@ ".changes/multiwebview-bounds-fixes.md", ".changes/nsis-append-product-name.md", ".changes/nsis-dpi-aware.md", + ".changes/nsis-shortcuts-regression.md", ".changes/path-result-error-rexport.md", ".changes/permission-platforms.md", ".changes/permission-table.md", diff --git a/tooling/bundler/CHANGELOG.md b/tooling/bundler/CHANGELOG.md index fa0239b25ac..dc5b6c030ec 100644 --- a/tooling/bundler/CHANGELOG.md +++ b/tooling/bundler/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.1-beta.16] + +### Bug Fixes + +- [`38df6ea1c`](https://www.github.com/tauri-apps/tauri/commit/38df6ea1c184307d294ee467c4b1c6a488b6e289)([#9909](https://www.github.com/tauri-apps/tauri/pull/9909)) Fix regression in NSIS where it created shortcuts that point to non-existent files. + ## \[2.0.1-beta.15] ### New Features diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml index f3ec6aca7b4..bac6b28809d 100644 --- a/tooling/bundler/Cargo.toml +++ b/tooling/bundler/Cargo.toml @@ -1,63 +1,62 @@ -workspace = {} +workspace = { } [package] name = "tauri-bundler" -version = "2.0.1-beta.15" +version = "2.0.1-beta.16" authors = [ "George Burton ", - "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.70" -exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"] +exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ] [dependencies] -tauri-utils = { version = "2.0.0-beta.17", path = "../../core/tauri-utils", features = [ - "resources", -] } +tauri-utils = { version = "2.0.0-beta.17", path = "../../core/tauri-utils", features = [ "resources" ] } image = "0.24.9" 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.11.0" tar = "0.4.40" walkdir = "2" handlebars = "5.1" tempfile = "3.10.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.6", default-features = false, features = [ - "socks-proxy", -] } +ureq = { version = "2.9.6", default-features = false, features = [ "socks-proxy" ] } native-tls = { version = "0.2", optional = true } hex = "0.4" semver = "1" sha1 = "0.10" sha2 = "0.10" -zip = { version = "0.6", default-features = false, features = ["deflate"] } +zip = { version = "0.6", default-features = false, features = [ "deflate" ] } dunce = "1" [target."cfg(target_os = \"windows\")".dependencies] -uuid = { version = "1", features = ["v4", "v5"] } +uuid = { version = "1", features = [ "v4", "v5" ] } bitness = "0.4" windows-registry = "0.1.1" glob = "0.3" -[target."cfg(target_os = \"windows\")".dependencies.windows-sys] -version = "0.52" -features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"] + [target."cfg(target_os = \"windows\")".dependencies.windows-sys] + version = "0.52" + 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] @@ -74,7 +73,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" ] diff --git a/tooling/cli/CHANGELOG.md b/tooling/cli/CHANGELOG.md index 4be62ec87d3..4e0e0f56563 100644 --- a/tooling/cli/CHANGELOG.md +++ b/tooling/cli/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.20] + +### Dependencies + +- Upgraded to `tauri-bundler@2.0.1-beta.16` + ## \[2.0.0-beta.19] ### New Features diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index e9eeb544f51..1d9b509e9a5 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -4839,7 +4839,7 @@ dependencies = [ [[package]] name = "tauri-bundler" -version = "2.0.1-beta.15" +version = "2.0.1-beta.16" dependencies = [ "anyhow", "ar", @@ -4881,7 +4881,7 @@ dependencies = [ [[package]] name = "tauri-cli" -version = "2.0.0-beta.19" +version = "2.0.0-beta.20" dependencies = [ "anyhow", "axum", diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index d99a534d638..8db33bf7781 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -1,13 +1,13 @@ [workspace] -members = ["node"] +members = [ "node" ] [package] name = "tauri-cli" -version = "2.0.0-beta.19" -authors = ["Tauri Programme within The Commons Conservancy"] +version = "2.0.0-beta.20" +authors = [ "Tauri Programme within The Commons Conservancy" ] edition = "2021" rust-version = "1.70" -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" @@ -20,7 +20,7 @@ include = [ "*.rs", "tauri.gitignore", "tauri-dev-watcher.gitignore", - "LICENSE*", + "LICENSE*" ] [package.metadata.binstall] @@ -40,60 +40,50 @@ path = "src/main.rs" [dependencies] cargo-mobile2 = { version = "0.12.1", default-features = false } -jsonrpsee = { version = "0.22", features = ["server"] } +jsonrpsee = { version = "0.22", features = [ "server" ] } jsonrpsee-core = "0.22" -jsonrpsee-client-transport = { version = "0.22", features = ["ws"] } +jsonrpsee-client-transport = { version = "0.22", features = [ "ws" ] } jsonrpsee-ws-client = { version = "0.22", default-features = false } sublime_fuzzy = "0.7" clap_complete = "4" -clap = { version = "4.5", features = ["derive", "env"] } +clap = { version = "4.5", features = [ "derive", "env" ] } anyhow = "1.0" -tauri-bundler = { version = "2.0.1-beta.15", default-features = false, path = "../bundler" } +tauri-bundler = { version = "2.0.1-beta.16", default-features = false, path = "../bundler" } colored = "2.1" -serde = { version = "1.0", features = ["derive"] } -serde_json = { version = "1.0", features = ["preserve_order"] } +serde = { version = "1.0", features = [ "derive" ] } +serde_json = { version = "1.0", features = [ "preserve_order" ] } notify = "6.1" notify-debouncer-mini = "0.4" shared_child = "1.0" duct = "0.13" -toml_edit = { version = "0.22", features = ["serde"] } +toml_edit = { version = "0.22", features = [ "serde" ] } json-patch = "1.2" -tauri-utils = { version = "2.0.0-beta.17", path = "../../core/tauri-utils", features = [ - "isolation", - "schema", - "config-json5", - "config-toml", -] } -tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ - "isolation", - "schema", - "config-json5", - "config-toml", -] } +tauri-utils = { version = "2.0.0-beta.17", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } +tauri-utils-v1 = { version = "1", package = "tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } toml = "0.8" jsonschema = "0.17" handlebars = "5.1" include_dir = "0.7" minisign = "=0.7.3" base64 = "0.22.0" -ureq = { version = "2.9.6", default-features = false, features = ["gzip"] } +ureq = { version = "2.9.6", default-features = false, features = [ "gzip" ] } os_info = "3" semver = "1.0" regex = "1.10.3" heck = "0.5" dialoguer = "0.11" -url = { version = "2.5", features = ["serde"] } +url = { version = "2.5", 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.11.3" icns = { package = "tauri-icns", version = "0.1" } -image = { version = "0.24", default-features = false, features = ["ico"] } -axum = { version = "0.7.4", features = ["ws"] } +image = { version = "0.24", default-features = false, features = [ "ico" ] } +axum = { version = "0.7.4", 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.12" @@ -108,7 +98,7 @@ version = "0.52" features = [ "Win32_Storage_FileSystem", "Win32_System_IO", - "Win32_System_Console", + "Win32_System_Console" ] [target."cfg(unix)".dependencies] @@ -118,14 +108,14 @@ libc = "0.2" plist = "1" [features] -default = ["rustls"] +default = [ "rustls" ] native-tls = [ "tauri-bundler/native-tls", "cargo-mobile2/native-tls", - "ureq/native-tls", + "ureq/native-tls" ] -native-tls-vendored = ["native-tls", "tauri-bundler/native-tls-vendored"] -rustls = ["tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls"] +native-tls-vendored = [ "native-tls", "tauri-bundler/native-tls-vendored" ] +rustls = [ "tauri-bundler/rustls", "cargo-mobile2/rustls", "ureq/tls" ] [profile.dev.package.miniz_oxide] opt-level = 3 diff --git a/tooling/cli/metadata-v2.json b/tooling/cli/metadata-v2.json index a9aecdf58a6..14d93771d45 100644 --- a/tooling/cli/metadata-v2.json +++ b/tooling/cli/metadata-v2.json @@ -1,6 +1,6 @@ { "cli.js": { - "version": "2.0.0-beta.19", + "version": "2.0.0-beta.20", "node": ">= 10.0.0" }, "tauri": "2.0.0-beta.22", diff --git a/tooling/cli/node/CHANGELOG.md b/tooling/cli/node/CHANGELOG.md index ac095d3b88e..8d7cc269ec4 100644 --- a/tooling/cli/node/CHANGELOG.md +++ b/tooling/cli/node/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-beta.20] + +### Dependencies + +- Upgraded to `tauri-cli@2.0.0-beta.20` + ## \[2.0.0-beta.19] ### New Features diff --git a/tooling/cli/node/package.json b/tooling/cli/node/package.json index 6a028561f2e..83fa66585a0 100644 --- a/tooling/cli/node/package.json +++ b/tooling/cli/node/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/cli", - "version": "2.0.0-beta.19", + "version": "2.0.0-beta.20", "description": "Command line interface for building Tauri apps", "funding": { "type": "opencollective",