apply version updates (#9639)

Co-authored-by: FabianLars <FabianLars@users.noreply.github.com>

.changes/pre.json

@@ -20,6 +20,7 @@
     ".changes/app-manifest.md",
     ".changes/assets-setup.md",
     ".changes/beta.md",
+    ".changes/better-error-for-invalid-plugin-config.md",
     ".changes/build-schema-generation.md",
     ".changes/bundler-deep-link-reg-path.md",
     ".changes/bundler-license.md",
@@ -40,6 +41,7 @@
     ".changes/cli-ds-store-dev-watch.md",
     ".changes/cli-empty-responses.md",
     ".changes/cli-frontend-dist-expected-path.md",
+    ".changes/cli-icon-non-0-exit.md",
     ".changes/cli-include-dir-cargo-manifest-dir.md",
     ".changes/cli-migrate-non-utf8.md",
     ".changes/cli-migrate-unknown-plugins.md",
@@ -80,6 +82,8 @@
     ".changes/deb-rpm-post-pre-scripts-bundler.md",
     ".changes/deb-rpm-post-pre-scripts-config.md",
     ".changes/deb-rpm-provides-conflicts-replaces.md",
+    ".changes/default-generic-for-menu.md",
+    ".changes/default-generic-for-tray.md",
     ".changes/dev-fn.md",
     ".changes/downgrade-minisign.md",
     ".changes/drop-nsis-applicationid.md",
@@ -112,6 +116,7 @@
     ".changes/fix-reparent.md",
     ".changes/fix-rewrite-schema.md",
     ".changes/fix-runtime-wry-32bit.md",
+    ".changes/fix-schemars-compatibility.md",
     ".changes/fix-scope-resolution.md",
     ".changes/fix-tauri-build-license-field.md",
     ".changes/fix-tauri-build-unix.md",
@@ -130,6 +135,7 @@
     ".changes/image-crate.md",
     ".changes/image-rgba-uint8array.md",
     ".changes/image-size-refactor.md",
+    ".changes/improve-errors-for-missing-links-property.md",
     ".changes/inline-plugins.md",
     ".changes/ios-signing-optional.md",
     ".changes/ipc-allow-headers.md",
@@ -188,6 +194,7 @@
     ".changes/tauri-utils-capability-refactor.md",
     ".changes/tauri-utils-plugin-module.md",
     ".changes/tauri-webview-events.md",
+    ".changes/tray-icon-rect.md",
     ".changes/tray-rect.md",
     ".changes/truncate-before-write-buildtask.md",
     ".changes/unstable-child-webview.md",

Cargo.lock

@@ -3527,7 +3527,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tauri"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.18"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3585,7 +3585,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -3607,7 +3607,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "base64 0.22.0",
  "brotli",
@@ -3644,7 +3644,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3656,7 +3656,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "anyhow",
  "glob",
@@ -3671,7 +3671,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "dpi",
  "gtk",
@@ -3688,7 +3688,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 dependencies = [
  "cocoa",
  "gtk",
@@ -3711,7 +3711,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "aes-gcm",
  "brotli",

core/tauri-build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-codegen@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Bug Fixes

core/tauri-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "build time code to pair with https://crates.io/crates/tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -28,8 +28,8 @@ rustdoc-args = [ "--cfg", "docsrs" ]
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "2.0.0-beta.13", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils", features = [ "build", "resources" ] }
+tauri-codegen = { version = "2.0.0-beta.14", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build", "resources" ] }
 cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"

core/tauri-codegen/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Dependencies

core/tauri-codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-codegen"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,7 +20,7 @@ quote = "1"
 syn = "2"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils", features = [ "build" ] }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build" ] }
 thiserror = "1"
 walkdir = "2"
 brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }

core/tauri-macros/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-codegen@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Dependencies

core/tauri-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-macros"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "Macros for the tauri crate."
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = [ "span-locations" ] }
 quote = "1"
 syn = { version = "2", features = [ "full" ] }
 heck = "0.5"
