Skip to content

Commit dc2b2a4

Browse files
committed
Tauri: unify serial implementation
1 parent 02c04e4 commit dc2b2a4

File tree

4 files changed

+9
-149
lines changed

4 files changed

+9
-149
lines changed

src-tauri/Cargo.lock

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src-tauri/Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@ tauri-build = { version = "2.5", features = [] }
1818
[dependencies]
1919
tauri = { version = "2.9", features = [] }
2020
tauri-plugin-shell = "2.3"
21-
# Allow newer serial plugin releases (2.21+) which may include Android fixes
2221
serde = { version = "1.0", features = ["derive"] }
2322
serde_json = "1.0"
24-
25-
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
26-
tauri-plugin-serialplugin = "2.21"
27-
28-
[target.'cfg(target_os = "android")'.dependencies]
29-
serialport = "4.8"
23+
# Pin exact version to avoid pulling 2.21.x which is incompatible with current Android/Kotlin setup
24+
# Try an older plugin version that matches tauri-android 2.9 API surface (avoid onDetach override)
25+
# Further downgrade to avoid onDetach override incompatibility
26+
tauri-plugin-serialplugin = "=2.15.0"
3027

3128
[features]
3229
default = ["custom-protocol"]

src-tauri/src/main.rs

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,9 @@
44
)]
55

66
fn main() {
7-
let mut builder = tauri::Builder::default()
8-
.plugin(tauri_plugin_shell::init());
9-
10-
#[cfg(target_os = "android")]
11-
{
12-
// Local Android serial plugin that mirrors the commands used by the frontend
13-
builder = builder.plugin(crate::serial_android::init_android());
14-
}
15-
16-
#[cfg(not(target_os = "android"))]
17-
{
18-
// Desktop: use official plugin for now
19-
builder = builder.plugin(tauri_plugin_serialplugin::init());
20-
}
21-
22-
builder
7+
tauri::Builder::default()
8+
.plugin(tauri_plugin_shell::init())
9+
.plugin(tauri_plugin_serialplugin::init())
2310
.run(tauri::generate_context!())
2411
.expect("error while running tauri application");
2512
}
26-
27-
#[cfg(target_os = "android")]
28-
mod serial_android;

src-tauri/src/serial_android.rs

Lines changed: 0 additions & 120 deletions
This file was deleted.

0 commit comments

Comments
 (0)