From 901bfbb3c7be889adbf1c6b777ab9689ccc27f29 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Thu, 3 Sep 2020 21:38:33 +0900
Subject: [PATCH] Pill: Create KotlinArtifact only for variants that include
 BASE

---
 .../src/JpsCompatiblePluginTasks.kt           | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
index 5e4e52b054e..b553fb0fd76 100644
--- a/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
+++ b/plugins/pill/pill-importer/src/JpsCompatiblePluginTasks.kt
@@ -102,26 +102,28 @@ class JpsCompatiblePluginTasks(private val rootProject: Project, private val pla
         removeJpsAndPillRunConfigurations()
         removeAllArtifactConfigurations()
 
-        val artifactDependencyMapper = object : ArtifactDependencyMapper {
-            override fun map(dependency: PDependency): List<PDependency> {
-                val result = mutableListOf<PDependency>()
+        if (variant.includes.contains(PillExtensionMirror.Variant.BASE)) {
+            val artifactDependencyMapper = object : ArtifactDependencyMapper {
+                override fun map(dependency: PDependency): List<PDependency> {
+                    val result = mutableListOf<PDependency>()
 
-                for (mappedDependency in jpsProject.mapDependency(dependency, dependencyMappers)) {
-                    result += mappedDependency
+                    for (mappedDependency in jpsProject.mapDependency(dependency, dependencyMappers)) {
+                        result += mappedDependency
 
-                    if (mappedDependency is PDependency.Module) {
-                        val module = jpsProject.modules.find { it.name == mappedDependency.name }
-                        if (module != null) {
-                            result += module.embeddedDependencies
+                        if (mappedDependency is PDependency.Module) {
+                            val module = jpsProject.modules.find { it.name == mappedDependency.name }
+                            if (module != null) {
+                                result += module.embeddedDependencies
+                            }
                         }
                     }
+
+                    return result
                 }
-
-                return result
             }
-        }
 
-        generateKotlinPluginArtifactFile(rootProject, artifactDependencyMapper).write()
+            generateKotlinPluginArtifactFile(rootProject, artifactDependencyMapper).write()
+        }
 
         copyRunConfigurations()
         setOptionsForDefaultJunitRunConfiguration(rootProject)