ci: delete .changes/updater-new-bundle-support.md

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Fabian-Lars <github@fabianlars.de>

.github/CONTRIBUTING.md

@@ -0,0 +1,62 @@
+# Tauri Contributing Guide
+
+Hi! We, the maintainers, are really excited that you are interested in contributing to Tauri. Before submitting your contribution though, please make sure to take a moment and read through the [Code of Conduct](CODE_OF_CONDUCT.md), as well as the appropriate section for the contribution you intend to make:
+
+- [Issue Reporting Guidelines](#issue-reporting-guidelines)
+- [Pull Request Guidelines](#pull-request-guidelines)
+- [Development Guide](#development-guide)
+
+## Issue Reporting Guidelines
+
+- The issue list of this repo is **exclusively** for bug reports and feature requests. Non-conforming issues will be closed immediately.
+
+- If you have a question, you can get quick answers from the [Tauri Discord chat](https://discord.com/invite/tauri).
+
+- Try to search for your issue, it may have already been answered or even fixed in the development branch (`v2`).
+
+- Check if the issue is reproducible with the latest stable version of Tauri. If you are using a pre-release, please indicate the specific version you are using.
+
+- It is **required** that you clearly describe the steps necessary to reproduce the issue you are running into. Although we would love to help our users as much as possible, diagnosing issues without clear reproduction steps is extremely time-consuming and simply not sustainable.
+
+- Use only the minimum amount of code necessary to reproduce the unexpected behavior. A good bug report should isolate specific methods that exhibit unexpected behavior and precisely define how expectations were violated. What did you expect the method or methods to do, and how did the observed behavior differ? The more precisely you isolate the issue, the faster we can investigate.
+
+- Issues with no clear repro steps will not be triaged. If an issue labeled "need repro" receives no further input from the issue author for more than 5 days, it will be closed.
+
+- If your issue is resolved but still open, don't hesitate to close it. In case you found a solution by yourself, it could be helpful for others to explain how you fixed it.
+
+- Most importantly, we beg your patience: the team must balance your request against many other responsibilities — fixing other bugs, answering other questions, new features, new documentation, etc. The issue list is not paid support and we cannot make guarantees about how fast your issue can be resolved.
+
+## Pull Request Guidelines
+
+- You have to [sign your commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
+
+- It's OK to have multiple small commits as you work on the PR - we will let GitHub automatically squash it before merging.
+
+- If adding new feature:
+  - Provide convincing reason to add this feature. Ideally you should open a suggestion issue first and have it greenlighted before working on it.
+
+- If fixing a bug:
+  - If you are resolving a special issue, add `(fix: #xxxx[,#xxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `fix: update entities encoding/decoding (fix #3899)`.
+  - Provide detailed description of the bug in the PR, or link to an issue that does.
+
+- If the PR is meant to be released, follow the instructions in `.changes/readme.md` to log your changes. ie. [readme.md](https://github.com/tauri-apps/plugins-workspace/blob/v2/.changes/readme.md)
+
+## Development Guide
+
+**NOTE: If you have any question don't hesitate to ask in our Discord server. We try to keep this guide to up guide, but if something doesn't work let us know.**
+
+### General Setup
+
+First, [join our Discord server](https://discord.com/invite/tauri) and let us know that you want to contribute. This way we can point you in the right direction and help ensure your contribution will be as helpful as possible.
+
+To set up your machine for development, follow the [Tauri setup guide](https://v2.tauri.app/start/prerequisites/) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [PNPM](https://pnpm.io/).
+
+Next, [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) and clone [this repository](https://github.com/tauri-apps/plugins-workspace/tree/v2).
+
+### Developing and testing
+
+The easiest way to test your changes is to use the [example app](https://github.com/tauri-apps/plugins-workspace/tree/v2/examples/api) example app. It automatically rebuilds and uses your local copy of the plugins. To run it follow the instructions inside [README.md](https://github.com/tauri-apps/plugins-workspace/blob/v2/examples/api/README.md).
+
+To test local changes against your own application simply point the plugin create to your local repository, for example:
+
+`tauri-plugin-sample = { path = "path/to/local/tauri-plugin-sample/" }`

.github/workflows/covector-version-or-publish.yml

@@ -83,3 +83,4 @@ jobs:
           labels: 'version updates'
           branch: 'ci/release-${{ github.ref_name }}'
           body: ${{ steps.covector.outputs.change }}
+          sign-commits: true

.gitignore

@@ -57,4 +57,5 @@ pids
 *.sublime*
 .idea
 debug.log
-TODO.md
+TODO.md
+.aider.*

Cargo.toml

@@ -12,10 +12,10 @@ resolver = "2"
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1"
 log = "0.4"
-tauri = { version = "2", default-features = false }
-tauri-build = "2"
-tauri-plugin = "2"
-tauri-utils = "2"
+tauri = { version = "2.8.2", default-features = false }
+tauri-build = "2.4"
+tauri-plugin = "2.4"
+tauri-utils = "2.7"
 serde_json = "1"
 thiserror = "2"
 url = "2"
@@ -23,7 +23,7 @@ schemars = "0.8"
 dunce = "1"
 specta = "^2.0.0-rc.16"
 glob = "0.3"
-zbus = "5"
+zbus = "5.9"
 
 [workspace.package]
 edition = "2021"

README.md

@@ -33,7 +33,7 @@ This repo and all plugins require a Rust version of at least **1.77.2**
 | [store](plugins/store)                         | Persistent key value storage.                                                                                                                                  | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [stronghold](plugins/stronghold)               | Encrypted, secure database.                                                                                                                                    | ✅  | ✅  | ✅  | ?   | ?   |
 | [updater](plugins/updater)                     | In-app updates for Tauri applications.                                                                                                                         | ✅  | ✅  | ✅  | ❌  | ❌  |
-| [upload](plugins/upload)                       | Tauri plugin for file uploads through HTTP.                                                                                                                    | ✅  | ✅  | ✅  | ?   | ?   |
+| [upload](plugins/upload)                       | Tauri plugin for file uploads through HTTP.                                                                                                                    | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [websocket](plugins/websocket)                 | Open a WebSocket connection using a Rust client in JS.                                                                                                         | ✅  | ✅  | ✅  | ?   | ?   |
 | [window-state](plugins/window-state)           | Persist window sizes and positions.                                                                                                                            | ✅  | ✅  | ✅  | ❌  | ❌  |
 

examples/api/CHANGELOG.md

@@ -1,5 +1,123 @@
 # Changelog
 
+## \[2.0.32]
+
+### Dependencies
+
+- Upgraded to `dialog-js@2.4.0`
+- Upgraded to `log-js@2.7.0`
+
+## \[2.0.31]
+
+### Dependencies
+
+- Upgraded to `shell-js@2.3.1`
+
+## \[2.0.30]
+
+### Dependencies
+
+- Upgraded to `notification-js@2.3.1`
+
+## \[2.0.29]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.2`
+- Upgraded to `nfc-js@2.3.1`
+- Upgraded to `opener-js@2.5.0`
+- Upgraded to `os-js@2.3.1`
+- Upgraded to `store-js@2.4.0`
+- Upgraded to `dialog-js@2.3.3`
+- Upgraded to `http-js@2.5.2`
+
+## \[2.0.28]
+
+### Dependencies
+
+- Upgraded to `dialog-js@2.3.2`
+
+## \[2.0.27]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner-js@2.4.0`
+- Upgraded to `fs-js@2.4.1`
+- Upgraded to `dialog-js@2.3.1`
+- Upgraded to `http-js@2.5.1`
+
+## \[2.0.26]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner-js@2.3.0`
+- Upgraded to `biometric-js@2.3.0`
+- Upgraded to `cli-js@2.4.0`
+- Upgraded to `clipboard-manager-js@2.3.0`
+- Upgraded to `fs-js@2.4.0`
+- Upgraded to `dialog-js@2.3.0`
+- Upgraded to `global-shortcut-js@2.3.0`
+- Upgraded to `opener-js@2.4.0`
+- Upgraded to `http-js@2.5.0`
+- Upgraded to `log-js@2.6.0`
+- Upgraded to `nfc-js@2.3.0`
+- Upgraded to `notification-js@2.3.0`
+- Upgraded to `os-js@2.3.0`
+- Upgraded to `process-js@2.3.0`
+- Upgraded to `shell-js@2.3.0`
+- Upgraded to `store-js@2.3.0`
+- Upgraded to `updater-js@2.9.0`
+
+## \[2.0.25]
+
+### Dependencies
+
+- Upgraded to `cli-js@2.3.0`
+- Upgraded to `log-js@2.5.1`
+- Upgraded to `opener-js@2.3.1`
+
+## \[2.0.24]
+
+### Dependencies
+
+- Upgraded to `updater-js@2.8.1`
+
+## \[2.0.23]
+
+### Dependencies
+
+- Upgraded to `updater-js@2.8.0`
+- Upgraded to `barcode-scanner-js@2.2.1`
+- Upgraded to `biometric-js@2.2.2`
+- Upgraded to `cli-js@2.2.1`
+- Upgraded to `clipboard-manager-js@2.2.3`
+- Upgraded to `nfc-js@2.2.1`
+- Upgraded to `notification-js@2.2.3`
+- Upgraded to `os-js@2.2.2`
+- Upgraded to `process-js@2.2.2`
+- Upgraded to `shell-js@2.2.2`
+- Upgraded to `store-js@2.2.1`
+- Upgraded to `log-js@2.5.0`
+- Upgraded to `opener-js@2.3.0`
+
+## \[2.0.22]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.3.0`
+- Upgraded to `global-shortcut-js@2.2.1`
+- Upgraded to `http-js@2.4.4`
+- Upgraded to `opener-js@2.2.7`
+- Upgraded to `dialog-js@2.2.2`
+
+## \[2.0.21]
+
+### Dependencies
+
+- Upgraded to `log-js@2.4.0`
+- Upgraded to `biometric-js@2.2.1`
+- Upgraded to `updater-js@2.7.1`
+
 ## \[2.0.20]
 
 ### Dependencies

examples/api/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1.0, viewport-fit=cover"
+      content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=0"
     />
     <title>Svelte + Vite App</title>
   </head>

examples/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.20",
+  "version": "2.0.32",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -10,35 +10,36 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.4.1",
-    "@tauri-apps/plugin-barcode-scanner": "^2.2.0",
-    "@tauri-apps/plugin-biometric": "^2.2.0",
-    "@tauri-apps/plugin-cli": "^2.2.0",
-    "@tauri-apps/plugin-clipboard-manager": "^2.2.2",
-    "@tauri-apps/plugin-dialog": "^2.2.1",
-    "@tauri-apps/plugin-fs": "^2.2.1",
+    "@tauri-apps/api": "2.8.0",
+    "@tauri-apps/plugin-barcode-scanner": "^2.4.0",
+    "@tauri-apps/plugin-biometric": "^2.3.0",
+    "@tauri-apps/plugin-cli": "^2.4.0",
+    "@tauri-apps/plugin-clipboard-manager": "^2.3.0",
+    "@tauri-apps/plugin-dialog": "^2.4.0",
+    "@tauri-apps/plugin-fs": "^2.4.2",
     "@tauri-apps/plugin-geolocation": "^2.2.0",
-    "@tauri-apps/plugin-global-shortcut": "^2.2.0",
+    "@tauri-apps/plugin-global-shortcut": "^2.3.0",
     "@tauri-apps/plugin-haptics": "^2.2.0",
-    "@tauri-apps/plugin-http": "^2.4.3",
-    "@tauri-apps/plugin-nfc": "^2.2.0",
-    "@tauri-apps/plugin-notification": "^2.2.2",
-    "@tauri-apps/plugin-opener": "^2.2.6",
-    "@tauri-apps/plugin-os": "^2.2.1",
-    "@tauri-apps/plugin-process": "^2.2.1",
-    "@tauri-apps/plugin-shell": "^2.2.1",
-    "@tauri-apps/plugin-store": "^2.2.0",
-    "@tauri-apps/plugin-updater": "^2.7.0",
+    "@tauri-apps/plugin-http": "^2.5.2",
+    "@tauri-apps/plugin-nfc": "^2.3.1",
+    "@tauri-apps/plugin-notification": "^2.3.1",
+    "@tauri-apps/plugin-opener": "^2.5.0",
+    "@tauri-apps/plugin-os": "^2.3.1",
+    "@tauri-apps/plugin-process": "^2.3.0",
+    "@tauri-apps/plugin-shell": "^2.3.1",
+    "@tauri-apps/plugin-store": "^2.4.0",
+    "@tauri-apps/plugin-updater": "^2.9.0",
+    "@tauri-apps/plugin-upload": "^2.3.0",
     "@zerodevx/svelte-json-view": "1.0.11"
   },
   "devDependencies": {
     "@iconify-json/codicon": "^1.2.12",
     "@iconify-json/ph": "^1.2.2",
-    "@sveltejs/vite-plugin-svelte": "^5.0.3",
-    "@tauri-apps/cli": "2.4.1",
-    "@unocss/extractor-svelte": "^66.0.0",
+    "@sveltejs/vite-plugin-svelte": "^6.0.0",
+    "@tauri-apps/cli": "2.8.3",
+    "@unocss/extractor-svelte": "^66.3.3",
     "svelte": "^5.20.4",
-    "unocss": "^66.0.0",
-    "vite": "^6.2.0"
+    "unocss": "^66.3.3",
+    "vite": "^7.0.4"
   }
 }

examples/api/src-tauri/CHANGELOG.md

@@ -1,5 +1,127 @@
 # Changelog
 
+## \[2.0.36]
+
+### Dependencies
+
+- Upgraded to `dialog@2.4.0`
+- Upgraded to `log@2.7.0`
+
+## \[2.0.35]
+
+### Dependencies
+
+- Upgraded to `shell@2.3.1`
+
+## \[2.0.34]
+
+### Dependencies
+
+- Upgraded to `notification@2.3.1`
+
+## \[2.0.33]
+
+### Dependencies
+
+- Upgraded to `fs@2.4.2`
+- Upgraded to `nfc@2.3.1`
+- Upgraded to `opener@2.5.0`
+- Upgraded to `os@2.3.1`
+- Upgraded to `store@2.4.0`
+- Upgraded to `dialog@2.3.3`
+- Upgraded to `http@2.5.2`
+
+## \[2.0.32]
+
+### Dependencies
+
+- Upgraded to `dialog@2.3.2`
+
+## \[2.0.31]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner@2.4.0`
+- Upgraded to `fs@2.4.1`
+- Upgraded to `dialog@2.3.1`
+- Upgraded to `http@2.5.1`
+
+## \[2.0.30]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner@2.3.0`
+- Upgraded to `biometric@2.3.0`
+- Upgraded to `cli@2.4.0`
+- Upgraded to `clipboard-manager@2.3.0`
+- Upgraded to `fs@2.4.0`
+- Upgraded to `dialog@2.3.0`
+- Upgraded to `geolocation@2.3.0`
+- Upgraded to `global-shortcut@2.3.0`
+- Upgraded to `opener@2.4.0`
+- Upgraded to `haptics@2.3.0`
+- Upgraded to `http@2.5.0`
+- Upgraded to `log@2.6.0`
+- Upgraded to `nfc@2.3.0`
+- Upgraded to `notification@2.3.0`
+- Upgraded to `os@2.3.0`
+- Upgraded to `process@2.3.0`
+- Upgraded to `shell@2.3.0`
+- Upgraded to `store@2.3.0`
+- Upgraded to `updater@2.9.0`
+
+## \[2.0.29]
+
+### Dependencies
+
+- Upgraded to `cli@2.3.0`
+- Upgraded to `log@2.5.1`
+- Upgraded to `opener@2.3.1`
+
+## \[2.0.28]
+
+### Dependencies
+
+- Upgraded to `updater@2.8.1`
+
+## \[2.0.27]
+
+### Dependencies
+
+- Upgraded to `updater@2.8.0`
+- Upgraded to `barcode-scanner@2.2.1`
+- Upgraded to `biometric@2.2.2`
+- Upgraded to `cli@2.2.1`
+- Upgraded to `clipboard-manager@2.2.3`
+- Upgraded to `geolocation@2.2.5`
+- Upgraded to `haptics@2.2.5`
+- Upgraded to `nfc@2.2.1`
+- Upgraded to `notification@2.2.3`
+- Upgraded to `os@2.2.2`
+- Upgraded to `process@2.2.2`
+- Upgraded to `shell@2.2.2`
+- Upgraded to `store@2.2.1`
+- Upgraded to `log@2.5.0`
+- Upgraded to `opener@2.3.0`
+
+## \[2.0.26]
+
+### Dependencies
+
+- Upgraded to `fs@2.3.0`
+- Upgraded to `global-shortcut@2.2.1`
+- Upgraded to `http@2.4.4`
+- Upgraded to `opener@2.2.7`
+- Upgraded to `dialog@2.2.2`
+
+## \[2.0.25]
+
+### Dependencies
+
+- Upgraded to `log@2.4.0`
+- Upgraded to `biometric@2.2.1`
+- Upgraded to `updater@2.7.1`
+
 ## \[2.0.24]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.24"
+version = "2.0.36"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -20,30 +20,32 @@ serde = { workspace = true }
 tiny_http = "0.12"
 time = "0.3"
 log = { workspace = true }
-tauri-plugin-log = { path = "../../../plugins/log", version = "2.3.1" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.2.1", features = [
+tauri-plugin-log = { path = "../../../plugins/log", version = "2.7.0" }
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.2", features = [
   "watch",
 ] }
-tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.2.2" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.2.1" }
+tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.0" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.4.0" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
   "cookies",
-], version = "2.4.3" }
-tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.2.2", features = [
+], version = "2.5.2" }
+tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.1", features = [
   "windows7-compat",
 ] }
-tauri-plugin-os = { path = "../../../plugins/os", version = "2.2.1" }
-tauri-plugin-process = { path = "../../../plugins/process", version = "2.2.1" }
-tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.2.6" }
-tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.2.1" }
-tauri-plugin-store = { path = "../../../plugins/store", version = "2.2.0" }
+tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.1" }
+tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.0" }
+tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.5.0" }
+tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.1" }
+tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.0" }
+tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }
 
 [dependencies.tauri]
 workspace = true
 features = [
   "wry",
-  "compression",
+  "common-controls-v6",
+  "x11",
   "image-ico",
   "image-png",
   "isolation",
@@ -53,17 +55,17 @@ features = [
 ]
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.2.0" }
-tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.2.0" }
-tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.7.0" }
+tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.0" }
+tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.0" }
+tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.9.0" }
 tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
 
 [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
-tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.2.0" }
-tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.2.0" }
-tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.2.0" }
-tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.2.4" }
-tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.2.4" }
+tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.0" }
+tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.1" }
+tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.0" }
+tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.0" }
+tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.0" }
 
 [features]
 prod = ["tauri/custom-protocol"]

examples/api/src-tauri/capabilities/base.json

@@ -68,12 +68,19 @@
     "fs:allow-rename",
     "fs:allow-mkdir",
     "fs:allow-remove",
+    "fs:allow-stat",
+    "fs:allow-fstat",
+    "fs:allow-lstat",
     "fs:allow-write-text-file",
+    "fs:read-meta",
     "fs:scope-download-recursive",
     "fs:scope-resource-recursive",
     {
       "identifier": "fs:scope-appdata-recursive",
       "allow": [
+        {
+          "path": "$APPDATA/db/"
+        },
         {
           "path": "$APPDATA/db/**"
         }
@@ -82,9 +89,19 @@
     },
     "store:default",
     "opener:default",
+    {
+      "identifier": "opener:allow-open-url",
+      "allow": [
+        {
+          "url": "https://*",
+          "app": "inAppBrowser"
+        }
+      ]
+    },
     {
       "identifier": "opener:allow-open-path",
       "allow": [{ "path": "$APPDATA" }, { "path": "$APPDATA/**" }]
-    }
+    },
+    "upload:default"
   ]
 }

