Use available jdk if java home is missing

closes #3420
cashapp · Feb 25, 2023 · c06629f · c06629f
1 parent 815e9cd
commit c06629f
Showing 1 changed file with 5 additions and 3 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
@@ -95,9 +95,11 @@ internal class FileIndexMap {
             if (!initialized) return@execute emptyMap()
 
             Timber.i("Fetching SQLDelight models")
-            val javaHome =
-              ExternalSystemJdkUtil.getJdk(project, ExternalSystemJdkUtil.USE_JAVA_HOME)
-                ?.homeDirectory?.path?.let { File(it) }
+            val javaHome = (
+              ExternalSystemJdkUtil.getJavaHome()
+                ?: ExternalSystemJdkUtil.getAvailableJdk(project).second.homePath
+              )?.let { File(it) }
+
             val properties =
               connection.action(FetchProjectModelsBuildAction).setJavaHome(javaHome).run()