Convert compiler projects to the new intellij deps

compiler/cli/build.gradle.kts

@@ -3,10 +3,6 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.8"
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core")
-}
-
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli-common"))
@@ -24,6 +20,8 @@ dependencies {
     compile(commonDep("org.fusesource.jansi", "jansi"))
     compile(commonDep("org.jline", "jline"))
     compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
@@ -32,13 +30,6 @@ dependencies {
     testCompile(commonDep("junit:junit"))
 }
 
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        compileOnly(intellijCoreJarDependencies())
-    }
-}
-
 sourceSets {
     "main" {
         projectDefault()

compiler/cli/cli-common/build.gradle.kts

@@ -3,23 +3,14 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core")
-}
-
 dependencies {
     compile(project(":core:util.runtime"))
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:frontend.script"))
     compileOnly(project(":kotlin-reflect-api"))
-}
-
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        compileOnly(intellijCoreJarDependencies())
-    }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
 }
 
 sourceSets {