From 8fa16306959838d7758c9676991105e2a9c81740 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Thu, 28 Feb 2019 18:16:30 +0300 Subject: [PATCH] Add the single-platform target's 'components' to 'project.components' --- .../kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index bda5ba1537b..af227521cd4 100755 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -358,6 +358,8 @@ internal abstract class AbstractKotlinPlugin( configureProjectGlobalSettings(project, kotlinPluginVersion) registry.register(KotlinModelBuilder(kotlinPluginVersion, null)) + + project.components.addAll(target.components) } private fun rewriteMppDependenciesInPom(target: AbstractKotlinTarget) { @@ -643,6 +645,8 @@ internal open class KotlinAndroidPlugin( applyToTarget(kotlinPluginVersion, androidTarget) registry.register(KotlinModelBuilder(kotlinPluginVersion, androidTarget)) + + project.whenEvaluated { project.components.addAll(androidTarget.components) } } companion object {