Convert the rest of the project to intellij repo prepared in buildSrc

plugins/noarg/noarg-cli/build.gradle.kts

@@ -3,16 +3,14 @@ description = "Kotlin NoArg Compiler Plugin"
 
 apply { plugin("kotlin") }
 
-configureIntellijPlugin {
-    setExtraDependencies("intellij-core")
-}
-
 dependencies {
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":compiler:backend"))
     compileOnly(project(":compiler:util"))
     compileOnly(project(":compiler:plugin-api"))
+    compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
+    compileOnly(intellijDep()) { includeJars("asm-all") }
     runtime(projectRuntimeJar(":kotlin-compiler"))
     runtime(projectDist(":kotlin-stdlib"))
 
@@ -25,13 +23,6 @@ dependencies {
     testRuntime(ideaSdkDeps("*.jar"))
 }
 
-afterEvaluate {
-    dependencies {
-        compileOnly(intellijCoreJar())
-        compileOnly(intellij { include("asm-all.jar") })
-    }
-}
-
 sourceSets {
     "main" { projectDefault() }
     "test" { projectDefault() }

plugins/noarg/noarg-ide/build.gradle.kts

@@ -5,10 +5,6 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
-configureIntellijPlugin {
-    setPlugins("gradle", "maven")
-}
-
 dependencies {
     compile(project(":kotlin-noarg-compiler-plugin"))
     compile(project(":compiler:util"))
@@ -19,15 +15,10 @@ dependencies {
     compile(project(":idea"))
     compile(project(":idea:idea-jps-common"))
     compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
-}
-
-afterEvaluate {
-    dependencies {
-        compileOnly(intellij { include("openapi.jar", "idea.jar") })
-        compileOnly(intellijPlugin("maven") { include("maven.jar") })
-        compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
+    compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar") }
+        compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar") }
+        compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5.jar", "gradle.jar") }
     }
-}
 
 sourceSets {
     "main" { projectDefault() }