Use IDEA Project JDK first (#4689)

getAvailableJdk checks for project Jdk first, then for the most recent Jdk version and finally the internal Jdk that could be JAVA_HOME Fallback to JAVA_HOME may not be needed
sqldelight · Apr 2, 2024 · 5f235bf · 5f235bf
1 parent 28370d9
commit 5f235bf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/gradle/FileIndexMap.kt b/sqldelight-idea-plugin/src/main/kotlin/app/cash/sqldelight/intellij/gradle/FileIndexMap.kt
@@ -104,8 +104,8 @@ internal class FileIndexMap {
 
             Timber.i("Fetching SQLDelight models")
             val javaHome = (
-              ExternalSystemJdkUtil.getJavaHome()
-                ?: ExternalSystemJdkUtil.getAvailableJdk(project).second.homePath
+              ExternalSystemJdkUtil.getAvailableJdk(project).second.homePath
+                ?: ExternalSystemJdkUtil.getJavaHome()
               )?.let { File(it) }
 
             val properties =