Update kotlin-stdlib backup resolution

fwcd · fwcd · commit bd50b266bae0 · 2021-01-17T23:40:30.000+01:00
diff --git a/shared/src/main/kotlin/org/javacs/kt/classpath/BackupClassPathResolver.kt b/shared/src/main/kotlin/org/javacs/kt/classpath/BackupClassPathResolver.kt
@@ -16,7 +16,9 @@ object BackupClassPathResolver : ClassPathResolver {
 }
 
 fun findKotlinStdlib(): Path? =
-    findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib")
+    findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
+    ?: findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
+    ?: findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib")
     ?: findKotlinCliCompilerLibrary("kotlin-stdlib")
 
 private fun findLocalArtifact(group: String, artifact: String) =

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ object BackupClassPathResolver : ClassPathResolver {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`fun findKotlinStdlib(): Path? =`
`19`		`- findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib")`
	`19`	`+ findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")`
	`20`	`+ ?: findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")`
	`21`	`+ ?: findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib")`
`20`	`22`	`?: findKotlinCliCompilerLibrary("kotlin-stdlib")`
`21`	`23`
`22`	`24`	`private fun findLocalArtifact(group: String, artifact: String) =`