Merge remote-tracking branch 'origin/v2' into v3

plugins/shell/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.3.6]
+
+- [`db9c5998`](https://github.com/tauri-apps/plugins-workspace/commit/db9c5998feff9384f9cbbefcbe0d45937c00a1fc) ([#3531](https://github.com/tauri-apps/plugins-workspace/pull/3531) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix missing `consumer-rules.pro` on Gradle v9.
+
 ## \[2.3.5]
 
 ### bug

plugins/shell/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-shell"
-version = "2.3.5"
+version = "2.3.6"
 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 }
@@ -8,6 +8,14 @@ license = { workspace = true }
 rust-version = { workspace = true }
 repository = { workspace = true }
 links = "tauri-plugin-shell"
+exclude = [
+  "/banner.png",
+  "/guest-js",
+  "/package.json",
+  "/rollup.config.js",
+  "/test",
+  "/tsconfig.json",
+]
 
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "" }

plugins/shell/android/build.gradle.kts

@@ -14,15 +14,6 @@ android {
         consumerProguardFiles("consumer-rules.pro")
     }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8

plugins/shell/package.json

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

plugins/shell/src/process/mod.rs

@@ -479,10 +479,8 @@ fn read_line<F: Fn(Vec<u8>) -> CommandEvent + Send + Copy + 'static>(
                 let _ = block_on_task(async move { tx_.send(wrapper(buf)).await });
             }
             Err(e) => {
-                let tx_ = tx.clone();
-                let _ = block_on_task(
-                    async move { tx_.send(CommandEvent::Error(e.to_string())).await },
-                );
+                let _ =
+                    block_on_task(async move { tx.send(CommandEvent::Error(e.to_string())).await });
                 break;
             }
         }