diff --git a/libraries/scripting/jvm-host-embeddable/build.gradle.kts b/libraries/scripting/jvm-host-embeddable/build.gradle.kts index 581886e8f7d..7562ef6bfe0 100644 --- a/libraries/scripting/jvm-host-embeddable/build.gradle.kts +++ b/libraries/scripting/jvm-host-embeddable/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { runtime(project(":kotlin-scripting-jvm")) runtime(project(":kotlin-script-util")) runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) + runtime(project(":kotlin-scripting-compiler-embeddable")) } sourceSets { diff --git a/libraries/scripting/jvm-host/build.gradle.kts b/libraries/scripting/jvm-host/build.gradle.kts index 5da880b799b..a5073370fde 100644 --- a/libraries/scripting/jvm-host/build.gradle.kts +++ b/libraries/scripting/jvm-host/build.gradle.kts @@ -10,6 +10,7 @@ dependencies { compile(project(":kotlin-scripting-common")) compile(project(":kotlin-scripting-jvm")) compile(project(":kotlin-script-util")) + compile(project(":kotlin-scripting-compiler")) compileOnly(project(":compiler:cli")) compileOnly(project(":kotlin-reflect-api")) compileOnly(intellijCoreDep()) diff --git a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt index 6e9542806d0..b401c578e76 100644 --- a/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt +++ b/libraries/scripting/jvm-host/src/kotlin/script/experimental/jvmhost/impl/KJvmCompilerImpl.kt @@ -27,10 +27,12 @@ import org.jetbrains.kotlin.cli.jvm.compiler.* import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots +import org.jetbrains.kotlin.cli.jvm.plugins.PluginCliParser import org.jetbrains.kotlin.codegen.ClassBuilderFactories import org.jetbrains.kotlin.codegen.CompilationErrorHandler import org.jetbrains.kotlin.codegen.KotlinCodegenFacade import org.jetbrains.kotlin.codegen.state.GenerationState +import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinLanguage @@ -39,6 +41,7 @@ import org.jetbrains.kotlin.name.NameUtils import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtScript import org.jetbrains.kotlin.script.KotlinScriptDefinition +import org.jetbrains.kotlin.scripting.compiler.plugin.ScriptingCompilerConfigurationComponentRegistrar import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.util.* import kotlin.reflect.KClass @@ -227,6 +230,8 @@ class KJvmCompilerImpl(val hostConfiguration: ScriptingHostConfiguration) : KJvm ) } + add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar()) + configureExplicitContentRoots(baseArguments) if (!baseArguments.noStdlib) {