From 07b6dadbf05451ffbd82314c2d28a3ea6cd4497b Mon Sep 17 00:00:00 2001
From: Natalia Selezneva <natalia.selezneva@jetbrains.com>
Date: Mon, 25 Nov 2019 09:43:47 +0300
Subject: [PATCH] Scripting: move additional classpath to the end of script
 classpath (KT-34626)

Do not add duplicated entries
Original script dependencies should go first
---
 .../scripting/resolve/refineCompilationConfiguration.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
index 9f2cd601919..62cc354ce79 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
@@ -270,10 +270,10 @@ fun refineScriptCompilationConfiguration(
 }
 
 fun ScriptDependencies.adjustByDefinition(definition: ScriptDefinition): ScriptDependencies {
-    val additionalClasspath = additionalClasspath(definition)
+    val additionalClasspath = additionalClasspath(definition).filterNot { classpath.contains(it) }
     if (additionalClasspath.isEmpty()) return this
 
-    return copy(classpath = additionalClasspath + classpath)
+    return copy(classpath = classpath + additionalClasspath)
 }
 
 fun ScriptCompilationConfiguration.adjustByDefinition(definition: ScriptDefinition): ScriptCompilationConfiguration {