Misc: Protect freeArgs with FreezableVar

This commit is contained in:
Alexey Sedunov
2017-10-12 19:46:18 +03:00
parent fa4e4cbb42
commit 87f3d24f9b
8 changed files with 16 additions and 12 deletions
@@ -120,7 +120,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
args: K2JSCompilerArguments,
environment: GradleCompilerEnvironment
): ExitCode {
args.freeArgs.addAll(kotlinSources.map { it.absolutePath })
args.freeArgs += kotlinSources.map { it.absolutePath }
return runCompiler(K2JS_COMPILER, args, environment)
}
@@ -129,7 +129,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
args: K2MetadataCompilerArguments,
environment: GradleCompilerEnvironment
): ExitCode {
args.freeArgs.addAll(kotlinSources.map { it.absolutePath })
args.freeArgs += kotlinSources.map { it.absolutePath }
return runCompiler(K2METADATA_COMPILER, args, environment)
}
@@ -21,5 +21,5 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments
fun KotlinCommonToolOptions.copyFreeCompilerArgsToArgs(args: CommonToolArguments) {
// cast to List<Any> is important because in Groovy a GString can be inside of a list
val freeArgs = (freeCompilerArgs as List<Any>).map(Any::toString)
args.freeArgs.addAll(freeArgs)
args.freeArgs += freeArgs
}