Merge branch 'dev' into refactor/remove-unneded-rand-uuid-usages

.changes/devicectl.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:feat
+"@tauri-apps/cli": patch:feat
+---
+
+Use `devicectl` to connect to iOS 17+ devices on macOS 14+.

.changes/pre.json

@@ -24,6 +24,7 @@
     ".changes/cli-android-split-per-abit-target.md",
     ".changes/cli-apple-dev-team.md",
     ".changes/cli-built-in-dev-server-mobile.md",
+    ".changes/cli-config-target-mobile.md",
     ".changes/cli-expose-plugin-config.md",
     ".changes/cli-ios-build.md",
     ".changes/cli-ios-metadata-env-var.md",
@@ -41,6 +42,7 @@
     ".changes/cli-skip-targets-install.md",
     ".changes/cli-wry-0-28.md",
     ".changes/codegen-mobile-devurl.md",
+    ".changes/codegen-target-from-utils.md",
     ".changes/config-incognito.md",
     ".changes/config-tray-icon-tooltip.md",
     ".changes/config-tray-icon.md",
@@ -58,6 +60,7 @@
     ".changes/default-window-icon.md",
     ".changes/dev-proxy-response-cache.md",
     ".changes/dev-proxy.md",
+    ".changes/devicectl.md",
     ".changes/dnd-position.md",
     ".changes/downgrade-min-sdk-version.md",
     ".changes/dynamic-wry-plugin.md",
@@ -72,6 +75,7 @@
     ".changes/fix-channel-data-request.md",
     ".changes/fix-dev-server-proxy-path.md",
     ".changes/fix-empty-identifier.md",
+    ".changes/fix-icons-android.md",
     ".changes/fix-ios-cli-panic.md",
     ".changes/fix-ios-logs.md",
     ".changes/fix-ios-plugin-throws-command.md",
@@ -127,6 +131,7 @@
     ".changes/migrate-csp.md",
     ".changes/migrate-plugins.md",
     ".changes/min-sdk-version.md",
+    ".changes/mobile-config-naming-conventions.md",
     ".changes/mobile-config.md",
     ".changes/mobile-dev-watcher-ignore-gen.md",
     ".changes/mobile-entry-point-macro.md",
@@ -204,6 +209,7 @@
     ".changes/runtime-new-args.md",
     ".changes/runtime-opened-event.md",
     ".changes/safepathbuf-refactor.md",
+    ".changes/set_native_icon_signature.md",
     ".changes/shadow-api.md",
     ".changes/shadow-config.md",
     ".changes/shadow.md",
@@ -214,24 +220,32 @@
     ".changes/submenu-and-menu-builders-item-and-id.md",
     ".changes/system-tray-feat.md",
     ".changes/target-dir-detection.md",
+    ".changes/tauri-api-removal.md",
     ".changes/tauri-app-handle-ref.md",
+    ".changes/tauri-asset-protocol.md",
     ".changes/tauri-build-mobile.md",
     ".changes/tauri-cleanup-before-exit.md",
     ".changes/tauri-defaultvbox.md",
+    ".changes/tauri-env-args.md",
     ".changes/tauri-libxdo-feat.md",
     ".changes/tauri-menu-tray-refactor.md",
     ".changes/tauri-mobile-entry-point.md",
     ".changes/tauri-nsview.md",
     ".changes/tauri-run_on_main_thread.md",
     ".changes/tauri-runtime-wry-wry-0-28.md",
+    ".changes/tauri-scopes.md",
     ".changes/tauri-tray-icon-feat-flag.md",
+    ".changes/tauri-tray-icon-id.md",
+    ".changes/tauri-tray-on-tray-event.md",
+    ".changes/tauri-utils-tray-icon-id copy.md",
     ".changes/tempdir-api.md",
     ".changes/tempdir-core.md",
     ".changes/tls-features-automatically-enabled.md",
     ".changes/tls-features-refactor.md",
     ".changes/ubuntu-20.04-cli.js.md",
     ".changes/ubuntu-20.04-cli.rs.md",
     ".changes/update-entitlements-api.md",
+    ".changes/validate-appimage.md",
     ".changes/window-effects-api.md",
     ".changes/window-effects-config.md",
     ".changes/window-effects.md",

.changes/tauri-scopes.md

@@ -0,0 +1,9 @@
+---
+'tauri': 'patch:breaking'
+---
+
+`tauri::scope` module is recieving a couple of consistency changes:
+
+- Added `tauri::scope::fs` module.
+- Removed `scope::IpcScope` re-export, use `scope::ipc::Scope`.
+- Removed `FsScope`, `GlobPattern` and `FsScopeEvent`, use `scope::fs::Scope`, `scope::fs::Pattern` and `scope::fs::Event` respectively.

.changes/tauri-tray-icon-id.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:enhance'
+---
+
+Set `main` as the default `id` for the tray icon registered from the configuration file, so if the `id` is not specified, it can be retrieved using `app.tray_by_id("main")`.

