From 36936d252c73f5c021ac44a2b135ee3cefceebfb Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 28 Aug 2018 02:00:48 +0300 Subject: [PATCH] Support multiple expectedBy dependencies when building -Xcommon-sources list `addCommonSourceSetToPlatformSourceSet` may be called multiple times during a platform project configuration. --- .../jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt index f41d1d75f78..91a8f603a80 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinMultiplatformPlugin.kt @@ -156,7 +156,7 @@ open class KotlinPlatformImplementationPluginBase(platformName: String) : Kotlin val commonSources = getKotlinSourceDirectorySetSafe(commonSourceSet)!! platformTask.source(commonSources) - platformTask.commonSourceSet = commonSources + platformTask.commonSourceSet += commonSources } }