Convert more projects

compiler/android-tests/build.gradle.kts

@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("jps-standalone", "jps-build-test")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
@@ -10,18 +14,22 @@ dependencies {
     compile(project(":compiler:backend"))
     compile(projectTests(":compiler:tests-common"))
     compile(commonDep("junit:junit"))
-    compile(ideaSdkDeps("openapi"))
 
     testCompile(project(":compiler:incremental-compilation-impl"))
     testCompile(project(":core:descriptors"))
     testCompile(project(":core:descriptors.jvm"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(projectTests(":jps-plugin"))
-    testCompile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
-    testCompile(ideaSdkDeps("groovy-all"))
-    testCompile(ideaSdkDeps("idea", "idea_rt"))
-    testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
-    testCompile(ideaSdkDeps("jps-builders"))
+    testCompile(commonDep("junit:junit"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellij { include("openapi.jar") })
+        testCompile(intellij { include("idea.jar", "idea-rt.jar", "groovy-all.jar", "jps-builders.jar") })
+        testCompile(intellijExtra("jps-standalone") { include("jps-model.jar") })
+        testCompile(intellijExtra("jps-build-test"))
+    }
 }
 
 sourceSets {

compiler/build.gradle.kts

@@ -6,6 +6,10 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 val compilerModules: Array<String> by rootProject.extra
 val otherCompilerModules = compilerModules.filter { it != path }
 
@@ -54,18 +58,23 @@ dependencies {
     otherCompilerModules.forEach {
         testCompileOnly(project(it))
     }
-    testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
 
     testRuntime(projectDist(":kotlin-reflect"))
     testRuntime(projectDist(":kotlin-daemon-client"))
     testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
-    testRuntime(ideaSdkCoreDeps("*.jar"))
-    testRuntime(ideaSdkDeps("*.jar"))
     testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar"))
 
     testJvm6ServerRuntime(projectTests(":compiler:tests-common-jvm6"))
 }
 
+afterEvaluate {
+    dependencies {
+        testCompile(intellij { include("openapi.jar", "idea.jar", "util.jar", "asm-all.jar", "commons-httpclient-3.1-patched.jar") })
+        testRuntime(intellijCoreJar())
+        testRuntime(intellij())
+    }
+}
+
 sourceSets {
     "main" {}
     "test" {

compiler/conditional-preprocessor/build.gradle.kts

@@ -3,17 +3,27 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     val compile by configurations
     compile(project(":compiler:cli"))
     compile(project(":compiler:daemon-common"))
     compile(project(":compiler:incremental-compilation-impl"))
     compile(project(":kotlin-build-common"))
-    compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
     compile(commonDep("org.fusesource.jansi", "jansi"))
     compile(commonDep("org.jline", "jline"))
 }
 
+afterEvaluate {
+    dependencies {
+        compile(intellijCoreJar())
+        compile(intellijCoreJarDependencies())
+    }
+}
+
 sourceSets {
     "main" { projectDefault() }
     "test" {}

compiler/container/build.gradle.kts

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

compiler/tests-java8/build.gradle.kts

@@ -2,6 +2,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin {
+    setExtraDependencies("intellij-core")
+}
+
 dependencies {
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":generators:test-generator"))

j2k/build.gradle.kts

@@ -1,9 +1,25 @@
 
 apply { plugin("kotlin") }
 
-//plugins {
-//    kotlin("jvm")
-//}
+val usedIntellijPlugins = arrayOf(
+        "properties",
+        "gradle",
+        "Groovy",
+        "coverage",
+        "maven",
+        "android",
+        "junit",
+        "testng",
+        "IntelliLang",
+        "testng",
+        "copyright",
+        "properties",
+        "java-i18n",
+        "java-decompiler")
+
+configureIntellijPlugin {
+    setPlugins(*usedIntellijPlugins)
+}
 
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
@@ -11,7 +27,6 @@ dependencies {
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))
     compile(project(":compiler:util"))
-//    compile(ideaSdkCoreDeps("intellij-core", "util"))
     testCompile(project(":idea"))
     testCompile(project(":idea:idea-test-framework"))
     testCompile(project(":compiler:light-classes"))
@@ -24,21 +39,13 @@ dependencies {
     testRuntime(project(":allopen-ide-plugin"))
     testRuntime(project(":noarg-ide-plugin"))
     testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
-    testRuntime(ideaSdkDeps("*.jar"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "properties"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "Groovy"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "coverage"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "maven"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "testng"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "IntelliLang"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "testng"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "copyright"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "properties"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "java-i18n"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "java-decompiler"))
+}
+
+afterEvaluate {
+    dependencies {
+        testRuntime(intellij())
+        testRuntime(intellijPlugins(*usedIntellijPlugins))
+    }
 }
 
 sourceSets {