From 0a1aff4f8025ed9c6131b03e3f989e7b4a7ed333 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 23 Sep 2019 11:59:28 +0200 Subject: [PATCH] Do not add updated script classpath to the compilation configuration it is added via the updateClasspath call with proper duplicates control --- .../kotlin/scripting/compiler/plugin/impl/compilationContext.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt index cd14505d167..bb2df562f5f 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt @@ -225,8 +225,6 @@ internal fun collectRefinedSourcesAndUpdateEnvironment( sourceFiles ) - // TODO: consider removing, it is probably redundant: the actual index update is performed with environment.updateClasspath - context.environment.configuration.addJvmClasspathRoots(classpath) context.environment.updateClasspath(classpath.map(::JvmClasspathRoot)) sourceFiles.addAll(newSources)