diff --git a/package.json b/package.json index 64fffc6..5ac987c 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,10 @@ "preview": "vite preview", "tauri": "tauri", "tauri:dev": "tauri dev --config src-tauri/tauri.dev.conf.json", + "tauri:android:dev": "tauri android dev", + "tauri:android:build": "tauri android build", + "tauri:android:build:apk": "tauri android build --apk", + "tauri:android:build:aab": "tauri android build --aab", "test": "vitest run", "test:watch": "vitest", "test:coverage": "vitest run --coverage" diff --git a/src-tauri/.gitignore b/src-tauri/.gitignore index b21bd68..1619c74 100644 --- a/src-tauri/.gitignore +++ b/src-tauri/.gitignore @@ -5,3 +5,13 @@ # Generated by Tauri # will have schema files for capabilities auto-completion /gen/schemas + +# Tauri Android — build outputs only; project source under gen/android is committed. +/gen/android/.gradle/ +/gen/android/app/build/ +/gen/android/app/.cxx/ +/gen/android/build/ +/gen/android/local.properties +/gen/android/.idea/ +/gen/android/app/release/ +/gen/android/app/src/main/jniLibs/ diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 2316078..aaa45ba 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -13,12 +13,15 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2", features = [] } [dependencies] -tauri = { version = "2", features = ["tray-icon"] } +tauri = { version = "2" } tauri-plugin-opener = "2" tauri-plugin-sql = { version = "2", features = ["sqlite"] } -tauri-plugin-global-shortcut = "2" serde = { version = "1", features = ["derive"] } serde_json = "1" tiny_http = "0.12" url = "2" urlencoding = "2" + +[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] +tauri = { version = "2", features = ["tray-icon"] } +tauri-plugin-global-shortcut = "2" diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index 1b18abc..de2a086 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -1,7 +1,8 @@ { "$schema": "../gen/schemas/desktop-schema.json", "identifier": "default", - "description": "Capability for the main window", + "description": "Capability for the main window (desktop)", + "platforms": ["macOS", "windows", "linux"], "windows": ["main"], "permissions": [ "core:default", diff --git a/src-tauri/capabilities/mobile.json b/src-tauri/capabilities/mobile.json new file mode 100644 index 0000000..e76d473 --- /dev/null +++ b/src-tauri/capabilities/mobile.json @@ -0,0 +1,13 @@ +{ + "$schema": "../gen/schemas/mobile-schema.json", + "identifier": "mobile", + "description": "Capability for the main window (mobile)", + "platforms": ["android", "iOS"], + "windows": ["main"], + "permissions": [ + "core:default", + "opener:default", + "sql:default", + "sql:allow-execute" + ] +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index c9cf857..820efb1 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -215,35 +215,38 @@ async fn start_google_oauth(app: tauri::AppHandle, auth_url: String) -> Result