Merge branch 'v2' into feature/fallback_targets

Author: kandrelczyk

.changes/barcode-gs1.md

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

.changes/window-state-optional-flags.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.                                                                                                                            | ✅  | ✅  | ✅  | ❌  | ❌  |
 

Cargo.lock

@@ -1,5 +1,14 @@
 # Changelog
 
+## \[2.0.27]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.26]
 
 ### Dependencies

Cargo.toml

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.26",
+  "version": "2.0.27",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -10,17 +10,17 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.6.0",
-    "@tauri-apps/plugin-barcode-scanner": "^2.3.0",
+    "@tauri-apps/api": "2.7.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.3.0",
-    "@tauri-apps/plugin-fs": "^2.4.0",
+    "@tauri-apps/plugin-dialog": "^2.3.1",
+    "@tauri-apps/plugin-fs": "^2.4.1",
     "@tauri-apps/plugin-geolocation": "^2.2.0",
     "@tauri-apps/plugin-global-shortcut": "^2.3.0",
     "@tauri-apps/plugin-haptics": "^2.2.0",
-    "@tauri-apps/plugin-http": "^2.5.0",
+    "@tauri-apps/plugin-http": "^2.5.1",
     "@tauri-apps/plugin-nfc": "^2.3.0",
     "@tauri-apps/plugin-notification": "^2.3.0",
     "@tauri-apps/plugin-opener": "^2.4.0",
@@ -29,16 +29,17 @@
     "@tauri-apps/plugin-shell": "^2.3.0",
     "@tauri-apps/plugin-store": "^2.3.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.6.2",
-    "@unocss/extractor-svelte": "^66.0.0",
+    "@sveltejs/vite-plugin-svelte": "^6.0.0",
+    "@tauri-apps/cli": "2.7.0",
+    "@unocss/extractor-svelte": "^66.3.3",
     "svelte": "^5.20.4",
-    "unocss": "^66.0.0",
-    "vite": "^6.2.6"
+    "unocss": "^66.3.3",
+    "vite": "^7.0.4"
   }
 }

README.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## \[2.0.31]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+- Upgraded to `[email protected]`
+
 ## \[2.0.30]
 
 ### Dependencies

examples/api/CHANGELOG.md

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.30"
+version = "2.0.31"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -21,15 +21,15 @@ tiny_http = "0.12"
 time = "0.3"
 log = { workspace = true }
 tauri-plugin-log = { path = "../../../plugins/log", version = "2.6.0" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.0", features = [
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.1", features = [
   "watch",
 ] }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.0" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.0" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.1" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
   "cookies",
-], version = "2.5.0" }
+], version = "2.5.1" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.0", features = [
   "windows7-compat",
 ] }
@@ -38,6 +38,7 @@ tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.0" }
 tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.4.0" }
 tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.0" }
 tauri-plugin-store = { path = "../../../plugins/store", version = "2.3.0" }
+tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }
 
 [dependencies.tauri]
 workspace = true
@@ -60,7 +61,7 @@ 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.3.0" }
+tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.0" }
 tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.0" }
 tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.0" }
 tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.0" }

examples/api/package.json

@@ -95,6 +95,7 @@
     {
       "identifier": "opener:allow-open-path",
       "allow": [{ "path": "$APPDATA" }, { "path": "$APPDATA/**" }]
-    }
+    },
+    "upload:default"
   ]
 }