Convert compiler projects to the new intellij deps

compiler/container/build.gradle.kts

@@ -3,26 +3,17 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core")
-}
-
 dependencies {
     compile(project(":core:util.runtime"))
     compile(commonDep("javax.inject"))
     compileOnly(project(":kotlin-stdlib"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
     testCompile(project(":kotlin-stdlib"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))
-}
-
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        testCompile(intellijCoreJar())
-        testRuntime(intellij { include("trove4j.jar") })
-    }
+    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntime(intellijDep()) { includeJars("trove4j") }
 }
 
 sourceSets {