azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripting: move additional classpath to the end of script classpath (KT-34626)

Browse Source 
Do not add duplicated entries
Original script dependencies should go first
This commit is contained in:
Natalia Selezneva
2019-11-25 09:43:47 +03:00
parent 72e99b5863
commit 07b6dadbf0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
+2 -2
View File
@@ -270,10 +270,10 @@ fun refineScriptCompilationConfiguration(
} }
fun ScriptDependencies.adjustByDefinition(definition: ScriptDefinition): ScriptDependencies { fun ScriptDependencies.adjustByDefinition(definition: ScriptDefinition): ScriptDependencies {
val additionalClasspath = additionalClasspath(definition) val additionalClasspath = additionalClasspath(definition).filterNot { classpath.contains(it) }
if (additionalClasspath.isEmpty()) return this if (additionalClasspath.isEmpty()) return this
return copy(classpath = additionalClasspath + classpath) return copy(classpath = classpath + additionalClasspath)
} }
fun ScriptCompilationConfiguration.adjustByDefinition(definition: ScriptDefinition): ScriptCompilationConfiguration { fun ScriptCompilationConfiguration.adjustByDefinition(definition: ScriptDefinition): ScriptCompilationConfiguration {