Merge remote-tracking branch 'origin/v2' into plugin/secure-storage

plugins/shell/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## \[2.3.3]
+
+- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
+
+## \[2.3.2]
+
+- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
+
 ## \[2.3.1]
 
 - [`d865ed47`](https://github.com/tauri-apps/plugins-workspace/commit/d865ed47685c3923e894f7d10ee4c037507037e6) ([#2950](https://github.com/tauri-apps/plugins-workspace/pull/2950) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix sidecar with dots in the filename not working on Windows.

plugins/shell/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-shell"
-version = "2.3.1"
+version = "2.3.3"
 description = "Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -9,10 +9,6 @@ rust-version = { workspace = true }
 repository = { workspace = true }
 links = "tauri-plugin-shell"
 
-[package.metadata.docs.rs]
-rustc-args = ["--cfg", "docsrs"]
-rustdoc-args = ["--cfg", "docsrs"]
-
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "" }
 linux = { level = "full", notes = "" }

plugins/shell/android/build.gradle.kts

@@ -5,10 +5,10 @@ plugins {
 
 android {
     namespace = "app.tauri.shell"
-    compileSdk = 34
+    compileSdk = 36
 
     defaultConfig {
-        minSdk = 24        
+        minSdk = 24
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

plugins/shell/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-shell",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"

plugins/shell/src/config.rs

@@ -17,9 +17,11 @@ pub struct Config {
 #[derive(Debug, PartialEq, Eq, Clone, Deserialize)]
 #[serde(untagged, deny_unknown_fields)]
 #[non_exhaustive]
+#[derive(Default)]
 pub enum ShellAllowlistOpen {
     /// Shell open API allowlist is not defined by the user.
     /// In this case we add the default validation regex (same as [`Self::Flag(true)`]).
+    #[default]
     Unset,
     /// If the shell open API should be enabled.
     ///
@@ -35,9 +37,3 @@ pub enum ShellAllowlistOpen {
     /// that allow flag-like strings to pass validation. e.g. `--enable-debugging`, `-i`, `/R`.
     Validate(String),
 }
-
-impl Default for ShellAllowlistOpen {
-    fn default() -> Self {
-        Self::Unset
-    }
-}

plugins/shell/src/process/mod.rs

@@ -89,6 +89,8 @@ impl CommandChild {
 /// Describes the result of a process after it has terminated.
 #[derive(Debug)]
 pub struct ExitStatus {
+    // This field is intentionally left private.
+    // See: https://github.com/tauri-apps/plugins-workspace/pull/3115.
     code: Option<i32>,
 }