examples/api/src-tauri/gen/android/.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>

examples/api/src-tauri/gen/android/.idea/gradle.xml

@@ -15,11 +15,12 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
-            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-6f17d22bba15001f/tauri-2.0.2/mobile/android" />
+            <option value="$USER_HOME$/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/tauri-2.5.0/mobile/android" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/buildSrc" />
@@ -32,10 +33,10 @@
             <option value="$PROJECT_DIR$/../../../../../plugins/haptics/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/nfc/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/notification/android" />
+            <option value="$PROJECT_DIR$/../../../../../plugins/opener/android" />
             <option value="$PROJECT_DIR$/../../../../../plugins/shell/android" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

examples/api/src-tauri/gen/android/.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

examples/api/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,116 @@
 {
-  "images": [
+  "images" : [
     {
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "AppIcon-20x20@2x.png",
-      "scale": "2x"
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "AppIcon-20x20@3x.png",
-      "scale": "3x"
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "AppIcon-29x29@2x-1.png",
-      "scale": "2x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "AppIcon-29x29@3x.png",
-      "scale": "3x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "AppIcon-40x40@2x.png",
-      "scale": "2x"
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "AppIcon-40x40@3x.png",
-      "scale": "3x"
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "AppIcon-60x60@2x.png",
-      "scale": "2x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "AppIcon-60x60@3x.png",
-      "scale": "3x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "AppIcon-20x20@1x.png",
-      "scale": "1x"
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "AppIcon-20x20@2x-1.png",
-      "scale": "2x"
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "AppIcon-29x29@1x.png",
-      "scale": "1x"
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "AppIcon-29x29@2x.png",
-      "scale": "2x"
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "AppIcon-40x40@1x.png",
-      "scale": "1x"
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "AppIcon-40x40@2x-1.png",
-      "scale": "2x"
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "AppIcon-76x76@1x.png",
-      "scale": "1x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "AppIcon-76x76@2x.png",
-      "scale": "2x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "83.5x83.5",
-      "idiom": "ipad",
-      "filename": "AppIcon-83.5x83.5@2x.png",
-      "scale": "2x"
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5x83.5@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "1024x1024",
-      "idiom": "ios-marketing",
-      "filename": "AppIcon-512@2x.png",
-      "scale": "1x"
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "AppIcon-512@2x.png",
+      "scale" : "1x"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

examples/api/src-tauri/gen/apple/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

examples/api/src-tauri/gen/apple/LaunchScreen.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>

examples/api/src-tauri/gen/apple/Podfile

@@ -1,7 +1,7 @@
 # Uncomment the next line to define a global platform for your project
 
 target 'api_iOS' do
-platform :ios, '13.0'
+platform :ios, '14.0'
   # Pods for api_iOS
 end
 

examples/api/src-tauri/gen/apple/api.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -22,26 +22,26 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0E96CE07CD20273DD46BF325 /* main.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = main.rs; sourceTree = "<group>"; };
-		1C1AB1B414CA2795AFBEDDB9 /* tray.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = tray.rs; sourceTree = "<group>"; };
+		0E96CE07CD20273DD46BF325 /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = "<group>"; };
+		1C1AB1B414CA2795AFBEDDB9 /* tray.rs */ = {isa = PBXFileReference; path = tray.rs; sourceTree = "<group>"; };
 		248286BAA086BB1A5F98B2B2 /* libapp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libapp.a; sourceTree = "<group>"; };
 		2F63E2AA460089BB58D40C79 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		338E66700FD330B99D434DD7 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; };
 		384966E551417F94A02D2706 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		4B2D1B108AE002010BDEC6D2 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
 		59CFE20DCF760BE67D9CE3D6 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
-		5AC703CEBA41A121596066F3 /* Tauri API.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Tauri API.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5AC703CEBA41A121596066F3 /* api_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = api_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		62601E25FA39E62BE119B74D /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
 		6B7E79E23E646BA7968B457C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		71EB788DE4662CFC0D97F567 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		74A8FDFB350B966F5AAD4A24 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; };
-		785D025E9542F7E098BF22B5 /* lib.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = lib.rs; sourceTree = "<group>"; };
+		785D025E9542F7E098BF22B5 /* lib.rs */ = {isa = PBXFileReference; path = lib.rs; sourceTree = "<group>"; };
 		879941AE3DAA14534BBC6391 /* api_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = api_iOS.entitlements; sourceTree = "<group>"; };
 		90D3B673AFAB8D8AB561F616 /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		B6082E363D51372A7658C351 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		DC377692DC31A070A0188C9D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		EC8C7948C50C3C9B5D96CB61 /* bindings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bindings.h; sourceTree = "<group>"; };
-		F835F52713CE8F029D5D252C /* cmd.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = cmd.rs; sourceTree = "<group>"; };
+		F835F52713CE8F029D5D252C /* cmd.rs */ = {isa = PBXFileReference; path = cmd.rs; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -104,7 +104,7 @@
 		4AC51E67B71E27F15B02C5CD /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				5AC703CEBA41A121596066F3 /* Tauri API.app */,
+				5AC703CEBA41A121596066F3 /* api_iOS.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -171,8 +171,10 @@
 			dependencies = (
 			);
 			name = api_iOS;
+			packageProductDependencies = (
+			);
 			productName = api_iOS;
-			productReference = 5AC703CEBA41A121596066F3 /* Tauri API.app */;
+			productReference = 5AC703CEBA41A121596066F3 /* api_iOS.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -198,6 +200,8 @@
 				en,
 			);
 			mainGroup = 0677CEAF1F282F38CBA0F140;
+			minimizedProjectReferenceProxies = 1;
+			preferredProjectObjectVersion = 54;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -236,7 +240,6 @@
 			outputPaths = (
 				"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
 				"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
-				"$(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -301,7 +304,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -363,7 +366,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -381,52 +384,29 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = (
 					arm64,
-					"arm64-sim",
 				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = api_iOS/api_iOS.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = Q93MBH6S2F;
+				DEVELOPMENT_TEAM = "Q93MBH6S2F";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\".\"",
 				);
 				INFOPLIST_FILE = api_iOS/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
-				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
+				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tauri.api;
 				PRODUCT_NAME = "Tauri API";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64  arm64-sim";
+				VALID_ARCHS = arm64;
 			};
 			name = debug;
 		};
@@ -436,52 +416,29 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ARCHS = (
 					arm64,
-					"arm64-sim",
 				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = api_iOS/api_iOS.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = Q93MBH6S2F;
+				DEVELOPMENT_TEAM = "Q93MBH6S2F";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\".\"",
 				);
 				INFOPLIST_FILE = api_iOS/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
-				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
+				"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
+				"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tauri.api;
 				PRODUCT_NAME = "Tauri API";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64  arm64-sim";
+				VALID_ARCHS = arm64;
 			};
 			name = release;
 		};

examples/api/src-tauri/gen/apple/api.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

examples/api/src-tauri/gen/apple/api_iOS/Info.plist

@@ -40,12 +40,12 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>NSFaceIDUsageDescription</key>
-	<string>Authenticate with biometrics</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Request camera access for WebRTC</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Request microphone access for WebRTC</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Authenticate with biometrics</string>
 	<key>NFCReaderUsageDescription</key>
 	<string>Read and write to NFC tags for testing</string>
 </dict>

examples/api/src-tauri/gen/apple/api_iOS/api_iOS.entitlements

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>com.apple.developer.nfc.readersession.formats</key>
-	<array>
-		<string>TAG</string>
-	</array>
-</dict>
+<dict/>
 </plist>

examples/api/src-tauri/gen/apple/project.yml

@@ -63,14 +63,12 @@ targets:
     settings:
       base:
         ENABLE_BITCODE: false
-        ARCHS: [arm64, arm64-sim]
-        VALID_ARCHS: arm64  arm64-sim
+        ARCHS: [arm64]
+        VALID_ARCHS: arm64 
         LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
         LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
-        LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
         ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
-        EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
-        EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
+        EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64
       groups: [app]
     dependencies:
       - framework: libapp.a
@@ -88,5 +86,4 @@ targets:
         basedOnDependencyAnalysis: false
         outputFiles:
           - $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
-          - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
-          - $(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a
+          - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a

examples/api/src-tauri/src/lib.rs

@@ -39,6 +39,7 @@ pub fn run() {
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_store::Builder::default().build())
+        .plugin(tauri_plugin_upload::init())
         .setup(move |app| {
             #[cfg(desktop)]
             {

examples/api/src/App.svelte

@@ -16,6 +16,7 @@
   import Opener from './views/Opener.svelte'
   import Store from './views/Store.svelte'
   import Updater from './views/Updater.svelte'
+  import Upload from './views/Upload.svelte'
   import Clipboard from './views/Clipboard.svelte'
   import WebRTC from './views/WebRTC.svelte'
   import Scanner from './views/Scanner.svelte'
@@ -107,6 +108,11 @@
       component: Updater,
       icon: 'i-codicon-cloud-download'
     },
+    {
+      label: 'Upload',
+      component: Upload,
+      icon: 'i-codicon-cloud-upload'
+    },
     {
       label: 'Clipboard',
       component: Clipboard,

examples/api/src/views/Dialog.svelte

@@ -44,6 +44,13 @@
     await message("Tauri is awesome!");
   }
 
+  async function msgCustom(result) {
+    const buttons = { yes: "awesome", no: "amazing", cancel: "stunning" };
+    await message(`Tauri is: `, { buttons })
+      .then((res) => onMessage(`Tauri is ${res}`))
+      .catch(onMessage);
+  }
+
   function openDialog() {
     open({
       title: "My wonderful open dialog",
@@ -136,12 +143,17 @@
   <label for="dialog-directory">Directory</label>
 </div>
 <br />
-<button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
-<button class="btn" id="save-dialog" on:click={saveDialog}
-  >Open save dialog</button
->
-<button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
-<button class="btn" id="custom-prompt-dialog" on:click={promptCustom}
-  >Prompt (custom)</button
->
-<button class="btn" id="message-dialog" on:click={msg}>Message</button>
+
+<div class="flex flex-wrap flex-col md:flex-row gap-2 children:flex-shrink-0">
+  <button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
+  <button class="btn" id="save-dialog" on:click={saveDialog}
+    >Open save dialog</button
+  >
+  <button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
+  <button class="btn" id="custom-prompt-dialog" on:click={promptCustom}
+    >Prompt (custom)</button
+  >
+  <button class="btn" id="message-dialog" on:click={msg}>Message</button>
+  <button class="btn" id="message-dialog" on:click={msgCustom}>Message (custom)</button>
+
+</div>

examples/api/src/views/FileSystem.svelte

@@ -1,183 +1,214 @@
 <script>
-  import * as fs from "@tauri-apps/plugin-fs";
-  import { convertFileSrc } from "@tauri-apps/api/core";
-  import { arrayBufferToBase64 } from "../lib/utils";
+  import * as fs from '@tauri-apps/plugin-fs'
+  import * as os from '@tauri-apps/plugin-os'
+  import { convertFileSrc } from '@tauri-apps/api/core'
+  import { arrayBufferToBase64 } from '../lib/utils'
+  import { onDestroy, onMount } from 'svelte'
 
-  export let onMessage;
-  export let insecureRenderHtml;
+  const { onMessage, insecureRenderHtml } = $props()
 
-  let path = "";
-  let img;
-  let file;
-  let renameTo;
-  let watchPath = "";
-  let watchDebounceDelay = 0;
-  let watchRecursive = false;
-  let unwatchFn;
-  let unwatchPath = "";
+  let path = $state('')
+  let img
+  /** @type {fs.FileHandle} */
+  let file = $state()
+  let renameTo = $state()
+  let watchPath = $state('')
+  let watchDebounceDelay = $state(0)
+  let watchRecursive = $state(false)
+  /** @type {fs.BaseDirectory | undefined} */
+  let baseDir = $state()
+  let unwatchFn
+  let unwatchPath = ''
+  let isMobile = $state(false)
 
-  function getDir() {
-    const dirSelect = document.getElementById("dir");
-    return dirSelect.value ? parseInt(dir.value) : null;
-  }
+  onMount(() => {
+    let platform = os.platform()
+    isMobile = platform === 'android' || platform === 'ios'
+  })
 
-  const DirOptions = Object.keys(fs.BaseDirectory)
-    .filter((key) => isNaN(parseInt(key)))
-    .map((dir) => [dir, fs.BaseDirectory[dir]]);
+  const dirOptions = Object.keys(fs.BaseDirectory).filter((key) =>
+    isNaN(parseInt(key))
+  )
 
   function open() {
     fs.open(path, {
-      baseDir: getDir(),
+      baseDir,
       read: true,
       write: true,
-      create: true,
+      create: true
     })
       .then((f) => {
-        file = f;
-        onMessage(`Opened ${path}`);
+        file = f
+        onMessage(`Opened ${path}`)
       })
-      .catch(onMessage);
+      .catch(onMessage)
   }
 
   function mkdir() {
-    fs.mkdir(path, { baseDir: getDir() })
+    fs.mkdir(path, { baseDir, recursive: true })
       .then(() => {
-        onMessage(`Created dir ${path}`);
+        onMessage(`Created dir ${path}`)
       })
-      .catch(onMessage);
+      .catch(onMessage)
   }
 
   function remove() {
-    fs.remove(path, { baseDir: getDir() })
+    fs.remove(path, { baseDir })
       .then(() => {
-        onMessage(`Removed ${path}`);
+        onMessage(`Removed ${path}`)
       })
-      .catch(onMessage);
+      .catch(onMessage)
   }
 
   function rename() {
     fs.rename(path, renameTo, {
-      oldPathBaseDir: getDir(),
-      newPathBaseDir: getDir(),
+      oldPathBaseDir,
+      newPathBaseDir
     })
       .then(() => {
-        onMessage(`Renamed ${path} to ${renameTo}`);
+        onMessage(`Renamed ${path} to ${renameTo}`)
       })
-      .catch(onMessage);
+      .catch(onMessage)
   }
 
   function truncate() {
     file
       .truncate(0)
       .then(() => {
-        onMessage(`Truncated file`);
+        onMessage(`Truncated file`)
       })
-      .catch(onMessage);
+      .catch(onMessage)
+  }
+
+  function write() {
+    const encoder = new TextEncoder()
+    file
+      .write(encoder.encode('Hello from Tauri :)'))
+      .then(() => {
+        onMessage(`wrote to file`)
+      })
+      .catch(onMessage)
   }
 
   function stat() {
     file
       .stat()
       .then((stat) => {
-        onMessage(`File stat ${JSON.stringify(stat)}`);
+        onMessage(`File stat ${JSON.stringify(stat)}`)
       })
-      .catch(onMessage);
+      .catch(onMessage)
   }
 
   function read() {
     const opts = {
-      baseDir: getDir(),
-    };
+      baseDir
+    }
     fs.stat(path, opts)
       .then((stat) => {
-        const isFile = stat.isFile;
+        const isFile = stat.isFile
 
         const promise = isFile
           ? fs.readFile(path, opts)
-          : fs.readDir(path, opts);
+          : fs.readDir(path, opts)
         promise
           .then(function (response) {
             if (isFile) {
-              if (path.includes(".png") || path.includes(".jpg")) {
+              if (path.includes('.png') || path.includes('.jpg')) {
                 arrayBufferToBase64(
                   new Uint8Array(response),
                   function (base64) {
-                    const src = "data:image/png;base64," + base64;
-                    insecureRenderHtml('<img src="' + src + '"></img>');
+                    const src = 'data:image/png;base64,' + base64
+                    insecureRenderHtml('<img src="' + src + '"></img>')
                   }
-                );
+                )
               } else {
-                const value = String.fromCharCode.apply(null, response);
+                const value = String.fromCharCode.apply(null, response)
                 insecureRenderHtml(
                   '<textarea id="file-response"></textarea><button id="file-save">Save</button>'
-                );
+                )
                 setTimeout(() => {
-                  const fileInput = document.getElementById("file-response");
-                  fileInput.value = value;
+                  const fileInput = document.getElementById('file-response')
+                  fileInput.value = value
                   document
-                    .getElementById("file-save")
-                    .addEventListener("click", function () {
+                    .getElementById('file-save')
+                    .addEventListener('click', function () {
                       fs.writeTextFile(path, fileInput.value, {
-                        dir: getDir(),
-                      }).catch(onMessage);
-                    });
-                });
+                        baseDir
+                      }).catch(onMessage)
+                    })
+                })
               }
             } else {
-              onMessage(response);
+              onMessage(response)
             }
           })
-          .catch(onMessage);
+          .catch(onMessage)
       })
-      .catch(onMessage);
+      .catch(onMessage)
   }
 
   function setSrc() {
-    img.src = convertFileSrc(path);
+    img.src = convertFileSrc(path)
   }
 
   function watch() {
-    unwatch();
+    unwatch()
     if (watchPath) {
-      onMessage(`Watching ${watchPath} for changes`);
+      onMessage(`Watching ${watchPath} for changes`)
       let options = {
         recursive: watchRecursive,
-        delayMs: parseInt(watchDebounceDelay),
-      };
+        delayMs: watchDebounceDelay
+      }
       if (options.delayMs === 0) {
         fs.watchImmediate(watchPath, onMessage, options)
           .then((fn) => {
-            unwatchFn = fn;
-            unwatchPath = watchPath;
+            unwatchFn = fn
+            unwatchPath = watchPath
           })
-          .catch(onMessage);
+          .catch(onMessage)
       } else {
         fs.watch(watchPath, onMessage, options)
           .then((fn) => {
-            unwatchFn = fn;
-            unwatchPath = watchPath;
+            unwatchFn = fn
+            unwatchPath = watchPath
           })
-          .catch(onMessage);
+          .catch(onMessage)
       }
     }
   }
 
   function unwatch() {
     if (unwatchFn) {
-      onMessage(`Stopped watching ${unwatchPath} for changes`);
-      unwatchFn();
+      onMessage(`Stopped watching ${unwatchPath} for changes`)
+      unwatchFn()
     }
-    unwatchFn = undefined;
-    unwatchPath = undefined;
+    unwatchFn = undefined
+    unwatchPath = undefined
   }
+
+  onDestroy(() => {
+    if (file) {
+      file.close()
+    }
+    if (unwatchFn) {
+      unwatchFn()
+    }
+  })
 </script>
 
 <div class="flex flex-col">
