Renaming for easier conversion, some more manual conversion

compiler/tests-common/build.gradle.kts

@@ -1,15 +1,6 @@
 
 apply { plugin("kotlin") }
 
-//configureIntellijPlugin {
-//    setExtraDependencies("intellij-core")
-//}
-
-repositories {
-    intellijSdkRepo(project)
-    androidDxJarRepo(project)
-}
-
 dependencies {
     testCompile(project(":core:descriptors"))
     testCompile(project(":core:descriptors.jvm"))

compiler/util/build.gradle.kts

@@ -3,21 +3,12 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core", "jps-standalone")
-}
-
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
     compile(project(":core:deserialization"))
-}
-
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        compileOnly(intellijCoreJarDependencies())
-        compileOnly(intellijExtra("jps-standalone") { include("jps-model.jar") })
-    }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
+    compileOnly(intellijDep("jps-standalone")) { includeJars("jps-model") }
 }
 
 sourceSets {