.changes/tauri-tray-on-tray-event.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'patch:breaking'
+---
+
+Changed `TrayIconBuilder/TrayIcon::on_tray_event` to `TrayIconBuilder/TrayIcon::on_tray_icon_event` for consistency of naming.

.changes/tauri-utils-tray-icon-id copy.md

@@ -0,0 +1,5 @@
+---
+'tauri-utils': 'patch:enhance'
+---
+
+Add an option to specify `id` for the tray icon in the tauri configuration file.

.github/workflows/test-core.yml

@@ -105,6 +105,7 @@ jobs:
           cargo update -p [email protected] --precise 0.7.6
           cargo update -p [email protected] --precise 0.19.14
           cargo update -p [email protected] --precise 0.15.4
+          cargo update -p system-deps --precise 6.1.1
 
       - name: test
         uses: actions-rs/cargo@v1

core/tauri-build/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-alpha.9]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-alpha.8]
 
 ### Bug Fixes

core/tauri-build/Cargo.toml

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

core/tauri-codegen/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## \[2.0.0-alpha.8]
+
+### Enhancements
+
+- [`100d9ede`](https://www.github.com/tauri-apps/tauri/commit/100d9ede35995d9db21d2087dd5606adfafb89a5)([#7802](https://www.github.com/tauri-apps/tauri/pull/7802)) Use `Target` enum from `tauri_utils::platform`.
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-alpha.7]
 
 ### Dependencies

core/tauri-codegen/Cargo.toml

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

core/tauri-config-schema/schema.json

