Merge branch 'v2' into feature/v2-http-dangerous-settings

tauri-apps · Dec 15, 2024 · ad155a2 · ad155a2
2 parents d4a92a5 + 51919fb
commit ad155a2
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/api/CHANGELOG.md b/examples/api/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.8]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+
 ## \[2.0.7]
 
 ### Dependencies

diff --git a/examples/api/package.json b/examples/api/package.json
@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.7",
+  "version": "2.0.8",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -19,7 +19,7 @@
     "@tauri-apps/plugin-fs": "2.2.0",
     "@tauri-apps/plugin-geolocation": "2.2.0",
     "@tauri-apps/plugin-global-shortcut": "2.2.0",
-    "@tauri-apps/plugin-opener": "2.2.1",
+    "@tauri-apps/plugin-opener": "2.2.2",
     "@tauri-apps/plugin-haptics": "2.2.0",
     "@tauri-apps/plugin-http": "2.2.0",
     "@tauri-apps/plugin-nfc": "2.2.0",

diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.11]
+
+### Dependencies
+
+- Upgraded to `[email protected]`
+
 ## \[2.0.10]
 
 ### Dependencies

diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.10"
+version = "2.0.11"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -33,7 +33,7 @@ tauri-plugin-notification = { path = "../../../plugins/notification", version =
 ] }
 tauri-plugin-os = { path = "../../../plugins/os", version = "2.2.0" }
 tauri-plugin-process = { path = "../../../plugins/process", version = "2.2.0" }
-tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.2.1" }
+tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.2.2" }
 tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.2.0" }
 tauri-plugin-store = { path = "../../../plugins/store", version = "2.2.0" }
 

diff --git a/plugins/opener/CHANGELOG.md b/plugins/opener/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.2.2]
+
+- [`ee0f65de`](https://github.com/tauri-apps/plugins-workspace/commit/ee0f65de5c645c244c5f0b638e0e0aab687cb9bf) ([#2207](https://github.com/tauri-apps/plugins-workspace/pull/2207) by [@universalappfactory](https://github.com/tauri-apps/plugins-workspace/../../universalappfactory)) Fixed OpenerPlugin packagename for android
+
 ## \[2.2.1]
 
 - [`18dffc9d`](https://github.com/tauri-apps/plugins-workspace/commit/18dffc9dfecaf0c900e233e041d9ca36c92834b5) ([#2189](https://github.com/tauri-apps/plugins-workspace/pull/2189) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix usage on iOS.

diff --git a/plugins/opener/Cargo.toml b/plugins/opener/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-opener"
-version = "2.2.1"
+version = "2.2.2"
 description = "Open files and URLs using their default application."
 edition = { workspace = true }
 authors = { workspace = true }

diff --git a/plugins/opener/android/src/main/java/OpenerPlugin.kt b/plugins/opener/android/src/main/java/OpenerPlugin.kt
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-package app.tauri.shell
+package app.tauri.opener
 
 import android.app.Activity
 import android.content.Intent
@@ -27,4 +27,4 @@ class OpenerPlugin(private val activity: Activity) : Plugin(activity) {
             invoke.reject(ex.message)
         }
     }
-}
+}
diff --git a/plugins/opener/package.json b/plugins/opener/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-opener",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Open files and URLs using their default application.",
   "license": "MIT OR Apache-2.0",
   "authors": [

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml