Pill: Merge two "root" and "non-root" Pill plugins

build.gradle.kts

@@ -250,7 +250,6 @@ apply {
 }
 
 apply { plugin("jps-compatible") }
-apply { plugin("jps-compatible-root") }
 
 fun Project.allprojectsRecursive(body: Project.() -> Unit) {
     this.body()

buildSrc/src/main/kotlin/pill/plugin.kt

@@ -9,13 +9,6 @@ import shadow.org.jdom2.output.XMLOutputter
 import java.io.File
 
 class JpsCompatiblePlugin : Plugin<Project> {
-    override fun apply(project: Project) {
-        // 'jpsTest' does not require the 'tests-jar' artifact
-        project.configurations.create("jpsTest")
-    }
-}
-
-class JpsCompatibleRootPlugin : Plugin<Project> {
     companion object {
         private fun mapper(module: String, vararg configurations: String): DependencyMapper {
             return DependencyMapper("org.jetbrains.kotlin", module, *configurations) { MappedDependency(PDependency.Library(module)) }
@@ -82,24 +75,23 @@ class JpsCompatibleRootPlugin : Plugin<Project> {
                 )
             )
         }
-
     }
 
     override fun apply(project: Project) {
-        if (project != project.rootProject) {
+        // 'jpsTest' does not require the 'tests-jar' artifact
-            error("JpsCompatible root plugin can be applied only to the root project")
+        project.configurations.create("jpsTest")
-        }
 
-        project.tasks.create("pill") {
+        if (project == project.rootProject) {
-            doLast { pill(project) }
+            project.tasks.create("pill") {
-        }
+                doLast { pill(project) }
+            }
 
-        project.tasks.create("unpill") {
+            project.tasks.create("unpill") {
-            doLast { unpill(project) }
+                doLast { unpill(project) }
+            }
         }
     }
 
-
     private lateinit var projectDir: File
     private lateinit var platformVersion: String
     private lateinit var platformBaseNumber: String

buildSrc/src/main/resources/META-INF/gradle-plugins/jps-compatible-root.properties

@@ -1 +0,0 @@
-implementation-class=org.jetbrains.kotlin.pill.JpsCompatibleRootPlugin