chore: Use java latest for android SDK

unoplatform · Dec 9, 2024 · 5b6cb6f · 5b6cb6f
1 parent 043c86f
commit 5b6cb6f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/UnoCheck/Checkups/AndroidEmulatorCheckup.cs b/UnoCheck/Checkups/AndroidEmulatorCheckup.cs
@@ -44,7 +44,7 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 
 			AndroidSdk.AvdManager avdManager = null;
 
-			var javaHome = history.GetEnvironmentVariable("JAVA_HOME");
+			var javaHome = history.GetEnvironmentVariable("LATEST_JAVA_HOME") ?? history.GetEnvironmentVariable("JAVA_HOME");
 			string java = null;
 			if (!string.IsNullOrEmpty(javaHome) && Directory.Exists(javaHome))
 				java = Path.Combine(javaHome, "bin", "java" + (Util.IsWindows ? ".exe" : ""));

diff --git a/UnoCheck/Checkups/OpenJdkCheckup.cs b/UnoCheck/Checkups/OpenJdkCheckup.cs
@@ -68,7 +68,8 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 
 			var jdks = xamJdks.Concat(FindJdks())
 				.GroupBy(j => j.Directory.FullName)
-				.Select(g => g.First());
+				.Select(g => g.First())
+				.OrderBy(s => s.Version);
 
 			var ok = false;
 
@@ -96,7 +97,14 @@ public override Task<DiagnosticResult> Examine(SharedState history)
 					ReportStatus($"{jdk.Version} ({jdk.Directory.FullName})", null);
 			}
 
-			if (ok)
+            // Setup the latest LATEST_JAVA_HOME
+            if (jdks.Any())
+            {
+                var latest = jdks.Last();
+                history.SetEnvironmentVariable("LATEST_JAVA_HOME", latest.Directory.FullName);
+            }
+
+            if (ok)
 				return Task.FromResult(DiagnosticResult.Ok(this));
 
 			if (Util.IsLinux)