+  {#if isMobile}
+    <div>
+      On mobile, paths outside of App* paths require the use of dialogs
+      regardless of Tauri's scope mechanism.
+    </div>
+    <br />
+  {/if}
   <div class="flex gap-1">
-    <select class="input" id="dir">
-      <option value="">None</option>
-      {#each DirOptions as dir}
-        <option value={dir[1]}>{dir[0]}</option>
+    <select class="input" bind:value={baseDir}>
+      <option value={undefined} selected>None</option>
+      {#each dirOptions as dir}
+        <option value={fs.BaseDirectory[dir]}>{dir}</option>
       {/each}
     </select>
     <input
@@ -188,20 +219,21 @@
   </div>
   <br />
   <div>
-    <button class="btn" on:click={open}>Open</button>
-    <button class="btn" on:click={read}>Read</button>
-    <button class="btn" on:click={mkdir}>Mkdir</button>
-    <button class="btn" on:click={remove}>Remove</button>
+    <button class="btn" onclick={open}>Open</button>
+    <button class="btn" onclick={read}>Read</button>
+    <button class="btn" onclick={mkdir}>Mkdir</button>
+    <button class="btn" onclick={remove}>Remove</button>
     <div class="flex flex-row">
-      <button class="btn" on:click={rename}>Rename</button>
+      <button class="btn" onclick={rename}>Rename</button>
       <input class="input" bind:value={renameTo} placeholder="To" />
     </div>
-    <button class="btn" type="button" on:click={setSrc}>Use as img src</button>
+    <button class="btn" type="button" onclick={setSrc}>Use as img src</button>
   </div>
   {#if file}
     <div>
-      <button class="btn" on:click={truncate}>Truncate</button>
-      <button class="btn" on:click={stat}>Stat</button>
+      <button class="btn" onclick={write}>Write</button>
+      <button class="btn" onclick={truncate}>Truncate</button>
+      <button class="btn" onclick={stat}>Stat</button>
     </div>
   {/if}
 
@@ -230,8 +262,8 @@
   </div>
   <br />
   <div>
-    <button class="btn" on:click={watch}>Watch</button>
-    <button class="btn" on:click={unwatch}>Unwatch</button>
+    <button class="btn" onclick={watch}>Watch</button>
+    <button class="btn" onclick={unwatch}>Unwatch</button>
   </div>
 </div>
 

examples/api/src/views/Notifications.svelte

@@ -1,16 +1,21 @@
 <script>
+  import { sendNotification } from '@tauri-apps/plugin-notification'
   export let onMessage
 
+  let sound = ''
+
   // send the notification directly
   // the backend is responsible for checking the permission
   function _sendNotification() {
-    new Notification('Notification title', {
-      body: 'This is the notification body'
+    sendNotification({
+      title: 'Notification title',
+      body: 'This is the notification body',
+      sound: sound || null
     })
   }
 
   // alternatively, check the permission ourselves
-  function sendNotification() {
+  function triggerNotification() {
     if (Notification.permission === 'default') {
       Notification.requestPermission()
         .then(function (response) {
@@ -29,6 +34,11 @@
   }
 </script>
 
-<button class="btn" id="notification" on:click={sendNotification}>
+<input
+  class="input grow"
+  placeholder="Notification sound..."
+  bind:value={sound}
+/>
+<button class="btn" id="notification" on:click={triggerNotification}>
   Send test notification
 </button>

examples/api/src/views/Opener.svelte

@@ -1,10 +1,12 @@
 <script>
   import * as opener from '@tauri-apps/plugin-opener'
+  import { platform } from '@tauri-apps/plugin-os'
 
   export let onMessage
 
-  let url = ''
-  let urlProgram = ''
+  let url = 'https://tauri.app'
+  let urlProgram =
+    platform() === 'ios' || platform() === 'android' ? 'inAppBrowser' : ''
   function openUrl() {
     opener.openUrl(url, urlProgram ? urlProgram : undefined).catch(onMessage)
   }

examples/api/src/views/Store.svelte

@@ -1,71 +1,85 @@
 <script>
-  import { LazyStore } from "@tauri-apps/plugin-store";
-  import { onMount } from "svelte";
+  import { appDataDir, resolve } from '@tauri-apps/api/path'
+  import { LazyStore } from '@tauri-apps/plugin-store'
+  import { onMount } from 'svelte'
 
-  export let onMessage;
+  let { onMessage } = $props()
 
-  let key;
-  let value;
+  let key = $state()
+  let value = $state()
 
-  let store = new LazyStore("cache.json");
-  let cache = {};
+  const storeName = 'cache.json'
+
+  let store = new LazyStore(storeName)
+  let path = $state('')
+  let cache = $state({})
 
   async function refreshEntries() {
     try {
-      const values = await store.entries();
-      cache = {};
+      const values = await store.entries()
+      cache = {}
       for (const [key, value] of values) {
-        cache[key] = value;
+        cache[key] = value
       }
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
   }
 
   onMount(async () => {
-    await refreshEntries();
-  });
+    path = await resolve(await appDataDir(), storeName)
+    await refreshEntries()
+  })
 
   async function write(key, value) {
     try {
       if (value) {
-        await store.set(key, value);
+        await store.set(key, value)
       } else {
-        await store.delete(key);
+        await store.delete(key)
       }
-      const v = await store.get(key);
+      const v = await store.get(key)
       if (v === undefined) {
-        delete cache[key];
-        cache = cache;
+        delete cache[key]
+        cache = cache
       } else {
-        cache[key] = v;
+        cache[key] = v
       }
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
   }
 
   async function reset() {
     try {
-      await store.reset();
+      await store.reset()
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
-    await refreshEntries();
+    await refreshEntries()
+  }
+
+  async function reload() {
+    try {
+      await store.reload({ overrideDefaults: true })
+    } catch (error) {
+      onMessage(error)
+    }
+    await refreshEntries()
   }
 
   async function close() {
     try {
-      await store.close();
-      onMessage("Store is now closed, any new operations will error out");
+      await store.close()
+      onMessage('Store is now closed, any new operations will error out')
     } catch (error) {
-      onMessage(error);
+      onMessage(error)
     }
   }
 
   function reopen() {
-    store = new LazyStore("cache.json");
-    onMessage("We made a new `LazyStore` instance, operations will now work");
+    store = new LazyStore(storeName)
+    onMessage('We made a new `LazyStore` instance, operations will now work')
   }
 </script>
 
@@ -82,14 +96,17 @@
     </div>
 
     <div>
-      <button class="btn" on:click={() => write(key, value)}>Write</button>
-      <button class="btn" on:click={() => reset()}>Reset</button>
-      <button class="btn" on:click={() => close()}>Close</button>
-      <button class="btn" on:click={() => reopen()}>Re-open</button>
+      <button class="btn" onclick={() => write(key, value)}>Write</button>
+      <button class="btn" onclick={() => reset()}>Reset</button>
+      <button class="btn" onclick={() => reload()}>Reload</button>
+      <button class="btn" onclick={() => close()}>Close</button>
+      <button class="btn" onclick={() => reopen()}>Re-open</button>
     </div>
+    <div>Store at <code>{path}</code> on disk</div>
   </div>
 
   <div>
+    <h2>Store Values</h2>
     {#each Object.entries(cache) as [k, v]}
       <div>{k} = {v}</div>
     {/each}

examples/api/src/views/Upload.svelte

@@ -0,0 +1,376 @@
+<script>
+  import { download, upload } from '@tauri-apps/plugin-upload'
+  import { open } from '@tauri-apps/plugin-dialog'
+  import { JsonView } from '@zerodevx/svelte-json-view'
+  import { appDataDir } from '@tauri-apps/api/path'
+  import { onMount } from 'svelte'
+
+  export let onMessage
+
+  let downloadUrl = 'https://httpbin.org/json'
+  let downloadFolder = ''
+  let downloadPath = ''
+  let downloadProgress = null
+  let downloadResult = null
+  let isDownloading = false
+
+  let uploadUrl = 'https://httpbin.org/post'
+  let uploadFilePath = ''
+  let uploadProgress = null
+  let uploadResult = null
+  let isUploading = false
+
+  onMount(async () => {
+    try {
+      const defaultDir = await appDataDir()
+      if (!downloadFolder) {
+        downloadFolder = defaultDir
+        updateDownloadPath()
+      }
+    } catch (error) {
+      onMessage({ error: `Failed to get default directory: ${error.toString()}` })
+    }
+  })
+
+  async function selectDownloadFolder() {
+    try {
+      const selected = await open({
+        directory: true,
+        multiple: false,
+        defaultPath: downloadFolder || undefined
+      })
+      if (selected) {
+        downloadFolder = selected
+        updateDownloadPath()
+      }
+    } catch (error) {
+      onMessage({ error: error.toString() })
+    }
+  }
+
+  function getFilenameFromUrl(url) {
+    try {
+      const urlObj = new URL(url)
+      let pathname = urlObj.pathname
+      
+      // Remove leading slash
+      if (pathname.startsWith('/')) {
+        pathname = pathname.substring(1)
+      }
+      
+      // If pathname is empty or ends with slash, use a default name
+      if (!pathname || pathname.endsWith('/')) {
+        return 'downloaded-file.json'
+      }
+      
+      // Extract filename from pathname
+      const segments = pathname.split('/')
+      let filename = segments[segments.length - 1]
+      
+      // If no extension, try to infer from URL or use default
+      if (!filename.includes('.')) {
+        // Check if URL suggests a file type
+        if (url.includes('json') || urlObj.searchParams.has('format') && urlObj.searchParams.get('format') === 'json') {
+          filename += '.json'
+        } else if (url.includes('xml')) {
+          filename += '.xml'
+        } else if (url.includes('csv')) {
+          filename += '.csv'
+        } else {
+          filename += '.txt'
+        }
+      }
+      
+      return filename
+    } catch (error) {
+      return 'downloaded-file.json'
+    }
+  }
+
+  function updateDownloadPath() {
+    if (downloadFolder && downloadUrl) {
+      const filename = getFilenameFromUrl(downloadUrl)
+      downloadPath = `${downloadFolder}/${filename}`
+    } else {
+      downloadPath = ''
+    }
+  }
+
+  // Update download path when URL changes
+  $: if (downloadUrl) {
+    updateDownloadPath()
+  }
+
+  async function selectUploadFile() {
+    try {
+      const selected = await open({
+        directory: false,
+        multiple: false
+      })
+      if (selected) {
+        uploadFilePath = selected
+      }
+    } catch (error) {
+      onMessage({ error: error.toString() })
+    }
+  }
+
+  async function startDownload() {
+    if (!downloadUrl || !downloadFolder) {
+      onMessage({ error: 'Please provide both URL and download folder' })
+      return
+    }
+    
+    // Ensure download path is updated
+    updateDownloadPath()
+    
+    if (!downloadPath) {
+      onMessage({ error: 'Could not generate download path' })
+      return
+    }
+
+    isDownloading = true
+    downloadProgress = null
+    downloadResult = null
+
+    try {
+      await download(
+        downloadUrl,
+        downloadPath,
+        (progress) => {
+          downloadProgress = {
+            progress: progress.progress,
+            progressTotal: progress.progressTotal,
+            total: progress.total,
+            transferSpeed: progress.transferSpeed,
+            percentage: progress.total > 0 ? Math.round((progress.progressTotal / progress.total) * 100) : 0
+          }
+        },
+        new Map([
+          ['User-Agent', 'Tauri Upload Plugin Demo']
+        ])
+      )
+
+      downloadResult = {
+        success: true,
+        message: `File downloaded successfully to: ${downloadPath}`,
+        finalProgress: downloadProgress
+      }
+
+      onMessage({
+        type: 'download',
+        result: downloadResult
+      })
+    } catch (error) {
+      downloadResult = {
+        success: false,
+        error: error.toString()
+      }
+      onMessage({ error: error.toString() })
+    } finally {
+      isDownloading = false
+    }
+  }
+
+  async function startUpload() {
+    if (!uploadUrl || !uploadFilePath) {
+      onMessage({ error: 'Please provide both URL and file path' })
+      return
+    }
+
+    isUploading = true
+    uploadProgress = null
+    uploadResult = null
+
+    try {
+      const response = await upload(
+        uploadUrl,
+        uploadFilePath,
+        (progress) => {
+          uploadProgress = {
+            progress: progress.progress,
+            progressTotal: progress.progressTotal,
+            total: progress.total,
+            transferSpeed: progress.transferSpeed,
+            percentage: progress.total > 0 ? Math.round((progress.progressTotal / progress.total) * 100) : 0
+          }
+        },
+        new Map([
+          ['User-Agent', 'Tauri Upload Plugin Demo']
+        ])
+      )
+
+      uploadResult = {
+        success: true,
+        response: response,
+        finalProgress: uploadProgress
+      }
+
+      onMessage({
+        type: 'upload',
+        result: uploadResult
+      })
+    } catch (error) {
+      uploadResult = {
+        success: false,
+        error: error.toString()
+      }
+      onMessage({ error: error.toString() })
+    } finally {
+      isUploading = false
+    }
+  }
+</script>
+
+<div class="space-y-6">
+  <div class="bg-gray-50 p-4 rounded-lg">
+    <h3 class="text-lg font-semibold mb-4 text-gray-800">File Download</h3>
+    
+    <div class="space-y-3">
+      <div>
+        <label for="download-url" class="block text-sm font-medium text-gray-700 mb-1">Download URL:</label>
+        <input
+          id="download-url"
+          bind:value={downloadUrl}
+          type="url"
+          placeholder="https://example.com/file.json"
+          class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+          disabled={isDownloading}
+        />
+      </div>
+
+      <div>
+        <label for="download-folder" class="block text-sm font-medium text-gray-700 mb-1">Download folder:</label>
+        <div class="flex gap-2">
+          <input
+            id="download-folder"
+            bind:value={downloadFolder}
+            type="text"
+            placeholder="Select download folder..."
+            class="flex-1 px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500"
+            disabled={isDownloading}
+          />
+          <button
+            on:click={selectDownloadFolder}
+            class="px-4 py-2 bg-gray-500 text-white rounded-md hover:bg-gray-600 disabled:opacity-50"
+            disabled={isDownloading}
+          >
+            Browse
+          </button>
+        </div>
+      </div>
+
+      {#if downloadPath}
+        <div class="bg-blue-50 border border-blue-200 p-3 rounded-md">
+          <div class="text-sm text-blue-800">
+            <strong>File will be saved as:</strong>
+            <div class="font-mono text-xs mt-1 break-all">{downloadPath}</div>
+          </div>
+        </div>
+      {/if}
+
+      <button
+        on:click={startDownload}
+        class="w-full px-4 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600 disabled:opacity-50 disabled:cursor-not-allowed"
+        disabled={isDownloading || !downloadUrl || !downloadFolder}
+      >
+        {isDownloading ? 'Downloading...' : 'Download File'}
+      </button>
+
+      {#if downloadProgress}
+        <div class="bg-white p-3 rounded border">
+          <div class="flex justify-between text-sm text-gray-600 mb-1">
+            <span>Progress: {downloadProgress.percentage}%</span>
+            <span>Speed: {Math.round(downloadProgress.transferSpeed / 1024)} KB/s</span>
+          </div>
+          <div class="w-full bg-gray-200 rounded-full h-2">
+            <div 
+              class="bg-blue-500 h-2 rounded-full transition-all duration-300"
+              style="width: {downloadProgress.percentage}%"
+            ></div>
+          </div>
+          <div class="text-xs text-gray-500 mt-1">
+            {Math.round(downloadProgress.progressTotal / 1024)} KB / {Math.round(downloadProgress.total / 1024)} KB
+          </div>
+        </div>
+      {/if}
+
+      {#if downloadResult}
+        <div class="bg-white p-3 rounded border">
+          <JsonView json={downloadResult} />
+        </div>
+      {/if}
+    </div>
+  </div>
+
+  <div class="bg-gray-50 p-4 rounded-lg">
+    <h3 class="text-lg font-semibold mb-4 text-gray-800">File Upload</h3>
+    
+    <div class="space-y-3">
+      <div>
+        <label for="upload-url" class="block text-sm font-medium text-gray-700 mb-1">Upload URL:</label>
+        <input
+          id="upload-url"
+          bind:value={uploadUrl}
+          type="url"
+          placeholder="https://httpbin.org/post"
+          class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-green-500"
+          disabled={isUploading}
+        />
+      </div>
+
+      <div>
+        <label for="upload-file" class="block text-sm font-medium text-gray-700 mb-1">File to upload:</label>
+        <div class="flex gap-2">
+          <input
+            id="upload-file"
+            bind:value={uploadFilePath}
+            type="text"
+            placeholder="Select file to upload..."
+            class="flex-1 px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-green-500"
+            disabled={isUploading}
+          />
+          <button
+            on:click={selectUploadFile}
+            class="px-4 py-2 bg-gray-500 text-white rounded-md hover:bg-gray-600 disabled:opacity-50"
+            disabled={isUploading}
+          >
+            Browse
+          </button>
+        </div>
+      </div>
+
+      <button
+        on:click={startUpload}
+        class="w-full px-4 py-2 bg-green-500 text-white rounded-md hover:bg-green-600 disabled:opacity-50 disabled:cursor-not-allowed"
+        disabled={isUploading || !uploadUrl || !uploadFilePath}
+      >
+        {isUploading ? 'Uploading...' : 'Upload File'}
+      </button>
+
+      {#if uploadProgress}
+        <div class="bg-white p-3 rounded border">
+          <div class="flex justify-between text-sm text-gray-600 mb-1">
+            <span>Progress: {uploadProgress.percentage}%</span>
+            <span>Speed: {Math.round(uploadProgress.transferSpeed / 1024)} KB/s</span>
+          </div>
+          <div class="w-full bg-gray-200 rounded-full h-2">
+            <div 
+              class="bg-green-500 h-2 rounded-full transition-all duration-300"
+              style="width: {uploadProgress.percentage}%"
+            ></div>
+          </div>
+          <div class="text-xs text-gray-500 mt-1">
+            {Math.round(uploadProgress.progressTotal / 1024)} KB / {Math.round(uploadProgress.total / 1024)} KB
+          </div>
+        </div>
+      {/if}
+
+      {#if uploadResult}
+        <div class="bg-white p-3 rounded border">
+          <JsonView json={uploadResult} />
+        </div>
+      {/if}
+    </div>
+  </div>
+</div>

package.json

@@ -11,19 +11,19 @@
     "example:api:dev": "pnpm run --filter \"api\" tauri dev"
   },
   "devDependencies": {
-    "@eslint/js": "9.23.0",
+    "@eslint/js": "9.34.0",
     "@rollup/plugin-node-resolve": "16.0.1",
     "@rollup/plugin-terser": "0.4.4",
-    "@rollup/plugin-typescript": "12.1.2",
+    "@rollup/plugin-typescript": "12.1.4",
     "covector": "^0.12.4",
-    "eslint": "9.23.0",
-    "eslint-config-prettier": "10.1.1",
+    "eslint": "9.34.0",
+    "eslint-config-prettier": "10.1.8",
     "eslint-plugin-security": "3.0.1",
-    "prettier": "3.5.3",
-    "rollup": "4.38.0",
+    "prettier": "3.6.2",
+    "rollup": "4.50.0",
     "tslib": "2.8.1",
-    "typescript": "5.8.2",
-    "typescript-eslint": "8.29.0"
+    "typescript": "5.9.2",
+    "typescript-eslint": "8.41.0"
   },
   "pnpm": {
     "overrides": {

plugins/autostart/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## \[2.5.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+## \[2.4.0]
+
+- [`764e8f77`](https://github.com/tauri-apps/plugins-workspace/commit/764e8f7719247da515243d9c9cafa6d087d21769) ([#2707](https://github.com/tauri-apps/plugins-workspace/pull/2707)) Added a new builder method app_name() to allow customizing the application name in the autostart entry.
+
 ## \[2.3.0]
 
 - [`8ecb418a`](https://github.com/tauri-apps/plugins-workspace/commit/8ecb418a1a35d7f234dc5d833746ac2d8e062aec) ([#2569](https://github.com/tauri-apps/plugins-workspace/pull/2569)) Add a `Builder` for more flexible settings

plugins/autostart/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-autostart"
-version = "2.3.0"
+version = "2.5.0"
 description = "Automatically launch your application at startup."
 authors = { workspace = true }
 license = { workspace = true }

plugins/autostart/README.md

@@ -33,21 +33,12 @@ tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspac
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 ```sh
 pnpm add @tauri-apps/plugin-autostart
 # or
 npm add @tauri-apps/plugin-autostart
 # or
 yarn add @tauri-apps/plugin-autostart
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-autostart#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-autostart#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-autostart#v2
 ```
 
 ## Usage
@@ -59,7 +50,10 @@ First you need to register the core plugin with Tauri:
 ```rust
 fn main() {
     tauri::Builder::default()
-        .plugin(tauri_plugin_autostart::Builder::new().args((["--flag1", "--flag2"])).build()))
+        .plugin(tauri_plugin_autostart::Builder::new()
+            .args(["--flag1", "--flag2"])
+            .app_name("My Custom Name")
+            .build())
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }

plugins/autostart/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-autostart",
-  "version": "2.3.0",
+  "version": "2.5.0",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0"
+    "@tauri-apps/api": "^2.8.0"
   }
 }

plugins/autostart/permissions/autogenerated/reference.md

@@ -9,8 +9,6 @@ starting the application on boot.
 It allows all to check, enable and
 disable the automatic start on boot.
 
-
-
 #### This default permission set includes the following:
 
 - `allow-enable`

plugins/autostart/src/lib.rs

@@ -103,6 +103,7 @@ pub struct Builder {
     #[cfg(target_os = "macos")]
     macos_launcher: MacosLauncher,
     args: Vec<String>,
+    app_name: Option<String>,
 }
 
 impl Builder {
@@ -154,12 +155,32 @@ impl Builder {
         self
     }
 
+    /// Sets the app name to be used for the auto start entry.
+    ///
+    /// ## Examples
+    ///
+    /// ```no_run
+    /// Builder::new()
+    ///     .app_name("My Custom Name"))
+    ///     .build();
+    /// ```
+    pub fn app_name<S: Into<String>>(mut self, app_name: S) -> Self {
+        self.app_name = Some(app_name.into());
+        self
+    }
+
     pub fn build<R: Runtime>(self) -> TauriPlugin<R> {
         PluginBuilder::new("autostart")
             .invoke_handler(tauri::generate_handler![enable, disable, is_enabled])
             .setup(move |app, _api| {
                 let mut builder = AutoLaunchBuilder::new();
-                builder.set_app_name(&app.package_info().name);
+
+                let app_name = self
+                    .app_name
+                    .as_ref()
+                    .unwrap_or_else(|| &app.package_info().name);
+                builder.set_app_name(app_name);
+
                 builder.set_args(&self.args);
 
                 let current_exe = current_exe()?;

plugins/barcode-scanner/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## \[2.4.0]
+
+- [`aa9140e1`](https://github.com/tauri-apps/plugins-workspace/commit/aa9140e1ac239ab9f015f92b2ed52bbf0eda7c12) ([#2437](https://github.com/tauri-apps/plugins-workspace/pull/2437) by [@enkhjile](https://github.com/tauri-apps/plugins-workspace/../../enkhjile)) Added support for GS1 DataBar on iOS 15.4+
+
+## \[2.3.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+## \[2.2.1]
+
+- [`f634e524`](https://github.com/tauri-apps/plugins-workspace/commit/f634e5248ebe428f8305a59f74c13fc15147fb8e) This is an "empty" release to update the plugins' source files on crates.io and docs.rs. This should fix docs.rs build failures for projects using tauri plugins as dependencies.
+
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/barcode-scanner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-barcode-scanner"
-version = "2.2.0"
+version = "2.4.0"
 description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
 edition = { workspace = true }
 authors = { workspace = true }

plugins/barcode-scanner/README.md

@@ -33,21 +33,12 @@ tauri-plugin-barcode-scanner = { git = "https://github.com/tauri-apps/plugins-wo
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 ```sh
 pnpm add @tauri-apps/plugin-barcode-scanner
 # or
 npm add @tauri-apps/plugin-barcode-scanner
 # or
 yarn add @tauri-apps/plugin-barcode-scanner
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-barcode-scanner#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-barcode-scanner#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-barcode-scanner#v2
 ```
 
 ## Usage

plugins/barcode-scanner/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function e(n,e={},r){return window.__TAURI_INTERNALS__.invoke(n,e,r)}var r;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(r=n.Format||(n.Format={})).QRCode="QR_CODE",r.UPC_A="UPC_A",r.UPC_E="UPC_E",r.EAN8="EAN_8",r.EAN13="EAN_13",r.Code39="CODE_39",r.Code93="CODE_93",r.Code128="CODE_128",r.Codabar="CODABAR",r.ITF="ITF",r.Aztec="AZTEC",r.DataMatrix="DATA_MATRIX",r.PDF417="PDF_417",n.cancel=async function(){await e("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return e(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await e("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return e(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await e("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function a(n,a={},e){return window.__TAURI_INTERNALS__.invoke(n,a,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(e=n.Format||(n.Format={})).QRCode="QR_CODE",e.UPC_A="UPC_A",e.UPC_E="UPC_E",e.EAN8="EAN_8",e.EAN13="EAN_13",e.Code39="CODE_39",e.Code93="CODE_93",e.Code128="CODE_128",e.Codabar="CODABAR",e.ITF="ITF",e.Aztec="AZTEC",e.DataMatrix="DATA_MATRIX",e.PDF417="PDF_417",e.GS1DataBar="GS1_DATA_BAR",e.GS1DataBarLimited="GS1_DATA_BAR_LIMITED",e.GS1DataBarExpanded="GS1_DATA_BAR_EXPANDED",n.cancel=async function(){await a("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return a(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await a("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return a(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await a("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})}

plugins/barcode-scanner/guest-js/index.ts

@@ -12,6 +12,9 @@ export type { PermissionState } from '@tauri-apps/api/core'
 
 export enum Format {
   QRCode = 'QR_CODE',
+  /**
+   * Not supported on iOS.
+   */
   UPC_A = 'UPC_A',
   UPC_E = 'UPC_E',
   EAN8 = 'EAN_8',
@@ -19,11 +22,26 @@ export enum Format {
   Code39 = 'CODE_39',
   Code93 = 'CODE_93',
   Code128 = 'CODE_128',
+  /**
+   * Not supported on iOS.
+   */
   Codabar = 'CODABAR',
   ITF = 'ITF',
   Aztec = 'AZTEC',
   DataMatrix = 'DATA_MATRIX',
-  PDF417 = 'PDF_417'
+  PDF417 = 'PDF_417',
+  /**
+   * Not supported on Android. Requires iOS 15.4+
+   */
+  GS1DataBar = 'GS1_DATA_BAR',
+  /**
+   * Not supported on Android. Requires iOS 15.4+
+   */
+  GS1DataBarLimited = 'GS1_DATA_BAR_LIMITED',
+  /**
+   * Not supported on Android. Requires iOS 15.4+
+   */
+  GS1DataBarExpanded = 'GS1_DATA_BAR_EXPANDED'
 }
 
 export interface ScanOptions {

plugins/barcode-scanner/ios/Sources/BarcodeScannerPlugin.swift

@@ -27,8 +27,11 @@ enum SupportedFormat: String, CaseIterable, Decodable {
   case DATA_MATRIX
   case PDF_417
   case QR_CODE
+  case GS1_DATA_BAR
+  case GS1_DATA_BAR_LIMITED
+  case GS1_DATA_BAR_EXPANDED
 
-  var value: AVMetadataObject.ObjectType {
+  var value: AVMetadataObject.ObjectType? {
     switch self {
     case .UPC_E: return AVMetadataObject.ObjectType.upce
     case .EAN_8: return AVMetadataObject.ObjectType.ean8
@@ -41,6 +44,24 @@ enum SupportedFormat: String, CaseIterable, Decodable {
     case .DATA_MATRIX: return AVMetadataObject.ObjectType.dataMatrix
     case .PDF_417: return AVMetadataObject.ObjectType.pdf417
     case .QR_CODE: return AVMetadataObject.ObjectType.qr
+    case .GS1_DATA_BAR:
+      if #available(iOS 15.4, *) {
+        return AVMetadataObject.ObjectType.gs1DataBar
+      } else {
+        return nil
+      }
+    case .GS1_DATA_BAR_LIMITED:
+      if #available(iOS 15.4, *) {
+        return AVMetadataObject.ObjectType.gs1DataBarLimited
+      } else {
+        return nil
+      }
+    case .GS1_DATA_BAR_EXPANDED:
+      if #available(iOS 15.4, *) {
+        return AVMetadataObject.ObjectType.gs1DataBarExpanded
+      } else {
+        return nil
+      }
     }
   }
 }
@@ -242,13 +263,20 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
     scanFormats = [AVMetadataObject.ObjectType]()
 
     (args.formats ?? []).forEach { format in
-      scanFormats.append(format.value)
+        if let formatValue = format.value {
+            scanFormats.append(formatValue)
+        } else {
+            invoke.reject("Unsupported barcode format on this iOS version: \(format)")
+            return
+        }
     }
 
-    if scanFormats.count == 0 {
-      for supportedFormat in SupportedFormat.allCases {
-        scanFormats.append(supportedFormat.value)
-      }
+    if scanFormats.isEmpty {
+        for supportedFormat in SupportedFormat.allCases {
+            if let formatValue = supportedFormat.value {
+                scanFormats.append(formatValue)
+            }
+        }
     }
 
     self.metaOutput!.metadataObjectTypes = self.scanFormats

plugins/barcode-scanner/ios/Sources/Utils.swift

@@ -52,6 +52,15 @@ func discoverCaptureDevices() -> [AVCaptureDevice] {
 }
 
 func formatStringFromMetadata(_ type: AVMetadataObject.ObjectType) -> String {
+  if #available(iOS 15.4, *) {
+    if type == .gs1DataBar {
+        return "GS1_DATA_BAR"
+    } else if type == .gs1DataBarLimited {
+        return "GS1_DATA_BAR_LIMITED"
+    } else if type == .gs1DataBarExpanded {
+        return "GS1_DATA_BAR_EXPANDED"
+    }
+  }
   switch type {
   case AVMetadataObject.ObjectType.upce:
     return "UPC_E"

plugins/barcode-scanner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-barcode-scanner",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
   "license": "MIT OR Apache-2.0",
   "authors": [
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0"
+    "@tauri-apps/api": "^2.8.0"
   }
 }

plugins/barcode-scanner/permissions/autogenerated/reference.md

@@ -7,8 +7,6 @@ barcode scanning features are by default exposed.
 
 It allows all barcode related features.
 
-
-
 #### This default permission set includes the following:
 
 - `allow-cancel`

plugins/biometric/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## \[2.3.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+## \[2.2.2]
+
+- [`f634e524`](https://github.com/tauri-apps/plugins-workspace/commit/f634e5248ebe428f8305a59f74c13fc15147fb8e) This is an "empty" release to update the plugins' source files on crates.io and docs.rs. This should fix docs.rs build failures for projects using tauri plugins as dependencies.
+
+## \[2.2.1]
+
+### bug
+
+- [`10f9e66e`](https://github.com/tauri-apps/plugins-workspace/commit/10f9e66e32141dd35f4bf884fbf9102691187e92) ([#2633](https://github.com/tauri-apps/plugins-workspace/pull/2633) by [@pjf-dev](https://github.com/tauri-apps/plugins-workspace/../../pjf-dev)) Fix biometric plugin ignoring fallback logic when biometry status is unavailable or not enrolled on iOS.
+
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/biometric/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-biometric"
-version = "2.2.0"
+version = "2.3.0"
 description = "Prompt the user for biometric authentication on Android and iOS."
 edition = { workspace = true }
 authors = { workspace = true }

plugins/biometric/README.md

@@ -33,8 +33,6 @@ tauri-plugin-biometric = { git = "https://github.com/tauri-apps/plugins-workspac
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 <!-- Add the branch for installations using git! -->
 
 ```sh
@@ -43,13 +41,6 @@ pnpm add @tauri-apps/plugin-biometric
 npm add @tauri-apps/plugin-biometric
 # or
 yarn add @tauri-apps/plugin-biometric
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-biometric#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-biometric#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-biometric#v2
 ```
 
 ## Usage

plugins/biometric/ios/Sources/BiometricPlugin.swift

@@ -98,7 +98,12 @@ class BiometricPlugin: Plugin {
   }
 
   @objc func authenticate(_ invoke: Invoke) throws {
-    guard self.status.available else {
+    let args = try invoke.parseArgs(AuthOptions.self)
+
+    let allowDeviceCredential = args.allowDeviceCredential ?? false
+
+    guard self.status.available || allowDeviceCredential else {
+      // Biometry unavailable, fallback disabled
       invoke.reject(
         self.status.errorReason ?? "",
         code: self.status.errorCode ?? ""
@@ -106,15 +111,11 @@ class BiometricPlugin: Plugin {
       return
     }
 
-    let args = try invoke.parseArgs(AuthOptions.self)
-
     let context = LAContext()
     context.localizedFallbackTitle = args.fallbackTitle
     context.localizedCancelTitle = args.cancelTitle
     context.touchIDAuthenticationAllowableReuseDuration = 0
 
-    let allowDeviceCredential = args.allowDeviceCredential ?? false
-
     // force system default fallback title if an empty string is provided (the OS hides the fallback button in this case)
     if allowDeviceCredential,
       let fallbackTitle = context.localizedFallbackTitle,

plugins/biometric/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-biometric",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0"
+    "@tauri-apps/api": "^2.8.0"
   }
 }

plugins/biometric/permissions/autogenerated/reference.md

@@ -7,8 +7,6 @@ biometric features are by default exposed.
 
 It allows acccess to all biometric commands.
 
-
-
 #### This default permission set includes the following:
 
 - `allow-authenticate`

plugins/cli/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## \[2.4.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+## \[2.3.0]
+
+- [`f6e11282`](https://github.com/tauri-apps/plugins-workspace/commit/f6e11282a7f4036dd6d1dbb8f100e777e9e42f11) ([#2787](https://github.com/tauri-apps/plugins-workspace/pull/2787) by [@mikew](https://github.com/tauri-apps/plugins-workspace/../../mikew)) Added `Cli.matches_from(args)`. This can be combined with the `args` passed to the callback of `tauri_plugin_single_instance::init` to parse the command line arguments passed to subsequent instances of the application.
+- [`37c2fb41`](https://github.com/tauri-apps/plugins-workspace/commit/37c2fb41201160e85c8dc3ad40f462cd4e17a304) ([#2772](https://github.com/tauri-apps/plugins-workspace/pull/2772) by [@floriskn](https://github.com/tauri-apps/plugins-workspace/../../floriskn)) Added a new `global` boolean flag to the `CliArg` struct to support global CLI arguments. This flag allows arguments like `--verbose` to be marked as global and automatically propagated to all subcommands, enabling consistent availability throughout the CLI.
+
+  The new field is optional and defaults to false.
+
+## \[2.2.1]
+
+- [`f634e524`](https://github.com/tauri-apps/plugins-workspace/commit/f634e5248ebe428f8305a59f74c13fc15147fb8e) This is an "empty" release to update the plugins' source files on crates.io and docs.rs. This should fix docs.rs build failures for projects using tauri plugins as dependencies.
+
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-cli"
-version = "2.2.0"
+version = "2.4.0"
 description = "Parse arguments from your Tauri application's command line interface."
 edition = { workspace = true }
 authors = { workspace = true }

plugins/cli/README.md

@@ -34,21 +34,12 @@ tauri-plugin-cli = { git = "https://github.com/tauri-apps/plugins-workspace", br
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 ```sh
 pnpm add @tauri-apps/plugin-cli
 # or
 npm add @tauri-apps/plugin-cli
 # or
 yarn add @tauri-apps/plugin-cli
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-cli#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-cli#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-cli#v2
 ```
 
 ## Usage

plugins/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-cli",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0"
+    "@tauri-apps/api": "^2.8.0"
   }
 }

plugins/cli/src/config.rs

@@ -114,6 +114,12 @@ pub struct Arg {
     /// It does not define position in the argument list as a whole. When utilized with multiple=true,
     /// only the last positional argument may be defined as multiple (i.e. the one with the highest index).
     pub index: Option<usize>,
+    /// Specifies whether the argument should be global.
+    ///
+    /// Global arguments are propagated to all subcommands automatically,
+    /// making them available throughout the CLI regardless of where they are defined.
+    #[serde(default)]
+    pub global: bool,
 }
 
 /// describes a CLI configuration

plugins/cli/src/lib.rs

@@ -29,7 +29,11 @@ pub struct Cli<R: Runtime>(PluginApi<R, Config>);
 
 impl<R: Runtime> Cli<R> {
     pub fn matches(&self) -> Result<parser::Matches> {
-        parser::get_matches(self.0.config(), self.0.app().package_info())
+        parser::get_matches(self.0.config(), self.0.app().package_info(), None)
+    }
+
+    pub fn matches_from(&self, args: Vec<String>) -> Result<parser::Matches> {
+        parser::get_matches(self.0.config(), self.0.app().package_info(), Some(args))
     }
 }
 

plugins/cli/src/parser.rs

@@ -19,7 +19,7 @@ use std::collections::HashMap;
 mod macros;
 
 /// The resolution of a argument match.
-#[derive(Default, Debug, Serialize)]
+#[derive(Default, Debug, Serialize, Clone)]
 #[non_exhaustive]
 pub struct ArgData {
     /// - [`Value::Bool`] if it's a flag,
@@ -33,7 +33,7 @@ pub struct ArgData {
 }
 
 /// The matched subcommand.
-#[derive(Default, Debug, Serialize)]
+#[derive(Default, Debug, Serialize, Clone)]
 #[non_exhaustive]
 pub struct SubcommandMatches {
     /// The subcommand name.
@@ -43,7 +43,7 @@ pub struct SubcommandMatches {
 }
 
 /// The argument matches of a command.
-#[derive(Default, Debug, Serialize)]
+#[derive(Default, Debug, Serialize, Clone)]
 #[non_exhaustive]
 pub struct Matches {
     /// Data structure mapping each found arg with its resolution.
@@ -79,7 +79,11 @@ impl Matches {
 ///     Ok(())
 ///   });
 /// ```
-pub fn get_matches(cli: &Config, package_info: &PackageInfo) -> crate::Result<Matches> {
+pub fn get_matches(
+    cli: &Config,
+    package_info: &PackageInfo,
+    args: Option<Vec<String>>,
+) -> crate::Result<Matches> {
     let about = cli
         .description()
         .unwrap_or(&package_info.description.to_string())
@@ -92,7 +96,14 @@ pub fn get_matches(cli: &Config, package_info: &PackageInfo) -> crate::Result<Ma
         Some(&about),
         cli,
     );
-    match app.try_get_matches() {
+
+    let matches = if let Some(args) = args {
+        app.try_get_matches_from(args)
+    } else {
+        app.try_get_matches()
+    };
+
+    match matches {
         Ok(matches) => Ok(get_matches_internal(cli, &matches)),
         Err(e) => match e.kind() {
             ErrorKind::DisplayHelp => {
@@ -278,5 +289,7 @@ fn get_arg(arg_name: String, arg: &Arg) -> ClapArg {
     clap_arg = bind_value_arg!(arg, clap_arg, require_equals);
     clap_arg = bind_value_arg!(arg, clap_arg, index);
 
+    clap_arg = clap_arg.global(arg.global);
+
     clap_arg
 }

plugins/clipboard-manager/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## \[2.3.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+## \[2.2.3]
+
+- [`f634e524`](https://github.com/tauri-apps/plugins-workspace/commit/f634e5248ebe428f8305a59f74c13fc15147fb8e) This is an "empty" release to update the plugins' source files on crates.io and docs.rs. This should fix docs.rs build failures for projects using tauri plugins as dependencies.
+
 ## \[2.2.2]
 
 ### bug

plugins/clipboard-manager/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-clipboard-manager"
-version = "2.2.2"
+version = "2.3.0"
 description = "Read and write to the system clipboard."
 edition = { workspace = true }
 authors = { workspace = true }

plugins/clipboard-manager/README.md

@@ -33,21 +33,12 @@ tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 ```sh
 pnpm add @tauri-apps/plugin-clipboard-manager
 # or
 npm add @tauri-apps/plugin-clipboard-manager
 # or
 yarn add @tauri-apps/plugin-clipboard-manager
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-clipboard-manager#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-clipboard-manager#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-clipboard-manager#v2
 ```
 
 ## Usage

plugins/clipboard-manager/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then((e=>new a(e)))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then((e=>new a(e)))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then((e=>new a(e)))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then((e=>new a(e)))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n?e!==n||!r:!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then((e=>new a(e)))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then((e=>new a(e)))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then((e=>new a(e)))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then((e=>new a(e)))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}

plugins/clipboard-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-clipboard-manager",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0"
+    "@tauri-apps/api": "^2.8.0"
   }
 }

plugins/clipboard-manager/permissions/autogenerated/reference.md

@@ -6,10 +6,6 @@ application specific if read and/or write access is needed.
 
 Clipboard interaction needs to be explicitly enabled.
 
-
-#### This default permission set includes the following:
-
-
 ## Permission Table
 
 <table>

plugins/deep-link/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## \[2.4.3]
+
+- [`2522b71f`](https://github.com/tauri-apps/plugins-workspace/commit/2522b71f6bcae65c03b24415eb9295c9e7c84ffc) ([#2970](https://github.com/tauri-apps/plugins-workspace/pull/2970) by [@WSH032](https://github.com/tauri-apps/plugins-workspace/../../WSH032)) Revert the breaking change introduced by [#2928](https://github.com/tauri-apps/plugins-workspace/pull/2928).
+
+## \[2.4.2]
+
+- [`21d721a0`](https://github.com/tauri-apps/plugins-workspace/commit/21d721a0c2731fc201872f5b99ea8bbdc61b0b60) ([#2928](https://github.com/tauri-apps/plugins-workspace/pull/2928) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Linux, improved error messages when OS commands fail.
+
+## \[2.4.1]
+
+- [`d4f8299b`](https://github.com/tauri-apps/plugins-workspace/commit/d4f8299b12f107718c70692840a63768d65baaf9) ([#2844](https://github.com/tauri-apps/plugins-workspace/pull/2844) by [@yobson1](https://github.com/tauri-apps/plugins-workspace/../../yobson1)) Fix deep link protocol handler not set as default on linux
+  Fix duplicate protocols added to MimeType section in .desktop files on linux
+
+## \[2.4.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+## \[2.3.0]
+
+- [`4d10acee`](https://github.com/tauri-apps/plugins-workspace/commit/4d10acee61bad8045705508121424ed5f2d381f6) ([#993](https://github.com/tauri-apps/plugins-workspace/pull/993) by [@m00nwtchr](https://github.com/tauri-apps/plugins-workspace/../../m00nwtchr)) Exposed Android's `path`, `pathPattern` and `pathSuffix` configurations.
+- [`4d10acee`](https://github.com/tauri-apps/plugins-workspace/commit/4d10acee61bad8045705508121424ed5f2d381f6) ([#993](https://github.com/tauri-apps/plugins-workspace/pull/993) by [@m00nwtchr](https://github.com/tauri-apps/plugins-workspace/../../m00nwtchr)) Added a `scheme` configuration to set a scheme other than http/https. This is only supported on Android and will still default to http,https if not set.
+
 ## \[2.2.1]
 
 ### bug

plugins/deep-link/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-deep-link"
-version = "2.2.1"
+version = "2.4.3"
 description = "Set your Tauri application as the default handler for an URL"
 authors = { workspace = true }
 license = { workspace = true }
@@ -17,9 +17,9 @@ targets = ["x86_64-linux-android"]
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "" }
 linux = { level = "full", notes = "" }
-macos = { level = "partial", notes = "Runtime deep link registration is not supported" }
-android = { level = "partial", notes = "Runtime deep link registration is not supported" }
-ios = { level = "partial", notes = "Runtime deep link registration is not supported" }
+macos = { level = "partial", notes = "Deep links must be registered in config. Dynamic registration at runtime is not supported." }
+android = { level = "partial", notes = "Deep links must be registered in config. Dynamic registration at runtime is not supported." }
+ios = { level = "partial", notes = "Deep links must be registered in config. Dynamic registration at runtime is not supported." }
 
 [build-dependencies]
 serde = { workspace = true }
@@ -27,6 +27,9 @@ serde_json = { workspace = true }
 tauri-utils = { workspace = true }
 tauri-plugin = { workspace = true, features = ["build"] }
 
+[target."cfg(target_os = \"macos\")".build-dependencies]
+plist = "1"
+
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }

plugins/deep-link/README.md

@@ -33,21 +33,12 @@ tauri-plugin-deep-link = { git = "https://github.com/tauri-apps/plugins-workspac
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 ```sh
 pnpm add @tauri-apps/plugin-deep-link
 # or
 npm add @tauri-apps/plugin-deep-link
 # or
 yarn add @tauri-apps/plugin-deep-link
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-deep-link#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-deep-link#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-deep-link#v2
 ```
 
 ## Setting up

plugins/deep-link/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const a={kind:"Any"};return r("plugin:event|listen",{event:e,target:a,handler:n(t)}).then((n=>async()=>async function(e,n){await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n)))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",(n=>{e(n.payload)}))},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then((n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n)))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",(n=>{e(n.payload)}))},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}

plugins/deep-link/build.rs

@@ -9,26 +9,65 @@ use config::{AssociatedDomain, Config};
 const COMMANDS: &[&str] = &["get_current", "register", "unregister", "is_registered"];
 
 // TODO: Consider using activity-alias in case users may have multiple activities in their app.
-// TODO: Do we want to support the other path* configs too?
 fn intent_filter(domain: &AssociatedDomain) -> String {
+    let host = domain
+        .host
+        .as_ref()
+        .map(|h| format!(r#"<data android:host="{h}" />"#))
+        .unwrap_or_default();
+
+    let auto_verify = if domain.is_app_link() {
+        r#"android:autoVerify="true" "#.to_string()
+    } else {
+        String::new()
+    };
+
     format!(
-        r#"<intent-filter android:autoVerify="true">
+        r#"<intent-filter {auto_verify}>
     <action android:name="android.intent.action.VIEW" />
     <category android:name="android.intent.category.DEFAULT" />
     <category android:name="android.intent.category.BROWSABLE" />
-    <data android:scheme="http" />
-    <data android:scheme="https" />
-    <data android:host="{}" />
-    {}
+    {schemes}
+    {host}
+    {domains}
+    {path_patterns}
+    {path_prefixes}
+    {path_suffixes}
 </intent-filter>"#,
-        domain.host,
-        domain
+        schemes = domain
+            .scheme
+            .iter()
+            .map(|scheme| format!(r#"<data android:scheme="{scheme}" />"#))
+            .collect::<Vec<_>>()
+            .join("\n    "),
+        host = host,
+        domains = domain
+            .path
+            .iter()
+            .map(|path| format!(r#"<data android:path="{path}" />"#))
+            .collect::<Vec<_>>()
+            .join("\n    "),
+        path_patterns = domain
+            .path_pattern
+            .iter()
+            .map(|pattern| format!(r#"<data android:pathPattern="{pattern}" />"#))
+            .collect::<Vec<_>>()
+            .join("\n    "),
+        path_prefixes = domain
             .path_prefix
             .iter()
             .map(|prefix| format!(r#"<data android:pathPrefix="{prefix}" />"#))
             .collect::<Vec<_>>()
-            .join("\n    ")
+            .join("\n    "),
+        path_suffixes = domain
+            .path_suffix
+            .iter()
+            .map(|suffix| format!(r#"<data android:pathSuffix="{suffix}" />"#))
+            .collect::<Vec<_>>()
+            .join("\n    "),
     )
+    .trim()
+    .to_string()
 }
 
 fn main() {
@@ -43,6 +82,16 @@ fn main() {
     }
 
     if let Some(config) = tauri_plugin::plugin_config::<Config>("deep-link") {
+        let errors: Vec<String> = config
+            .mobile
+            .iter()
+            .filter_map(|d| d.validate().err())
+            .collect();
+
+        if !errors.is_empty() {
+            panic!("Deep link config validation failed:\n{}", errors.join("\n"));
+        }
+
         tauri_plugin::mobile::update_android_manifest(
             "DEEP LINK PLUGIN",
             "activity",
@@ -55,20 +104,89 @@ fn main() {
         )
         .expect("failed to rewrite AndroidManifest.xml");
 
-        #[cfg(target_os = "macos")]
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
         {
-            tauri_plugin::mobile::update_entitlements(|entitlements| {
-                entitlements.insert(
-                    "com.apple.developer.associated-domains".into(),
-                    config
-                        .mobile
-                        .into_iter()
-                        .map(|d| format!("applinks:{}", d.host).into())
-                        .collect::<Vec<_>>()
-                        .into(),
-                );
-            })
-            .expect("failed to update entitlements");
+            // we need to ensure that the entitlements are only
+            // generated for explicit app links and not
+            // other deep links because then they
+            // are just going to complain and not be built or signed
+            let has_app_links = config.mobile.iter().any(|d| d.is_app_link());
+
+            if !has_app_links {
+                tauri_plugin::mobile::update_entitlements(|entitlements| {
+                    entitlements.remove("com.apple.developer.associated-domains");
+                })
+                .expect("failed to update entitlements");
+            } else {
+                tauri_plugin::mobile::update_entitlements(|entitlements| {
+                    entitlements.insert(
+                        "com.apple.developer.associated-domains".into(),
+                        config
+                            .mobile
+                            .iter()
+                            .filter(|d| d.is_app_link())
+                            .filter_map(|d| d.host.as_ref())
+                            .map(|host| format!("applinks:{}", host).into())
+                            .collect::<Vec<_>>()
+                            .into(),
+                    );
+                })
+                .expect("failed to update entitlements");
+            }
+
+            let deep_link_domains = config
+                .mobile
+                .iter()
+                .filter_map(|domain| {
+                    if domain.is_app_link() {
+                        return None;
+                    }
+
+                    Some(domain)
+                })
+                .collect::<Vec<_>>();
+
+            if deep_link_domains.is_empty() {
+                tauri_plugin::mobile::update_info_plist(|info_plist| {
+                    info_plist.remove("CFBundleURLTypes");
+                })
+                .expect("failed to update Info.plist");
+            } else {
+                tauri_plugin::mobile::update_info_plist(|info_plist| {
+                    info_plist.insert(
+                        "CFBundleURLTypes".into(),
+                        deep_link_domains
+                            .iter()
+                            .map(|domain| {
+                                let schemes = domain
+                                    .scheme
+                                    .iter()
+                                    .filter(|scheme| {
+                                        scheme.as_str() != "https" && scheme.as_str() != "http"
+                                    })
+                                    .collect::<Vec<_>>();
+
+                                let mut dict = plist::Dictionary::new();
+                                dict.insert(
+                                    "CFBundleURLSchemes".into(),
+                                    schemes
+                                        .iter()
+                                        .map(|s| s.to_string().into())
+                                        .collect::<Vec<_>>()
+                                        .into(),
+                                );
+                                dict.insert(
+                                    "CFBundleURLName".into(),
+                                    format!("{}", domain.scheme[0]).into(),
+                                );
+                                plist::Value::Dictionary(dict)
+                            })
+                            .collect::<Vec<_>>()
+                            .into(),
+                    );
+                })
+                .expect("failed to update Info.plist");
+            }
         }
     }
 }

plugins/deep-link/examples/app/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## \[2.2.6]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.3`
+
+## \[2.2.5]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.2`
+
+## \[2.2.4]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.1`
+
+## \[2.2.3]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.0`
+
+## \[2.2.2]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.3.0`
+
 ## \[2.2.1]
 
 ### Dependencies

plugins/deep-link/examples/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "deep-link-example",
   "private": true,
-  "version": "2.2.1",
+  "version": "2.2.6",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,12 +10,12 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.4.1",
-    "@tauri-apps/plugin-deep-link": "2.2.1"
+    "@tauri-apps/api": "2.8.0",
+    "@tauri-apps/plugin-deep-link": "2.4.3"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.4.1",
+    "@tauri-apps/cli": "2.8.3",
     "typescript": "^5.7.3",
-    "vite": "^6.2.0"
+    "vite": "^7.0.4"
   }
 }

plugins/deep-link/examples/app/src-tauri/Cargo.toml

@@ -19,7 +19,7 @@ tauri-build = { workspace = true }
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "compression"] }
+tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
 tauri-plugin-deep-link = { path = "../../../" }
 tauri-plugin-log = { path = "../../../../log" }
 tauri-plugin-single-instance = { path = "../../../../single-instance", features = [

plugins/deep-link/examples/app/src-tauri/gen/android/app/build.gradle.kts

@@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 36
     namespace = "com.tauri.deep_link_example"
     defaultConfig {
         manifestPlaceholders["usesCleartextTraffic"] = "false"
         applicationId = "com.tauri.deep_link_example"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 36
         versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
         versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
     }
@@ -58,9 +58,10 @@ rust {
 }
 
 dependencies {
-    implementation("androidx.webkit:webkit:1.6.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.8.0")
+    implementation("androidx.webkit:webkit:1.14.0")
+    implementation("androidx.appcompat:appcompat:1.7.1")
+    implementation("androidx.activity:activity-ktx:1.10.1")
+    implementation("com.google.android.material:material:1.12.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.4")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")

plugins/deep-link/examples/app/src-tauri/gen/android/app/src/main/AndroidManifest.xml

@@ -23,23 +23,40 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
-            <intent-filter android:autoVerify="true">
+            <intent-filter android:autoVerify="true" >
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
                 <data android:scheme="https" />
+                <data android:scheme="http" />
                 <data android:host="fabianlars.de" />
+                
+                
                 <data android:pathPrefix="/intent" />
+                
             </intent-filter>
-            <intent-filter android:autoVerify="true">
+            <intent-filter android:autoVerify="true" >
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" />
                 <data android:scheme="https" />
+                <data android:scheme="http" />
                 <data android:host="tauri.app" />
                 
+                
+                
+                
+            </intent-filter>
+            <intent-filter >
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="taurideeplink" />
+                
+                
+                
+                
+                
             </intent-filter>
             <!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
         </activity>

plugins/deep-link/examples/app/src-tauri/gen/android/app/src/main/java/com/tauri/deep_link_example/MainActivity.kt

@@ -1,7 +1,11 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
 package com.tauri.deep_link_example
 
-class MainActivity : TauriActivity()
+import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
+
+class MainActivity : TauriActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    enableEdgeToEdge()
+    super.onCreate(savedInstanceState)
+  }
+}

plugins/deep-link/examples/app/src-tauri/gen/android/build.gradle.kts

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.5.1")
+        classpath("com.android.tools.build:gradle:8.11.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
     }
 }

plugins/deep-link/examples/app/src-tauri/gen/android/buildSrc/build.gradle.kts

@@ -18,6 +18,6 @@ repositories {
 
 dependencies {
     compileOnly(gradleApi())
-    implementation("com.android.tools.build:gradle:8.5.1")
+    implementation("com.android.tools.build:gradle:8.11.0")
 }
 

plugins/deep-link/examples/app/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue May 10 19:22:52 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

plugins/deep-link/examples/app/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,116 @@
 {
-  "images": [
+  "images" : [
     {
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "AppIcon-20x20@2x.png",
-      "scale": "2x"
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "AppIcon-20x20@3x.png",
-      "scale": "3x"
+      "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-20x20@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "AppIcon-29x29@2x-1.png",
-      "scale": "2x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "AppIcon-29x29@3x.png",
-      "scale": "3x"
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-29x29@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "AppIcon-40x40@2x.png",
-      "scale": "2x"
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "AppIcon-40x40@3x.png",
-      "scale": "3x"
+      "size" : "40x40",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-40x40@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "AppIcon-60x60@2x.png",
-      "scale": "2x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "AppIcon-60x60@3x.png",
-      "scale": "3x"
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "AppIcon-60x60@3x.png",
+      "scale" : "3x"
     },
     {
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "AppIcon-20x20@1x.png",
-      "scale": "1x"
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "AppIcon-20x20@2x-1.png",
-      "scale": "2x"
+      "size" : "20x20",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-20x20@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "AppIcon-29x29@1x.png",
-      "scale": "1x"
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "AppIcon-29x29@2x.png",
-      "scale": "2x"
+      "size" : "29x29",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-29x29@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "AppIcon-40x40@1x.png",
-      "scale": "1x"
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "AppIcon-40x40@2x-1.png",
-      "scale": "2x"
+      "size" : "40x40",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-40x40@2x-1.png",
+      "scale" : "2x"
     },
     {
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "AppIcon-76x76@1x.png",
-      "scale": "1x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@1x.png",
+      "scale" : "1x"
     },
     {
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "AppIcon-76x76@2x.png",
-      "scale": "2x"
+      "size" : "76x76",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-76x76@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "83.5x83.5",
-      "idiom": "ipad",
-      "filename": "AppIcon-83.5x83.5@2x.png",
-      "scale": "2x"
+      "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "AppIcon-83.5x83.5@2x.png",
+      "scale" : "2x"
     },
     {
-      "size": "1024x1024",
-      "idiom": "ios-marketing",
-      "filename": "AppIcon-512@2x.png",
-      "scale": "1x"
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "AppIcon-512@2x.png",
+      "scale" : "1x"
     }
   ],
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

plugins/deep-link/examples/app/src-tauri/gen/apple/Assets.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
-  "info": {
-    "version": 1,
-    "author": "xcode"
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

plugins/deep-link/examples/app/src-tauri/gen/apple/LaunchScreen.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>

plugins/deep-link/examples/app/src-tauri/gen/apple/deep-link-example.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 63;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -167,6 +167,8 @@
 			dependencies = (
 			);
 			name = "deep-link-example_iOS";
+			packageProductDependencies = (
+			);
 			productName = "deep-link-example_iOS";
 			productReference = 1CAAFA750FD735A285DC1238 /* deep-link-example.app */;
 			productType = "com.apple.product-type.application";
@@ -189,6 +191,7 @@
 				en,
 			);
 			mainGroup = 1DC58B1705AA3ECC6B887FE7;
+			minimizedProjectReferenceProxies = 1;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -227,7 +230,6 @@
 			outputPaths = (
 				"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
 				"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
-				"$(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -314,18 +316,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ARCHS = (
-					arm64,
-					"arm64-sim",
-				);
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "deep-link-example_iOS/deep-link-example_iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = Q93MBH6S2F;
+				DEVELOPMENT_TEAM = "Q93MBH6S2F";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\".\"",
@@ -335,13 +332,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
 				"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
@@ -360,7 +350,7 @@
 				PRODUCT_NAME = "deep-link-example";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64  arm64-sim";
+				VALID_ARCHS = arm64;
 			};
 			name = debug;
 		};
@@ -424,18 +414,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				ARCHS = (
-					arm64,
-					"arm64-sim",
-				);
+				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "deep-link-example_iOS/deep-link-example_iOS.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = Q93MBH6S2F;
+				DEVELOPMENT_TEAM = "Q93MBH6S2F";
 				ENABLE_BITCODE = NO;
-				"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
+				"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\".\"",
@@ -445,13 +430,6 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
-					"$(SDKROOT)/usr/lib/swift",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
-					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
-				);
 				"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
@@ -470,7 +448,7 @@
 				PRODUCT_NAME = "deep-link-example";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				VALID_ARCHS = "arm64  arm64-sim";
+				VALID_ARCHS = arm64;
 			};
 			name = release;
 		};

plugins/deep-link/examples/app/src-tauri/gen/apple/deep-link-example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

plugins/deep-link/examples/app/src-tauri/gen/apple/deep-link-example_iOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.0</string>
+	<string>0.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>0.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -40,5 +40,16 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>taurideeplink</string>
+			</array>
+			<key>CFBundleURLName</key>
+			<string>taurideeplink</string>
+		</dict>
+	</array>
 </dict>
 </plist>

plugins/deep-link/examples/app/src-tauri/gen/apple/project.yml

@@ -1,7 +1,3 @@
-# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-# SPDX-License-Identifier: Apache-2.0
-# SPDX-License-Identifier: MIT
-
 name: deep-link-example
 options:
   bundleIdPrefix: com.tauri.deep-link-example
@@ -16,7 +12,6 @@ settingGroups:
     base:
       PRODUCT_NAME: deep-link-example
       PRODUCT_BUNDLE_IDENTIFIER: com.tauri.deep-link-example
-      DEVELOPMENT_TEAM: Q93MBH6S2F
 targetTemplates:
   app:
     type: application
@@ -56,8 +51,8 @@ targets:
           - UIInterfaceOrientationPortraitUpsideDown
           - UIInterfaceOrientationLandscapeLeft
           - UIInterfaceOrientationLandscapeRight
-        CFBundleShortVersionString: 0.0.0
-        CFBundleVersion: 0.0.0
+        CFBundleShortVersionString: 0.1.0
+        CFBundleVersion: '0.1.0'
     entitlements:
       path: deep-link-example_iOS/deep-link-example_iOS.entitlements
     scheme:
@@ -67,14 +62,12 @@ targets:
     settings:
       base:
         ENABLE_BITCODE: false
-        ARCHS: [arm64, arm64-sim]
-        VALID_ARCHS: arm64  arm64-sim
+        ARCHS: [arm64]
+        VALID_ARCHS: arm64
         LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
         LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
-        LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
         ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
-        EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
-        EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
+        EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64
       groups: [app]
     dependencies:
       - framework: libapp.a
@@ -93,4 +86,3 @@ targets:
         outputFiles:
           - $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
           - $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
-          - $(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a

plugins/deep-link/examples/app/src-tauri/tauri.conf.json

@@ -35,6 +35,9 @@
         },
         {
           "host": "tauri.app"
+        },
+        {
+          "scheme": ["taurideeplink"]
         }
       ],
       "desktop": {

plugins/deep-link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-deep-link",
-  "version": "2.2.1",
+  "version": "2.4.3",
   "description": "Set your Tauri application as the default handler for an URL",
   "license": "MIT OR Apache-2.0",
   "authors": [
@@ -25,6 +25,9 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0"
+    "@tauri-apps/api": "^2.8.0"
+  },
+  "devDependencies": {
+    "@tauri-apps/cli": "2.8.3"
   }
 }

plugins/deep-link/src/config.rs

@@ -9,24 +9,73 @@ use tauri_utils::config::DeepLinkProtocol;
 
 #[derive(Deserialize, Clone)]
 pub struct AssociatedDomain {
-    #[serde(deserialize_with = "deserialize_associated_host")]
-    pub host: String,
+    #[serde(default = "default_schemes")]
+    pub scheme: Vec<String>,
+    #[serde(default, deserialize_with = "deserialize_associated_host")]
+    pub host: Option<String>, // Optional custom uri schemes dont NEED a host (may have one still), but required for https/http schemes
+    #[serde(default)]
+    pub path: Vec<String>,
+    #[serde(default, alias = "path-pattern", rename = "pathPattern")]
+    pub path_pattern: Vec<String>,
     #[serde(default, alias = "path-prefix", rename = "pathPrefix")]
     pub path_prefix: Vec<String>,
+    #[serde(default, alias = "path-suffix", rename = "pathSuffix")]
+    pub path_suffix: Vec<String>,
+    #[serde(default, alias = "app-link", rename = "appLink")]
+    pub app_link: Option<bool>,
 }
 
-fn deserialize_associated_host<'de, D>(deserializer: D) -> Result<String, D::Error>
+impl AssociatedDomain {
+    /// Returns true if the domain uses http or https scheme.
+    pub fn is_web_link(&self) -> bool {
+        self.scheme.iter().any(|s| s == "https" || s == "http")
+    }
+
+    /// Returns true if the domain uses http or https scheme and has proper host configuration.
+    pub fn is_app_link(&self) -> bool {
+        self.app_link
+            .unwrap_or_else(|| self.is_web_link() && self.host.is_some())
+    }
+
+    pub fn validate(&self) -> Result<(), String> {
+        // Rule 1: All web links require a host.
+        if self.is_web_link() && self.host.is_none() {
+            return Err("Web link requires a host".into());
+        }
+
+        // Rule 2: If it's an App Link, ensure http(s) and host.
+        if self.is_app_link() {
+            if !self.is_web_link() {
+                return Err("AppLink must be a valid web link (https/http + host)".into());
+            }
+            if self.scheme.iter().any(|s| s == "http") && !self.scheme.iter().any(|s| s == "https")
+            {
+                eprintln!("Warning: AppLink uses only 'http' — allowed on Android but not secure for production.");
+            }
+        }
+
+        Ok(())
+    }
+}
+
+// TODO: Consider removing this in v3
+fn default_schemes() -> Vec<String> {
+    vec!["https".to_string(), "http".to_string()]
+}
+
+fn deserialize_associated_host<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
 where
     D: Deserializer<'de>,
 {
-    let host = String::deserialize(deserializer)?;
-    if let Some((scheme, _host)) = host.split_once("://") {
-        Err(serde::de::Error::custom(format!(
-            "host `{host}` cannot start with a scheme, please remove the `{scheme}://` prefix"
-        )))
-    } else {
-        Ok(host)
+    let opt = Option::<String>::deserialize(deserializer)?;
+    if let Some(ref host) = opt {
+        if let Some((scheme, _)) = host.split_once("://") {
+            return Err(serde::de::Error::custom(format!(
+                "host `{host}` cannot start with a scheme, please remove the `{scheme}://` prefix"
+            )));
+        }
     }
+    Ok(opt)
 }
 
 #[derive(Deserialize, Clone)]

plugins/deep-link/src/error.rs

@@ -28,6 +28,16 @@ pub enum Error {
     PluginInvoke(#[from] tauri::plugin::mobile::PluginInvokeError),
 }
 
+// TODO(v3): change this into an error in v3,
+// see <https://github.com/tauri-apps/plugins-workspace/pull/2970#issuecomment-3244660138>.
+#[inline]
+#[cfg(target_os = "linux")]
+pub(crate) fn inspect_command_error<'a>(command: &'a str) -> impl Fn(&std::io::Error) + 'a {
+    move |e| {
+        tracing::error!("Failed to run OS command `{command}`: {e}");
+    }
+}
+
 impl Serialize for Error {
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
     where

plugins/deep-link/src/lib.rs

@@ -114,8 +114,8 @@ mod imp {
         /// ## Platform-specific:
         ///
         /// - **Windows / Linux**: This function reads the command line arguments and checks if there's only one value, which must be an URL with scheme matching one of the configured values.
-        ///     Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
-        ///     Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
+        ///   Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
+        ///   Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
         pub fn get_current(&self) -> crate::Result<Option<Vec<url::Url>>> {
             self.plugin_handle
                 .run_mobile_plugin::<GetCurrentResponse>("getCurrent", ())
@@ -226,8 +226,8 @@ mod imp {
         /// ## Platform-specific:
         ///
         /// - **Windows / Linux**: This function reads the command line arguments and checks if there's only one value, which must be an URL with scheme matching one of the configured values.
-        ///     Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
-        ///     Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
+        ///   Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
+        ///   Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
         pub fn get_current(&self) -> crate::Result<Option<Vec<url::Url>>> {
             return Ok(self.current.lock().unwrap().clone());
         }
@@ -254,6 +254,7 @@ mod imp {
         ///
         /// ## Platform-specific:
         ///
+        /// - **Linux**: Needs the `xdg-mime` and `update-desktop-database` commands available on the system.
         /// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
         pub fn register<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<()> {
             #[cfg(windows)]
@@ -303,12 +304,14 @@ mod imp {
 
                 if let Ok(mut desktop_file) = ini::Ini::load_from_file(&target_file) {
                     if let Some(section) = desktop_file.section_mut(Some("Desktop Entry")) {
-                        let old_mimes = section.remove("MimeType");
-                        section.append(
-                            "MimeType",
-                            format!("{mime_type};{}", old_mimes.unwrap_or_default()),
-                        );
-                        desktop_file.write_to_file(&target_file)?;
+                        // it's ok to remove it - we only write to the file if it's missing
+                        // and in that case we include old_mimes
+                        let old_mimes = section.remove("MimeType").unwrap_or_default();
+
+                        if !old_mimes.split(';').any(|mime| mime == mime_type) {
+                            section.append("MimeType", format!("{mime_type};{old_mimes}"));
+                            desktop_file.write_to_file(&target_file)?;
+                        }
                     }
                 } else {
                     let mut file = File::create(target_file)?;
@@ -330,11 +333,15 @@ mod imp {
 
                 Command::new("update-desktop-database")
                     .arg(target)
-                    .status()?;
+                    .status()
+                    .inspect_err(crate::error::inspect_command_error(
+                        "update-desktop-database",
+                    ))?;
 
                 Command::new("xdg-mime")
-                    .args(["default", &file_name, _protocol.as_ref()])
-                    .status()?;
+                    .args(["default", &file_name, mime_type.as_str()])
+                    .status()
+                    .inspect_err(crate::error::inspect_command_error("xdg-mime"))?;
 
                 Ok(())
             }
@@ -350,7 +357,7 @@ mod imp {
         /// ## Platform-specific:
         ///
         /// - **Windows**: Requires admin rights if the protocol is registered on local machine
-        ///     (this can happen when registered from the NSIS installer when the install mode is set to both or per machine)
+        ///   (this can happen when registered from the NSIS installer when the install mode is set to both or per machine)
         /// - **Linux**: Can only unregister the scheme if it was initially registered with [`register`](`Self::register`). May not work on older distros.
         /// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
         pub fn unregister<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<()> {
@@ -403,6 +410,7 @@ mod imp {
         ///
         /// ## Platform-specific:
         ///
+        /// - **Linux**: Needs the `xdg-mime` command available on the system.
         /// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
         pub fn is_registered<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<bool> {
             #[cfg(windows)]
@@ -437,7 +445,8 @@ mod imp {
                         "default",
                         &format!("x-scheme-handler/{}", _protocol.as_ref()),
                     ])
-                    .output()?;
+                    .output()
+                    .inspect_err(crate::error::inspect_command_error("xdg-mime"))?;
 
                 Ok(String::from_utf8_lossy(&output.stdout).contains(&file_name))
             }

plugins/dialog/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## \[2.4.0]
+
+- [`509eba8d`](https://github.com/tauri-apps/plugins-workspace/commit/509eba8d441c4f6ecf0af77b572cb2afd69a752d) ([#2641](https://github.com/tauri-apps/plugins-workspace/pull/2641) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Add support for showing a message dialog with 3 buttons.
+
+## \[2.3.3]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.2`
+
+## \[2.3.2]
+
+- [`af08c66f`](https://github.com/tauri-apps/plugins-workspace/commit/af08c66faafe0dffc4b0a80aef030cd3f0f89a9c) ([#2871](https://github.com/tauri-apps/plugins-workspace/pull/2871) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed an issue that caused the file picker not to open on Android when extension filters were set.
+
+## \[2.3.1]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.1`
+
+## \[2.3.0]
+
+- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
+
+### Dependencies
+
+- Upgraded to `fs-js@2.4.0`
+
+## \[2.2.2]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.3.0`
+
 ## \[2.2.1]
 
 ### Dependencies

plugins/dialog/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.2.1"
+version = "2.4.0"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,7 +34,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.2.1" }
+tauri-plugin-fs = { path = "../fs", version = "2.4.2" }
 
 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }

plugins/dialog/README.md

@@ -33,21 +33,12 @@ tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace",
 
 You can install the JavaScript Guest bindings using your preferred JavaScript package manager:
 
-> Note: Since most JavaScript package managers are unable to install packages from git monorepos we provide read-only mirrors of each plugin. This makes installation option 2 more ergonomic to use.
-
 ```sh
 pnpm add @tauri-apps/plugin-dialog
 # or
 npm add @tauri-apps/plugin-dialog
 # or
 yarn add @tauri-apps/plugin-dialog
-
-# alternatively with Git:
-pnpm add https://github.com/tauri-apps/tauri-plugin-dialog#v2
-# or
-npm add https://github.com/tauri-apps/tauri-plugin-dialog#v2
-# or
-yarn add https://github.com/tauri-apps/tauri-plugin-dialog#v2
 ```
 
 ## Usage

plugins/dialog/android/src/main/java/DialogPlugin.kt

@@ -38,6 +38,7 @@ class MessageOptions {
   var title: String? = null
   lateinit var message: String
   var okButtonLabel: String? = null
+  var noButtonLabel: String? = null
   var cancelButtonLabel: String? = null
 }
 
@@ -56,20 +57,18 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
     try {
       val args = invoke.parseArgs(FilePickerOptions::class.java)
       val parsedTypes = parseFiltersOption(args.filters)
-      
-      val intent = if (parsedTypes.isNotEmpty()) {
-        val intent = Intent(Intent.ACTION_PICK)
-        setIntentMimeTypes(intent, parsedTypes)
-        intent
-      } else {
-        val intent = Intent(Intent.ACTION_GET_CONTENT)
-        intent.addCategory(Intent.CATEGORY_OPENABLE)
-        intent.type = "*/*"
-        intent
+
+      // TODO: ACTION_OPEN_DOCUMENT ??
+      val intent = Intent(Intent.ACTION_GET_CONTENT)
+      intent.addCategory(Intent.CATEGORY_OPENABLE)
+      intent.type = "*/*"
+
+      if (parsedTypes.isNotEmpty()) {
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, parsedTypes)
       }
 
       intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, args.multiple ?: false)
-      
+
       startActivityForResult(invoke, intent, "filePickerResult")
     } catch (ex: Exception) {
       val message = ex.message ?: "Failed to pick file"
@@ -115,7 +114,7 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
     callResult.put("files", JSArray.from(uris.toTypedArray()))
     return callResult
   }
-  
+
   private fun parseFiltersOption(filters: Array<Filter>): Array<String> {
     val mimeTypes = mutableListOf<String>()
     for (filter in filters) {
@@ -132,46 +131,17 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
     return mimeTypes.toTypedArray()
   }
 
-  private fun setIntentMimeTypes(intent: Intent, mimeTypes: Array<String>) {
-    if (mimeTypes.isNotEmpty()) {
-      var uniqueMimeKind = true
-      var mimeKind: String? = null
-      for (mime in mimeTypes) {
-        val kind = mime.split("/")[0]
-        if (mimeKind == null) {
-          mimeKind = kind
-        } else if (mimeKind != kind) {
-          uniqueMimeKind = false
-        }
-      }
-
-      if (uniqueMimeKind) {
-        if (mimeTypes.size > 1) {
-          intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes)
-          intent.type = Intent.normalizeMimeType("$mimeKind/*")
-        } else {
-          intent.type = mimeTypes[0]
-        }
-      } else {
-        intent.type = "*/*"
-      }
-    } else {
-      intent.type = "*/*"
-    }
-  }
-  
   @Command
   fun showMessageDialog(invoke: Invoke) {
     val args = invoke.parseArgs(MessageOptions::class.java)
-    
+
     if (activity.isFinishing) {
       invoke.reject("App is finishing")
       return
     }
 
-    val handler = { cancelled: Boolean, value: Boolean ->
+    val handler = { value: String ->
       val ret = JSObject()
-      ret.put("cancelled", cancelled)
       ret.put("value", value)
       invoke.resolve(ret)
     }
@@ -179,28 +149,38 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
     Handler(Looper.getMainLooper())
       .post {
         val builder = AlertDialog.Builder(activity)
-        
+
         if (args.title != null) {
           builder.setTitle(args.title)
         }
+
+        val okButtonLabel = args.okButtonLabel ?: "Ok"
+
         builder
           .setMessage(args.message)
-          .setPositiveButton(
-            args.okButtonLabel ?: "OK"
-          ) { dialog, _ ->
+          .setPositiveButton(okButtonLabel) { dialog, _ ->
             dialog.dismiss()
-            handler(false, true)
+            handler(okButtonLabel)
           }
           .setOnCancelListener { dialog ->
             dialog.dismiss()
-            handler(true, false)
+            handler(args.cancelButtonLabel ?: "Cancel")
           }
+
+        if (args.noButtonLabel != null) {
+          builder.setNeutralButton(args.noButtonLabel) { dialog, _ ->
+            dialog.dismiss()
+            handler(args.noButtonLabel!!)
+          }
+        }
+
         if (args.cancelButtonLabel != null) {
           builder.setNegativeButton( args.cancelButtonLabel) { dialog, _ ->
             dialog.dismiss()
-            handler(false, false)
+            handler(args.cancelButtonLabel!!)
           }
         }
+
         val dialog = builder.create()
         dialog.show()
       }
@@ -213,10 +193,14 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
       val parsedTypes = parseFiltersOption(args.filters)
 
       val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
-      setIntentMimeTypes(intent, parsedTypes)
-
       intent.addCategory(Intent.CATEGORY_OPENABLE)
       intent.putExtra(Intent.EXTRA_TITLE, args.fileName ?: "")
+      intent.type = "*/*"
+
+      if (parsedTypes.isNotEmpty()) {
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, parsedTypes)
+      }
+
       startActivityForResult(invoke, intent, "saveFileDialogResult")
     } catch (ex: Exception) {
       val message = ex.message ?: "Failed to pick save file"

plugins/dialog/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,yesButtonLabel:i?.okLabel?.toString(),noButtonLabel:i?.cancelLabel?.toString()})},t.confirm=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),cancelButtonLabel:i?.cancelLabel?.toString()})},t.message=async function(t,e){const i="string"==typeof e?{title:e}:e;await n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}function e(t){if(void 0!==t)return"string"==typeof t?t:"ok"in t&&"cancel"in t?{OkCancelCustom:[t.ok,t.cancel]}:"yes"in t&&"no"in t&&"cancel"in t?{YesNoCancelCustom:[t.yes,t.no,t.cancel]}:"ok"in t?{OkCustom:t.ok}:void 0}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const o="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:o?.title?.toString(),kind:o?.kind,yesButtonLabel:o?.okLabel?.toString(),noButtonLabel:o?.cancelLabel?.toString()})},t.confirm=async function(t,e){const o="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:o?.title?.toString(),kind:o?.kind,okButtonLabel:o?.okLabel?.toString(),cancelButtonLabel:o?.cancelLabel?.toString()})},t.message=async function(t,o){const i="string"==typeof o?{title:o}:o;return n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),buttons:e(i?.buttons)})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}

plugins/dialog/guest-js/index.ts

@@ -77,6 +77,80 @@ interface SaveDialogOptions {
   canCreateDirectories?: boolean
 }
 
+/**
+ * Default buttons for a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogDefaultButtons =
+  | 'Ok'
+  | 'OkCancel'
+  | 'YesNo'
+  | 'YesNoCancel'
+
+/** All possible button keys. */
+type ButtonKey = 'ok' | 'cancel' | 'yes' | 'no'
+
+/** Ban everything except a set of keys. */
+type BanExcept<Allowed extends ButtonKey> = Partial<
+  Record<Exclude<ButtonKey, Allowed>, never>
+>
+
+/**
+ * The Yes, No and Cancel buttons of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtonsYesNoCancel = {
+  /** The Yes button. */
+  yes: string
+  /** The No button. */
+  no: string
+  /** The Cancel button. */
+  cancel: string
+} & BanExcept<'yes' | 'no' | 'cancel'>
+
+/**
+ * The Ok and Cancel buttons of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtonsOkCancel = {
+  /** The Ok button. */
+  ok: string
+  /** The Cancel button. */
+  cancel: string
+} & BanExcept<'ok' | 'cancel'>
+
+/**
+ * The Ok button of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtonsOk = {
+  /** The Ok button. */
+  ok: string
+} & BanExcept<'ok'>
+
+/**
+ * Custom buttons for a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogCustomButtons =
+  | MessageDialogButtonsYesNoCancel
+  | MessageDialogButtonsOkCancel
+  | MessageDialogButtonsOk
+
+/**
+ * The buttons of a message dialog.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogButtons =
+  | MessageDialogDefaultButtons
+  | MessageDialogCustomButtons
+
 /**
  * @since 2.0.0
  */
@@ -85,8 +159,58 @@ interface MessageDialogOptions {
   title?: string
   /** The kind of the dialog. Defaults to `info`. */
   kind?: 'info' | 'warning' | 'error'
-  /** The label of the confirm button. */
+  /**
+   * The label of the Ok button.
+   *
+   * @deprecated Use {@linkcode MessageDialogOptions.buttons} instead.
+   */
   okLabel?: string
+  /**
+   * The buttons of the dialog.
+   *
+   * @example
+   *
+   * ```ts
+   * // Use system default buttons texts
+   * await message('Hello World!', { buttons: 'Ok' })
+   * await message('Hello World!', { buttons: 'OkCancel' })
+   *
+   * // Or with custom button texts
+   * await message('Hello World!', { buttons: { ok: 'Yes!' } })
+   * await message('Take on the task?', {
+   *   buttons: { ok: 'Accept', cancel: 'Cancel' }
+   * })
+   * await message('Show the file content?', {
+   *   buttons: { yes: 'Show content', no: 'Show in folder', cancel: 'Cancel' }
+   * })
+   * ```
+   *
+   * @since 2.4.0
+   */
+  buttons?: MessageDialogButtons
+}
+
+/**
+ * Internal function to convert the buttons to the Rust type.
+ */
+function buttonsToRust(buttons: MessageDialogButtons | undefined) {
+  if (buttons === undefined) {
+    return undefined
+  }
+
+  if (typeof buttons === 'string') {
+    return buttons
+  } else if ('ok' in buttons && 'cancel' in buttons) {
+    return { OkCancelCustom: [buttons.ok, buttons.cancel] }
+  } else if ('yes' in buttons && 'no' in buttons && 'cancel' in buttons) {
+    return {
+      YesNoCancelCustom: [buttons.yes, buttons.no, buttons.cancel]
+    }
+  } else if ('ok' in buttons) {
+    return { OkCustom: buttons.ok }
+  }
+
+  return undefined
 }
 
 interface ConfirmDialogOptions {
@@ -202,6 +326,16 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
   return await invoke('plugin:dialog|save', { options })
 }
 
+/**
+ * The result of a message dialog.
+ *
+ * The result is a string if the dialog has custom buttons,
+ * otherwise it is one of the default buttons.
+ *
+ * @since 2.4.0
+ */
+export type MessageDialogResult = 'Yes' | 'No' | 'Ok' | 'Cancel' | (string & {})
+
 /**
  * Shows a message dialog with an `Ok` button.
  * @example
@@ -222,13 +356,15 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
 async function message(
   message: string,
   options?: string | MessageDialogOptions
-): Promise<void> {
+): Promise<MessageDialogResult> {
   const opts = typeof options === 'string' ? { title: options } : options
-  await invoke('plugin:dialog|message', {
+
+  return invoke<MessageDialogResult>('plugin:dialog|message', {
     message: message.toString(),
     title: opts?.title?.toString(),
     kind: opts?.kind,
-    okButtonLabel: opts?.okLabel?.toString()
+    okButtonLabel: opts?.okLabel?.toString(),
+    buttons: buttonsToRust(opts?.buttons)
   })
 }
 

plugins/dialog/ios/Sources/DialogPlugin.swift

@@ -20,6 +20,7 @@ struct MessageDialogOptions: Decodable {
   var title: String?
   let message: String
   var okButtonLabel: String?
+  var noButtonLabel: String?
   var cancelButtonLabel: String?
 }
 
@@ -200,36 +201,38 @@ class DialogPlugin: Plugin {
       let alert = UIAlertController(
         title: args.title, message: args.message, preferredStyle: UIAlertController.Style.alert)
 
-      let cancelButtonLabel = args.cancelButtonLabel ?? ""
-      if !cancelButtonLabel.isEmpty {
+      if let cancelButtonLabel = args.cancelButtonLabel {
         alert.addAction(
           UIAlertAction(
             title: cancelButtonLabel, style: UIAlertAction.Style.default,
             handler: { (_) -> Void in
-              Logger.error("cancel")
-
-              invoke.resolve([
-                "value": false,
-                "cancelled": false,
-              ])
-            }))
+              invoke.resolve(["value": cancelButtonLabel])
+            }
+          )
+        )
       }
 
-      let okButtonLabel = args.okButtonLabel ?? (cancelButtonLabel.isEmpty ? "OK" : "")
-      if !okButtonLabel.isEmpty {
+      if let noButtonLabel = args.noButtonLabel {
         alert.addAction(
           UIAlertAction(
-            title: okButtonLabel, style: UIAlertAction.Style.default,
+            title: noButtonLabel, style: UIAlertAction.Style.default,
             handler: { (_) -> Void in
-              Logger.error("ok")
-
-              invoke.resolve([
-                "value": true,
-                "cancelled": false,
-              ])
-            }))
+              invoke.resolve(["value": noButtonLabel])
+            }
+          )
+        )
       }
 
+      let okButtonLabel = args.okButtonLabel ?? "Ok"
+      alert.addAction(
+        UIAlertAction(
+          title: okButtonLabel, style: UIAlertAction.Style.default,
+          handler: { (_) -> Void in
+            invoke.resolve(["value": okButtonLabel])
+          }
+        )
+      )
+
       manager.viewController?.present(alert, animated: true, completion: nil)
     }
   }