Convert compiler projects to the new intellij deps

2017-12-08 13:24:45 +01:00
parent a418a3ac49
commit 4eb557724c
23 changed files with 49 additions and 232 deletions
@@ -3,22 +3,13 @@ apply { plugin("kotlin") }

 jvmTarget = "1.6"

-configureIntellijPlugin {
-    setExtraDependencies("intellij-core")
-}
-
 dependencies {
    compile(project(":core:descriptors"))
    compile(project(":core:descriptors.jvm"))
    compile(project(":compiler:util"))
    compile(project(":compiler:frontend"))
-}
-
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "guava-*.jar") })
-    }
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava-21.0") }
 }

 sourceSets {