Usages of Array.plus: return type changed.

This commit is contained in:
Ilya Gorbunov
2015-07-14 15:26:27 +03:00
parent 25e5172591
commit b5b6e2e598
4 changed files with 6 additions and 5 deletions
@@ -228,7 +228,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
}
public fun addLibraryFiles(vararg fs: String) {
kotlinOptions.libraryFiles = (kotlinOptions.libraryFiles + (fs as Array<String>)).copyToArray()
kotlinOptions.libraryFiles += fs
}
public fun addLibraryFiles(vararg fs: File) {
@@ -261,7 +261,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
.filter { LibraryUtils.isKotlinJavascriptLibrary(it) }
.map { it.getAbsolutePath() }
args.libraryFiles = (kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies).copyToArray()
args.libraryFiles = kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies
args.target = kotlinOptions.target
args.sourceMap = kotlinOptions.sourceMap
@@ -96,7 +96,7 @@ abstract class BaseGradleIT {
private fun Project.createCommand(params: Array<out String>): List<String> {
val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath()
val tailParameters = params +
val tailParameters = params.asList() +
listOf(pathToKotlinPlugin, "--no-daemon", "--${minLogLevel.name().toLowerCase()}", "-Pkotlin.gradle.test=true")
return if (isWindows())