diff --git a/Cargo.toml b/Cargo.toml index a7838664..6f144685 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,17 +23,18 @@ version = "1.0.0" onelauncher = { path = "./packages/core" } # tauri uses latest crates.io beta channel (temporarily can use v2 and main branches if necessary) -tauri = { version = "=2.0.0-beta.24", features = [ +tauri = { version = "=2.0.0-beta.23", features = [ "rustls-tls", "tracing", "specta", "uuid" ] } -tauri-utils = { version = "=2.0.0-beta.19" } -tauri-build = { version = "=2.0.0-beta.19" } -tauri-codegen = { version = "=2.0.0-beta.19" } -tauri-macros = { version = "=2.0.0-beta.19" } -tauri-plugin = { version = "=2.0.0-beta.19" } +tauri-utils = { version = "=2.0.0-beta.18" } +tauri-build = { version = "=2.0.0-beta.18" } +tauri-codegen = { version = "=2.0.0-beta.18" } +tauri-macros = { version = "=2.0.0-beta.18" } +tauri-plugin = { version = "=2.0.0-beta.18" } +tauri-runtime = { version = "=2.0.0-beta.19" } tauri-plugin-authenticator = { version = "2.0.0-beta" } tauri-plugin-shell = { version = "2.0.0-beta" } tauri-plugin-window-state = { version = "2.0.0-beta" } @@ -51,7 +52,7 @@ specta = { version = "=2.0.0-rc.12", features = [ "serde_json", "function", ] } -# tauri-specta is updated via crates.io +# tauri-specta is updated on main branch tauri-specta = { version = "=2.0.0-rc.11", features = [ "javascript", "typescript" diff --git a/apps/desktop/Cargo.toml b/apps/desktop/Cargo.toml index f8568fe6..bb33dea4 100644 --- a/apps/desktop/Cargo.toml +++ b/apps/desktop/Cargo.toml @@ -39,6 +39,7 @@ tauri-build = { workspace = true } tauri-codegen = { workspace = true } tauri-macros = { workspace = true } tauri-plugin = { workspace = true } +tauri-runtime = { workspace = true } tauri-plugin-shell = { workspace = true } tauri-plugin-window-state = { workspace = true } tauri-plugin-single-instance = { workspace = true } diff --git a/apps/desktop/build.rs b/apps/desktop/build.rs index 05964c47..6ffb9b23 100644 --- a/apps/desktop/build.rs +++ b/apps/desktop/build.rs @@ -11,25 +11,31 @@ fn main() { "get_users", "get_user", "remove_user", + // Cluster "create_cluster", "remove_cluster", "get_cluster", "get_clusters", "run_cluster", + // Processor "get_running_clusters", "get_processes_by_path", "kill_process", + // Settings "get_settings", "set_settings", + // Metadata "get_minecraft_versions", + // Package "random_mods", "get_mod", "download_mod", + // Other "get_program_info", ]), diff --git a/apps/desktop/src/lib.rs b/apps/desktop/src/lib.rs index 802d66d8..5aae301b 100644 --- a/apps/desktop/src/lib.rs +++ b/apps/desktop/src/lib.rs @@ -58,7 +58,7 @@ pub async fn run_app(setup: F) { let builder = collect_commands!(); #[cfg(debug_assertions)] - let builder = builder.path("../../frontend/src/bindings.ts"); + let builder = builder.path("../frontend/src/bindings.ts"); builder.build().unwrap() }); diff --git a/apps/desktop/tauri.conf.json b/apps/desktop/tauri.conf.json index e6253bd0..ecbe241f 100644 --- a/apps/desktop/tauri.conf.json +++ b/apps/desktop/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/core/tauri-config-schema/schema.json", "productName": "OneLauncher", - "identifier": "OneLauncher", + "identifier": "org.polyfrost.launcher", "app": { "withGlobalTauri": true, "macOSPrivateApi": true,