Fix -Xmulti-platform dropped from args when freeCompilerArgs is assigned

in user build script

Issue #KT-15371 Fixed
This commit is contained in:
Sergey Igushkin
2018-02-16 15:11:40 +03:00
parent 37b34cff25
commit 3836dcab85
4 changed files with 21 additions and 4 deletions
@@ -54,10 +54,6 @@ open class KotlinPlatformImplementationPluginBase(platformName: String) : Kotlin
private val platformKotlinTasksBySourceSetName = hashMapOf<String, AbstractKotlinCompile<*>>()
override fun apply(project: Project) {
project.tasks.withType(AbstractKotlinCompile::class.java).all {
(it as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += listOf("-Xmulti-platform")
}
project.tasks.filterIsInstance<AbstractKotlinCompile<*>>().associateByTo(platformKotlinTasksBySourceSetName) { it.sourceSetName }
val implementConfig = project.configurations.create(IMPLEMENT_CONFIG_NAME)
@@ -233,6 +233,8 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments>() : AbstractKo
args.verbose = true
}
args.multiPlatform = project.plugins.any { it is KotlinPlatformPluginBase }
setupPlugins(args)
}