From 61cd97b340d0198d657485766d4dcb05d1112934 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Fri, 4 Sep 2020 05:15:51 +0900
Subject: [PATCH] Pill: Remove unused EmbeddedComponents class

---
 plugins/pill/pill-importer/build.gradle.kts    |  2 +-
 plugins/pill/pill-importer/src/PillImporter.kt | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/plugins/pill/pill-importer/build.gradle.kts b/plugins/pill/pill-importer/build.gradle.kts
index fca9424bcd3..95a38bbe0f2 100644
--- a/plugins/pill/pill-importer/build.gradle.kts
+++ b/plugins/pill/pill-importer/build.gradle.kts
@@ -29,7 +29,7 @@ fun runPillTask(taskName: String) {
 
     val platformDir = IntellijRootUtils.getIntellijRootDir(project)
     val resourcesDir = File(project.projectDir, "resources")
-    runMethod.invoke(null, project.rootProject, taskName, platformDir, resourcesDir, EmbeddedComponents.CONFIGURATION_NAME)
+    runMethod.invoke(null, project.rootProject, taskName, platformDir, resourcesDir)
 }
 
 val jar: Jar by tasks
diff --git a/plugins/pill/pill-importer/src/PillImporter.kt b/plugins/pill/pill-importer/src/PillImporter.kt
index ed779d14d95..33d6aab9693 100644
--- a/plugins/pill/pill-importer/src/PillImporter.kt
+++ b/plugins/pill/pill-importer/src/PillImporter.kt
@@ -8,21 +8,15 @@ package org.jetbrains.kotlin.pill
 import org.gradle.api.Project
 import java.io.File
 
-object EmbeddedComponents {
-    lateinit var CONFIGURATION_NAME: String
-}
-
 @Suppress("unused")
 object PillImporter {
     private val TASKS = mapOf(
-            "pill" to JpsCompatiblePluginTasks::pill,
-            "unpill" to JpsCompatiblePluginTasks::unpill
+        "pill" to JpsCompatiblePluginTasks::pill,
+        "unpill" to JpsCompatiblePluginTasks::unpill
     )
 
     @JvmStatic
-    fun run(rootProject: Project, taskName: String, platformDir: File, resourcesDir: File, embeddedConfigurationName: String) {
-        EmbeddedComponents.CONFIGURATION_NAME = embeddedConfigurationName
-
+    fun run(rootProject: Project, taskName: String, platformDir: File, resourcesDir: File) {
         val tasks = JpsCompatiblePluginTasks(rootProject, platformDir, resourcesDir)
         val task = TASKS[taskName] ?: error("Unknown task $taskName, available tasks: " + TASKS.keys.joinToString())
         task(tasks)