From 5d630a24bed07dca20b6ddf55ffe4be36399ad0f Mon Sep 17 00:00:00 2001
From: "Begonia, HE" <163421589+BegoniaHe@users.noreply.github.com>
Date: Thu, 29 Jan 2026 03:20:10 +0100
Subject: fix: resolve rebase conflicts and compilation errors

- Export JavaError from java module
- Fix type mismatches in Adoptium provider methods
- Add type annotations for reqwest json() calls
- Remove non-existent cache_version field from JavaCatalog
- Fix resolve_java_for_launch call signature (remove extra window param)
- Add error conversion to String for Tauri commands
- Fix import for save_catalog_cache in adoptium.rs

Reviewed-by: Claude Sonnet 4.5
---
 src-tauri/src/main.rs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src-tauri/src/main.rs')

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 7984ea8..b74c746 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -208,7 +208,6 @@ async fn start_game(
 
     let java_installation = core::java::priority::resolve_java_for_launch(
         app_handle,
-        &window,
         instance.java_path_override.as_deref(),
         Some(&config.java_path),
         required_java_major,
-- 
cgit v1.2.3-70-g09d2