@@ -113,7 +113,7 @@
   "additionalProperties": false,
   "definitions": {
     "PackageConfig": {
-      "description": "The package configuration.\n\nSee more: https://tauri.app/v1/api/config#packageconfig",
+      "description": "The package configuration.\n\nSee more: <https://tauri.app/v1/api/config#packageconfig>",
       "type": "object",
       "properties": {
         "productName": {
@@ -136,7 +136,7 @@
       "additionalProperties": false
     },
     "TauriConfig": {
-      "description": "The Tauri configuration object.\n\nSee more: https://tauri.app/v1/api/config#tauriconfig",
+      "description": "The Tauri configuration object.\n\nSee more: <https://tauri.app/v1/api/config#tauriconfig>",
       "type": "object",
       "properties": {
         "pattern": {
@@ -291,7 +291,7 @@
       ]
     },
     "WindowConfig": {
-      "description": "The window configuration object.\n\nSee more: https://tauri.app/v1/api/config#windowconfig",
+      "description": "The window configuration object.\n\nSee more: <https://tauri.app/v1/api/config#windowconfig>",
       "type": "object",
       "properties": {
         "label": {
@@ -510,7 +510,7 @@
           "type": "boolean"
         },
         "windowEffects": {
-          "description": "Window effects.\n\nRequires the window to be transparent.\n\n## Platform-specific:\n\n- **Windows**: If using decorations or shadows, you may want to try this workaround https://github.com/tauri-apps/tao/issues/72#issuecomment-975607891 - **Linux**: Unsupported",
+          "description": "Window effects.\n\nRequires the window to be transparent.\n\n## Platform-specific:\n\n- **Windows**: If using decorations or shadows, you may want to try this workaround <https://github.com/tauri-apps/tao/issues/72#issuecomment-975607891> - **Linux**: Unsupported",
           "anyOf": [
             {
               "$ref": "#/definitions/WindowEffectsConfig"
@@ -867,7 +867,7 @@
       "minItems": 4
     },
     "BundleConfig": {
-      "description": "Configuration for tauri-bundler.\n\nSee more: https://tauri.app/v1/api/config#bundleconfig",
+      "description": "Configuration for tauri-bundler.\n\nSee more: <https://tauri.app/v1/api/config#bundleconfig>",
       "type": "object",
       "required": [
         "identifier"
@@ -1229,7 +1229,7 @@
       ]
     },
     "AppImageConfig": {
-      "description": "Configuration for AppImage bundles.\n\nSee more: https://tauri.app/v1/api/config#appimageconfig",
+      "description": "Configuration for AppImage bundles.\n\nSee more: <https://tauri.app/v1/api/config#appimageconfig>",
       "type": "object",
       "properties": {
         "bundleMediaFramework": {
@@ -1241,7 +1241,7 @@
       "additionalProperties": false
     },
     "DebConfig": {
-      "description": "Configuration for Debian (.deb) bundles.\n\nSee more: https://tauri.app/v1/api/config#debconfig",
+      "description": "Configuration for Debian (.deb) bundles.\n\nSee more: <https://tauri.app/v1/api/config#debconfig>",
       "type": "object",
       "properties": {
         "depends": {
@@ -1273,7 +1273,7 @@
       "additionalProperties": false
     },
     "MacConfig": {
-      "description": "Configuration for the macOS bundles.\n\nSee more: https://tauri.app/v1/api/config#macconfig",
+      "description": "Configuration for the macOS bundles.\n\nSee more: <https://tauri.app/v1/api/config#macconfig>",
       "type": "object",
       "properties": {
         "frameworks": {
@@ -1333,7 +1333,7 @@
       "additionalProperties": false
     },
     "WindowsConfig": {
-      "description": "Windows bundler configuration.\n\nSee more: https://tauri.app/v1/api/config#windowsconfig",
+      "description": "Windows bundler configuration.\n\nSee more: <https://tauri.app/v1/api/config#windowsconfig>",
       "type": "object",
       "properties": {
         "digestAlgorithm": {
@@ -1517,7 +1517,7 @@
       ]
     },
     "WixConfig": {
-      "description": "Configuration for the MSI bundle using WiX.\n\nSee more: https://tauri.app/v1/api/config#wixconfig",
+      "description": "Configuration for the MSI bundle using WiX.\n\nSee more: <https://tauri.app/v1/api/config#wixconfig>",
       "type": "object",
       "properties": {
         "language": {
@@ -1642,7 +1642,7 @@
       ]
     },
     "WixLanguageConfig": {
-      "description": "Configuration for a target language for the WiX build.\n\nSee more: https://tauri.app/v1/api/config#wixlanguageconfig",
+      "description": "Configuration for a target language for the WiX build.\n\nSee more: <https://tauri.app/v1/api/config#wixlanguageconfig>",
       "type": "object",
       "properties": {
         "localePath": {
@@ -1786,7 +1786,7 @@
       "additionalProperties": false
     },
     "UpdaterConfig": {
-      "description": "The Updater configuration object.\n\nSee more: https://tauri.app/v1/api/config#updaterconfig",
+      "description": "The Updater configuration object.\n\nSee more: <https://tauri.app/v1/api/config#updaterconfig>",
       "type": "object",
       "properties": {
         "active": {
@@ -1814,7 +1814,7 @@
       "additionalProperties": false
     },
     "UpdaterWindowsConfig": {
-      "description": "The updater configuration for Windows.\n\nSee more: https://tauri.app/v1/api/config#updaterwindowsconfig",
+      "description": "The updater configuration for Windows.\n\nSee more: <https://tauri.app/v1/api/config#updaterwindowsconfig>",
       "type": "object",
       "properties": {
         "installMode": {
@@ -1856,7 +1856,7 @@
       ]
     },
     "SecurityConfig": {
-      "description": "Security configuration.\n\nSee more: https://tauri.app/v1/api/config#securityconfig",
+      "description": "Security configuration.\n\nSee more: <https://tauri.app/v1/api/config#securityconfig>",
       "type": "object",
       "properties": {
         "csp": {
@@ -2004,7 +2004,7 @@
       "additionalProperties": false
     },
     "AssetProtocolConfig": {
-      "description": "Config for the asset custom protocol.\n\nSee more: https://tauri.app/v1/api/config#assetprotocolconfig",
+      "description": "Config for the asset custom protocol.\n\nSee more: <https://tauri.app/v1/api/config#assetprotocolconfig>",
       "type": "object",
       "properties": {
         "scope": {
@@ -2066,12 +2066,19 @@
       ]
     },
     "TrayIconConfig": {
-      "description": "Configuration for application tray icon.\n\nSee more: https://tauri.app/v1/api/config#trayiconconfig",
+      "description": "Configuration for application tray icon.\n\nSee more: <https://tauri.app/v1/api/config#trayiconconfig>",
       "type": "object",
       "required": [
         "iconPath"
       ],
       "properties": {
+        "id": {
+          "description": "Set an id for this tray icon so you can reference it later, defaults to `main`.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
         "iconPath": {
           "description": "Path to the default icon to use for the tray icon.",
           "type": "string"
@@ -2104,7 +2111,7 @@
       "additionalProperties": false
     },
     "BuildConfig": {
-      "description": "The Build configuration object.\n\nSee more: https://tauri.app/v1/api/config#buildconfig",
+      "description": "The Build configuration object.\n\nSee more: <https://tauri.app/v1/api/config#buildconfig>",
       "type": "object",
       "properties": {
         "runner": {
@@ -2267,7 +2274,7 @@
       ]
     },
     "PluginConfig": {
-      "description": "The plugin configs holds a HashMap mapping a plugin name to its configuration object.\n\nSee more: https://tauri.app/v1/api/config#pluginconfig",
+      "description": "The plugin configs holds a HashMap mapping a plugin name to its configuration object.\n\nSee more: <https://tauri.app/v1/api/config#pluginconfig>",
       "type": "object",
       "additionalProperties": true
     }

core/tauri-macros/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## \[2.0.0-alpha.8]
+
+### Enhancements
+
+- [`100d9ede`](https://www.github.com/tauri-apps/tauri/commit/100d9ede35995d9db21d2087dd5606adfafb89a5)([#7802](https://www.github.com/tauri-apps/tauri/pull/7802)) Use `Target` enum from `tauri_utils::platform`.
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.0-alpha.7]
 
 ### Dependencies

core/tauri-macros/Cargo.toml

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