Convert idea plugin modules to intellij plugin

idea/idea-android/build.gradle.kts

@@ -1,6 +1,11 @@
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin {
+    setPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang",
+               "java-decompiler", "java-i18n", "junit", "maven", "properties", "testng")
+}
+
 dependencies {
     compileOnly(project(":kotlin-reflect-api"))
     compile(project(":compiler:util"))
@@ -13,9 +18,6 @@ dependencies {
     compile(project(":idea:ide-common"))
     compile(project(":idea:idea-gradle"))
 
-    compile(ideaSdkDeps("openapi", "idea"))
-    compile(ideaPluginDeps("gradle-tooling-api", plugin = "gradle"))
-    compile(ideaPluginDeps("android", "android-common", "sdklib", "sdk-common", "sdk-tools", "layoutlib-api", plugin = "android"))
     compile(preloadedDeps("dx", subdir = "android-5.0/lib"))
 
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
@@ -25,8 +27,6 @@ dependencies {
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":idea:idea-gradle"))
-    testCompile(ideaPluginDeps("properties", plugin = "properties"))
-    testCompile(ideaSdkDeps("gson"))
     testCompile(commonDep("junit:junit"))
 
     testRuntime(projectDist(":kotlin-reflect"))
@@ -35,19 +35,20 @@ dependencies {
     testRuntime(project(":sam-with-receiver-ide-plugin"))
     testRuntime(project(":noarg-ide-plugin"))
     testRuntime(project(":allopen-ide-plugin"))
-    testRuntime(ideaSdkDeps("*.jar"))
-    testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
-    testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
-    testRuntime(ideaPluginDeps("jcommander", "testng", "testng-plugin", "resources_en", plugin = "testng"))
-    testRuntime(ideaPluginDeps("copyright", plugin = "copyright"))
-    testRuntime(ideaPluginDeps("properties", "resources_en", plugin = "properties"))
-    testRuntime(ideaPluginDeps("java-i18n", plugin = "java-i18n"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "Groovy"))
-    testRuntime(ideaPluginDeps("coverage", "jacocoant", plugin = "coverage"))
-    testRuntime(ideaPluginDeps("java-decompiler", plugin = "java-decompiler"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "maven"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellij { include("openapi.jar", "idea.jar") })
+        compile(intellijPlugin("android") {
+            include("android.jar", "android-common.jar", "sdk-common.jar", "sdklib.jar", "sdk-tools.jar", "layoutlib-api.jar")
+        })
+        testCompile(intellij { include("gson-*.jar") })
+        testCompile(intellijPlugin("properties"))
+        testRuntime(intellij())
+        testRuntime(intellijPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang",
+                                    "java-decompiler", "java-i18n", "junit", "maven", "testng"))
+    }
 }
 
 sourceSets {

idea/idea-android/idea-android-output-parser/build.gradle.kts

@@ -1,11 +1,21 @@
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+    setPlugins("gradle", "android")
+}
+
 dependencies {
     compile(project(":compiler:util"))
-    compile(ideaSdkCoreDeps("intellij-core"))
-    compile(ideaPluginDeps("gradle-tooling-api", plugin = "gradle"))
-    compile(ideaPluginDeps("android", "android-common", "sdk-common", plugin = "android"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+        compile(intellijPlugin("gradle") { include("gradle-tooling-api.jar") })
+        compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar") })
+    }
 }
 
 sourceSets {