From cf71d26f14e271d3ae33f44942f9e65e6dca1a9e Mon Sep 17 00:00:00 2001 From: John Costa Date: Sun, 20 Apr 2025 14:26:38 +0100 Subject: [PATCH] wip: sorting out various versioning problems --- frontend/src-tauri/Cargo.lock | 77 ------------------- frontend/src-tauri/Cargo.toml | 1 - frontend/src-tauri/capabilities/default.json | 1 - .../gen/android/app/build.gradle.kts | 14 ++++ .../src-tauri/gen/android/gradle.properties | 2 +- frontend/src-tauri/src/lib.rs | 2 +- 6 files changed, 16 insertions(+), 81 deletions(-) diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock index e777b10..16e57db 100644 --- a/frontend/src-tauri/Cargo.lock +++ b/frontend/src-tauri/Cargo.lock @@ -14,7 +14,6 @@ dependencies = [ "serde_json", "tauri", "tauri-build", - "tauri-plugin-dialog", "tauri-plugin-global-shortcut", "tauri-plugin-http", "tauri-plugin-opener", @@ -82,24 +81,6 @@ version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f" -[[package]] -name = "ashpd" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "rand 0.9.0", - "raw-window-handle", - "serde", - "serde_repr", - "tokio", - "url", - "zbus", -] - [[package]] name = "async-broadcast" version = "0.7.2" @@ -859,18 +840,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" -[[package]] -name = "dispatch2" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a0d569e003ff27784e0e14e4a594048698e0c0f0b66cabcb51511be55a7caa0" -dependencies = [ - "bitflags 2.9.0", - "block2 0.6.0", - "libc", - "objc2 0.6.0", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -3377,31 +3346,6 @@ dependencies = [ "windows-registry", ] -[[package]] -name = "rfd" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c844748fdc82aae252ee4594a89b6e7ebef1063de7951545564cbc4e57075d" -dependencies = [ - "ashpd", - "block2 0.6.0", - "dispatch2", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "log", - "objc2 0.6.0", - "objc2-app-kit", - "objc2-core-foundation", - "objc2-foundation 0.3.0", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-sys 0.59.0", -] - [[package]] name = "ring" version = "0.17.14" @@ -4176,24 +4120,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "tauri-plugin-dialog" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcaf6e5d6062423a0f711a23c2a573ccba222b6a16a9322d8499928f27e41376" -dependencies = [ - "log", - "raw-window-handle", - "rfd", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "tauri-plugin-fs", - "thiserror 2.0.12", - "url", -] - [[package]] name = "tauri-plugin-fs" version = "2.2.1" @@ -4530,7 +4456,6 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "tracing", "windows-sys 0.52.0", ] @@ -5761,7 +5686,6 @@ dependencies = [ "serde", "serde_repr", "static_assertions", - "tokio", "tracing", "uds_windows", "windows-sys 0.59.0", @@ -5878,7 +5802,6 @@ dependencies = [ "enumflags2", "serde", "static_assertions", - "url", "winnow 0.7.6", "zvariant_derive", "zvariant_utils", diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml index 359848d..404a76b 100644 --- a/frontend/src-tauri/Cargo.toml +++ b/frontend/src-tauri/Cargo.toml @@ -22,7 +22,6 @@ tauri = { version = "2.0.0-beta.12", features = ["macos-private-api"] } tauri-plugin-opener = "2.0.0-beta.12" serde = { version = "1", features = ["derive"] } serde_json = "1" -tauri-plugin-dialog = "2.0.0-beta.12" notify = "6.1.1" base64 = "0.21.7" tokio = { version = "1.36.0", features = ["full"] } diff --git a/frontend/src-tauri/capabilities/default.json b/frontend/src-tauri/capabilities/default.json index 0215a5b..dc6791e 100644 --- a/frontend/src-tauri/capabilities/default.json +++ b/frontend/src-tauri/capabilities/default.json @@ -6,7 +6,6 @@ "permissions": [ "core:default", "opener:default", - "dialog:default", "core:window:allow-start-dragging", "http:default", "core:window:allow-show", diff --git a/frontend/src-tauri/gen/android/app/build.gradle.kts b/frontend/src-tauri/gen/android/app/build.gradle.kts index 3ad4365..ec62fa2 100644 --- a/frontend/src-tauri/gen/android/app/build.gradle.kts +++ b/frontend/src-tauri/gen/android/app/build.gradle.kts @@ -1,4 +1,9 @@ import java.util.Properties +import java.io.FileInputStream + +val keyPropertiesFile = rootProject.file("key.properties") +val keyProperties = Properties() +keyProperties.load(FileInputStream(keyPropertiesFile)) plugins { id("com.android.application") @@ -24,6 +29,14 @@ android { versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt() versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0") } + signingConfigs { + create("release") { + keyAlias = keyProperties["keyAlias"] as String + keyPassword = keyProperties["keyPassword"] as String + storeFile = file(keyProperties["storeFile"] as String) + storePassword = keyProperties["storePassword"] as String + } + } buildTypes { getByName("debug") { manifestPlaceholders["usesCleartextTraffic"] = "true" @@ -43,6 +56,7 @@ android { .plus(getDefaultProguardFile("proguard-android-optimize.txt")) .toList().toTypedArray() ) + signingConfig = signingConfigs.getByName("release") } } kotlinOptions { diff --git a/frontend/src-tauri/gen/android/gradle.properties b/frontend/src-tauri/gen/android/gradle.properties index 21f0c74..aaa9d5c 100644 --- a/frontend/src-tauri/gen/android/gradle.properties +++ b/frontend/src-tauri/gen/android/gradle.properties @@ -22,4 +22,4 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.nonFinalResIds=false -org.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 \ No newline at end of file +org.gradle.java.home=/usr/lib/jvm/java-24-openjdk \ No newline at end of file diff --git a/frontend/src-tauri/src/lib.rs b/frontend/src-tauri/src/lib.rs index 381c81a..cdc15c9 100644 --- a/frontend/src-tauri/src/lib.rs +++ b/frontend/src-tauri/src/lib.rs @@ -15,7 +15,7 @@ pub fn run() { tauri::Builder::default() .plugin(tauri_plugin_store::Builder::new().build()) .plugin(tauri_plugin_http::init()) - .plugin(tauri_plugin_dialog::init()) + // .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_opener::init()) .manage(watcher_state) .invoke_handler(tauri::generate_handler![