From b5be2abb1aac4c50c7b5e13160b01e1eee4e5ba8 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 20 Apr 2020 23:27:23 +0200 Subject: [PATCH] Set jvm target for REPL from the context module #KT-38454 fixed --- .../org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt index 5e7eabb0b60..fc104509211 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt @@ -11,7 +11,10 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.KotlinIdeaReplBundle +import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.idea.util.JavaParametersBuilder +import org.jetbrains.kotlin.platform.jvm.JdkPlatform +import org.jetbrains.kotlin.platform.subplatformsOfType import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.util.concurrent.ConcurrentHashMap @@ -67,6 +70,10 @@ class KotlinConsoleKeeper(val project: Project) { classPath.joinToString(File.pathSeparator) ) } + TargetPlatformDetector.getPlatform(module).subplatformsOfType().firstOrNull()?.targetVersion?.let { + javaParameters.programParametersList.add("-jvm-target") + javaParameters.programParametersList.add(it.description) + } } return javaParameters.toCommandLine()