Convert more projects

compiler/android-tests/build.gradle.kts

@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("jps-standalone", "jps-build-test")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
@@ -10,18 +14,22 @@ dependencies {
     compile(project(":compiler:backend"))
     compile(projectTests(":compiler:tests-common"))
     compile(commonDep("junit:junit"))
-    compile(ideaSdkDeps("openapi"))
 
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(project(":core:descriptors"))
     testCompile(project(":core:descriptors.jvm"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
-    testCompile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
-    testCompile(ideaSdkDeps("groovy-all"))
-    testCompile(ideaSdkDeps("idea", "idea_rt"))
-    testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
-    testCompile(ideaSdkDeps("jps-builders"))
+    testCompile(commonDep("junit:junit"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellij { include("openapi.jar") })
+        testCompile(intellij { include("idea.jar", "idea-rt.jar", "groovy-all.jar", "jps-builders.jar") })
+        testCompile(intellijExtra("jps-standalone") { include("jps-model.jar") })
+        testCompile(intellijExtra("jps-build-test"))
+    }
 }
 
 sourceSets {