Convert all remaining plugin modules to intellij plugin

plugins/kapt3/kapt3-compiler/build.gradle.kts

@@ -3,6 +3,8 @@ description = "Annotation Processor for Kotlin"
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin()
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
@@ -13,14 +15,19 @@ dependencies {
 
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(ideaSdkDeps("idea", "idea_rt", "openapi"))
-    
+
     compileOnly(project(":kotlin-annotation-processing-runtime"))
 
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-annotation-processing-runtime"))
 }
 
+afterEvaluate {
+    dependencies {
+        testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") })
+    }
+}
+
 sourceSets {
     "main" { projectDefault() }
     "test" { projectDefault() }

plugins/kapt3/kapt3-idea/build.gradle.kts

@@ -3,15 +3,24 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setPlugins("android", "gradle")
+}
+
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
     compile(project(":compiler:frontend"))
     compile(project(":idea")) { isTransitive = false }
     compile(project(":idea:kotlin-gradle-tooling"))
     compile(project(":kotlin-annotation-processing"))
-    compile(ideaSdkDeps("openapi", "external-system-rt"))
-    compile(ideaPluginDeps("gradle-core", "gradle-tooling-api", "gradle", plugin = "gradle"))
-    compile(ideaPluginDeps("android", "android-common", "sdklib", "sdk-common", "sdk-tools", plugin = "android"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellij { include("openapi.jar", "external-system-rt.jar") })
+        compile(intellijPlugin("gradle") { include("gradle-core-*.jar", "gradle-tooling-api-*.jar", "gradle.jar") })
+        compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar") })
+    }
 }
 
 sourceSets {