-tauri-codegen = { version = "2.0.0-beta.13", default-features = false, path = "../tauri-codegen" }
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" }
+tauri-codegen = { version = "2.0.0-beta.14", default-features = false, path = "../tauri-codegen" }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
 
 [features]
 custom-protocol = [ ]

core/tauri-plugin/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Enhancements
+
+- [`bf2635ab6`](https://www.github.com/tauri-apps/tauri/commit/bf2635ab6241a5b82569eafc939046d6e245f3ad)([#9632](https://www.github.com/tauri-apps/tauri/pull/9632)) Improve the error message that is shown when the `links` property is missing from a Tauri Plugin.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Dependencies

core/tauri-plugin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "Build script and runtime Tauri plugin definitions"
 authors = { workspace = true }
 homepage = { workspace = true }
@@ -30,7 +30,7 @@ runtime = [ ]
 [dependencies]
 anyhow = { version = "1", optional = true }
 serde = { version = "1", optional = true }
-tauri-utils = { version = "2.0.0-beta.13", default-features = false, features = [ "build" ], path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.14", default-features = false, features = [ "build" ], path = "../tauri-utils" }
 serde_json = { version = "1", optional = true }
 glob = { version = "0.3", optional = true }
 toml = { version = "0.8", optional = true }

core/tauri-runtime-wry/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-runtime@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### New Features

core/tauri-runtime-wry/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime-wry"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Wry bindings to the Tauri runtime"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -15,8 +15,8 @@ rust-version = { workspace = true }
 [dependencies]
 wry = { version = "0.39.3", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
 tao = { version = "0.27", default-features = false, features = [ "rwh_06" ] }
-tauri-runtime = { version = "2.0.0-beta.14", path = "../tauri-runtime" }
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" }
+tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
 raw-window-handle = "0.6"
 http = "1.1"
 url = "2"

core/tauri-runtime-wry/src/lib.rs

@@ -4107,7 +4107,7 @@ fn inner_size(
   webviews: &[WebviewWrapper],
   has_children: bool,
 ) -> TaoPhysicalSize<u32> {
-  if !has_children && webviews.len() > 0 {
+  if !has_children && !webviews.is_empty() {
     use wry::WebViewExtMacOS;
     let webview = webviews.first().unwrap();
     let view_frame = unsafe { cocoa::appkit::NSView::frame(webview.webview()) };

core/tauri-runtime/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.14]
 
 ### New Features

core/tauri-runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Runtime for Tauri applications"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -29,7 +29,7 @@ targets = [
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
-tauri-utils = { version = "2.0.0-beta.13", path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
 http = "1.1"
 raw-window-handle = "0.6"
 url = { version = "2" }

core/tauri-utils/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.14]
+
+### Bug Fixes
+
+- [`3fbc1703f`](https://www.github.com/tauri-apps/tauri/commit/3fbc1703f107dfb2c5a75e848805dcf60d449eb1)([#9676](https://www.github.com/tauri-apps/tauri/pull/9676)) Fixes `schemars` compilation issue.
+
 ## \[2.0.0-beta.13]
 
 ### Bug Fixes

core/tauri-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-utils"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 description = "Utilities for Tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"

core/tauri/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## \[2.0.0-beta.18]
+
+### New Features
+
+- [`07ff78c2d`](https://www.github.com/tauri-apps/tauri/commit/07ff78c2de74d3bd85328ce6536f8a858be89128)([#9615](https://www.github.com/tauri-apps/tauri/pull/9615)) Add `TrayIcon::rect` method to retrieve the tray icon rectangle
+
+### Enhancements
+
+- [`7f6d2698c`](https://www.github.com/tauri-apps/tauri/commit/7f6d2698c923019e4ce53f794e68aa7e56fd7b86)([#9631](https://www.github.com/tauri-apps/tauri/pull/9631)) Improve the error message that is shown when deserializing the Tauri plugin config.
+- [`8a71858eb`](https://www.github.com/tauri-apps/tauri/commit/8a71858eb2a9dc12a43d8fb56f803cdcae072b68)([#9630](https://www.github.com/tauri-apps/tauri/pull/9630)) Provide a default for the runtime generic on `Menu`, `MenuItem`, `Submenu`, `PredefinedMenuItem`, `CheckMenuItem` and `IconMenuItem`.
+- [`8a71858eb`](https://www.github.com/tauri-apps/tauri/commit/8a71858eb2a9dc12a43d8fb56f803cdcae072b68)([#9630](https://www.github.com/tauri-apps/tauri/pull/9630)) Provide a default for the runtime generic on `TrayIcon`.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-runtime@2.0.0-beta.15`
+- Upgraded to `tauri-runtime-wry@2.0.0-beta.15`
+- Upgraded to `tauri-macros@2.0.0-beta.14`
+- Upgraded to `tauri-build@2.0.0-beta.14`
+
 ## \[2.0.0-beta.17]
 
 ### New Features

core/tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri"
-version = "2.0.0-beta.17"
+version = "2.0.0-beta.18"
 description = "Make tiny, secure apps for all desktop platforms with Tauri"
 exclude = [ "/test", "/.scripts", "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -51,10 +51,10 @@ uuid = { version = "1", features = [ "v4" ], optional = true }
 url = "2"
 anyhow = "1.0"
 thiserror = "1.0"
-tauri-runtime = { version = "2.0.0-beta.14", path = "../tauri-runtime" }
-tauri-macros = { version = "2.0.0-beta.13", path = "../tauri-macros" }
-tauri-utils = { version = "2.0.0-beta.13", features = [ "resources" ], path = "../tauri-utils" }
-tauri-runtime-wry = { version = "2.0.0-beta.14", path = "../tauri-runtime-wry", optional = true }
+tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
+tauri-macros = { version = "2.0.0-beta.14", path = "../tauri-macros" }
+tauri-utils = { version = "2.0.0-beta.14", features = [ "resources" ], path = "../tauri-utils" }
+tauri-runtime-wry = { version = "2.0.0-beta.15", path = "../tauri-runtime-wry", optional = true }
 getrandom = "0.2"
 serde_repr = "0.1"
 state = "0.6"
@@ -110,8 +110,8 @@ swift-rs = "1.0.6"
 
 [build-dependencies]
 heck = "0.5"
-tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.13" }
-tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.13", features = [ "build" ] }
+tauri-build = { path = "../tauri-build/", default-features = false, version = "2.0.0-beta.14" }
+tauri-utils = { path = "../tauri-utils/", version = "2.0.0-beta.14", features = [ "build" ] }
 
 [dev-dependencies]
 proptest = "1.4.0"

tooling/bundler/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.1-beta.12]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.1-beta.11]
 
 ### Enhancements

tooling/bundler/Cargo.toml

@@ -2,7 +2,7 @@ workspace = { }
 
 [package]
 name = "tauri-bundler"
-version = "2.0.1-beta.11"
+version = "2.0.1-beta.12"
 authors = [
   "George Burton <burtonageo@gmail.com>",
   "Tauri Programme within The Commons Conservancy"
@@ -17,7 +17,7 @@ rust-version = "1.70"
 exclude = [ "CHANGELOG.md", "/target", "rustfmt.toml" ]
 
 [dependencies]
-tauri-utils = { version = "2.0.0-beta.13", path = "../../core/tauri-utils", features = [ "resources" ] }
+tauri-utils = { version = "2.0.0-beta.14", path = "../../core/tauri-utils", features = [ "resources" ] }
 image = "0.24.9"
 flate2 = "1.0"
 anyhow = "1.0"

tooling/bundler/src/bundle/windows/nsis.rs

@@ -230,8 +230,8 @@ fn build_nsis_app_installer(
   let mut custom_template_path = None;
   let mut custom_language_files = None;
   if let Some(nsis) = &settings.windows().nsis {
-    custom_template_path = nsis.template.clone();
-    custom_language_files = nsis.custom_language_files.clone();
+    custom_template_path.clone_from(&nsis.template);
+    custom_language_files.clone_from(&nsis.custom_language_files);
     install_mode = nsis.install_mode;
     if let Some(langs) = &nsis.languages {
       languages.clear();

tooling/cli/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### Bug Fixes
+
+- [`97ec422f2`](https://www.github.com/tauri-apps/tauri/commit/97ec422f22d069b9570931834241c7e47bc68cc3)([#9638](https://www.github.com/tauri-apps/tauri/pull/9638)) Exit `tauri icon` with non-zero code when it fails.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-bundler@2.0.1-beta.12`
+
 ## \[2.0.0-beta.15]
 
 ### Bug Fixes

tooling/cli/Cargo.lock

@@ -4853,7 +4853,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-bundler"
-version = "2.0.1-beta.11"
+version = "2.0.1-beta.12"
 dependencies = [
  "anyhow",
  "ar",
@@ -4881,7 +4881,7 @@ dependencies = [
  "strsim 0.11.0",
  "tar",
  "tauri-icns",
- "tauri-utils 2.0.0-beta.13",
+ "tauri-utils 2.0.0-beta.14",
  "tempfile",
  "thiserror",
  "time",
@@ -4895,7 +4895,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-cli"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 dependencies = [
  "anyhow",
  "axum",
@@ -4946,7 +4946,7 @@ dependencies = [
  "tauri-bundler",
  "tauri-icns",
  "tauri-utils 1.5.4",
- "tauri-utils 2.0.0-beta.13",
+ "tauri-utils 2.0.0-beta.14",
  "thiserror",
  "tokio",
  "toml 0.8.10",
@@ -5012,7 +5012,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.0.0-beta.13"
+version = "2.0.0-beta.14"
 dependencies = [
  "aes-gcm",
  "ctor",

tooling/cli/Cargo.toml

@@ -3,7 +3,7 @@ members = [ "node" ]
 
 [package]
 name = "tauri-cli"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 edition = "2021"
 rust-version = "1.70"
@@ -49,7 +49,7 @@ sublime_fuzzy = "0.7"
 clap_complete = "4"
 clap = { version = "4.5", features = [ "derive", "env" ] }
 anyhow = "1.0"
-tauri-bundler = { version = "2.0.1-beta.11", default-features = false, path = "../bundler" }
+tauri-bundler = { version = "2.0.1-beta.12", default-features = false, path = "../bundler" }
 colored = "2.1"
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = { version = "1.0", features = [ "preserve_order" ] }
@@ -59,7 +59,7 @@ shared_child = "1.0"
 duct = "0.13"
 toml_edit = { version = "0.22", features = [ "serde" ] }
 json-patch = "1.2"
-tauri-utils = { version = "2.0.0-beta.13", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] }
+tauri-utils = { version = "2.0.0-beta.14", 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"

tooling/cli/metadata-v2.json

@@ -1,9 +1,9 @@
 {
   "cli.js": {
-    "version": "2.0.0-beta.15",
+    "version": "2.0.0-beta.16",
     "node": ">= 10.0.0"
   },
-  "tauri": "2.0.0-beta.17",
-  "tauri-build": "2.0.0-beta.13",
-  "tauri-plugin": "2.0.0-beta.13"
+  "tauri": "2.0.0-beta.18",
+  "tauri-build": "2.0.0-beta.14",
+  "tauri-plugin": "2.0.0-beta.14"
 }

tooling/cli/node/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### Bug Fixes
+
+- [`97ec422f2`](https://www.github.com/tauri-apps/tauri/commit/97ec422f22d069b9570931834241c7e47bc68cc3)([#9638](https://www.github.com/tauri-apps/tauri/pull/9638)) Exit `tauri icon` with non-zero code when it fails.
+
+### Dependencies
+
+- Upgraded to `tauri-cli@2.0.0-beta.16`
+
 ## \[2.0.0-beta.15]
 
 ### Dependencies

tooling/cli/node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/cli",
-  "version": "2.0.0-beta.15",
+  "version": "2.0.0-beta.16",
   "description": "Command line interface for building Tauri apps",
   "funding": {
     "type": "opencollective",