Skip to content

Commit d5e4a22

Browse files
author
Omar El Halabi
committed
Depend on Kotlin's implementation of parsing JVM target
1 parent 7cec062 commit d5e4a22

File tree

1 file changed

+1
-16
lines changed
  • server/src/main/kotlin/org/javacs/kt/compiler

1 file changed

+1
-16
lines changed

server/src/main/kotlin/org/javacs/kt/compiler/Compiler.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -382,25 +382,10 @@ private class CompilationEnvironment(
382382
}
383383

384384
fun updateConfiguration(config: CompilerConfiguration) {
385-
jvmTargetFrom(config.jvm.target)
385+
JvmTarget.fromString(config.jvm.target)
386386
?.let { environment.configuration.put(JVMConfigurationKeys.JVM_TARGET, it) }
387387
}
388388

389-
private fun jvmTargetFrom(target: String): JvmTarget? = when (target) {
390-
// See https://github.com/JetBrains/kotlin/blob/master/compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmTarget.kt
391-
"default" -> JvmTarget.DEFAULT
392-
"1.6" -> JvmTarget.JVM_1_6
393-
"1.8" -> JvmTarget.JVM_1_8
394-
"9" -> JvmTarget.JVM_9
395-
"10" -> JvmTarget.JVM_10
396-
"11" -> JvmTarget.JVM_11
397-
"12" -> JvmTarget.JVM_12
398-
"13" -> JvmTarget.JVM_13
399-
"14" -> JvmTarget.JVM_14
400-
"15" -> JvmTarget.JVM_15
401-
else -> null
402-
}
403-
404389
fun createContainer(sourcePath: Collection<KtFile>): Pair<ComponentProvider, BindingTraceContext> {
405390
val trace = CliBindingTrace()
406391
val container = TopDownAnalyzerFacadeForJVM.createContainer(

0 commit comments

Comments
 (0)