Convert idea plugin modules to intellij plugin

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

@@ -5,6 +5,10 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setPlugins("gradle", "maven")
+}
+
 dependencies {
     compile(project(":kotlin-allopen-compiler-plugin"))
     compile(project(":compiler:util"))
@@ -13,11 +17,15 @@ dependencies {
     compile(project(":idea"))
     compile(project(":idea:idea-jps-common"))
     compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
-    compile(ideaSdkDeps("openapi", "idea"))
-    compile(ideaPluginDeps("maven", plugin = "maven"))
-    compile(ideaPluginDeps("gradle-tooling-api", "gradle", plugin = "gradle"))
 }
 
+afterEvaluate {
+    dependencies {
+        compile(intellij { include("openapi.jar", "idea.jar") })
+        compile(intellijPlugin("maven") { include("maven.jar") })
+        compile(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") })
+    }
+}
 
 sourceSets {
     "main" { projectDefault() }

plugins/android-extensions/android-extensions-idea/build.gradle.kts

@@ -5,6 +5,11 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
+configureIntellijPlugin {
+    setPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang",
+               "java-decompiler", "java-i18n", "junit", "maven", "properties", "testng")
+}
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:light-classes"))
@@ -12,8 +17,6 @@ dependencies {
     compile(project(":idea"))
     compile(project(":idea:idea-gradle"))
     compile(project(":plugins:android-extensions-compiler"))
-    compile(ideaPluginDeps("android", "android-common", "sdk-tools", "sdk-common", plugin = "android"))
-    compile(ideaPluginDeps("Groovy", plugin = "Groovy"))
     compileOnly(project(":kotlin-android-extensions-runtime"))
 
     testCompile(project(":compiler:tests-common"))
@@ -33,19 +36,16 @@ dependencies {
     testRuntime(project(":noarg-ide-plugin"))
     testRuntime(project(":allopen-ide-plugin"))
     testRuntime(project(":plugins:lint"))
-    testRuntime(ideaSdkDeps("*.jar"))
-    testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
-    testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
-    testRuntime(ideaPluginDeps("jcommander", "testng", "testng-plugin", "resources_en", plugin = "testng"))
-    testRuntime(ideaPluginDeps("copyright", plugin = "copyright"))
-    testRuntime(ideaPluginDeps("properties", "resources_en", plugin = "properties"))
-    testRuntime(ideaPluginDeps("java-i18n", plugin = "java-i18n"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "Groovy"))
-    testRuntime(ideaPluginDeps("coverage", "jacocoant", plugin = "coverage"))
-    testRuntime(ideaPluginDeps("java-decompiler", plugin = "java-decompiler"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "maven"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
+}
+
+afterEvaluate {
+    dependencies {
+        compile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") })
+        compile(intellijPlugin("Groovy") { include("Groovy.jar") })
+        testRuntime(intellij())
+        testRuntime(intellijPlugins("junit", "IntelliLang", "testng", "copyright", "properties", "java-i18n",
+                                    "gradle", "Groovy", "coverage", "java-decompiler", "maven", "android"))
+    }
 }
 
 sourceSets {

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

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

plugins/uast-kotlin/build.gradle.kts

@@ -1,6 +1,12 @@
 
 apply { plugin("kotlin") }
 
+configureIntellijPlugin {
+    setPlugins("junit", "gradle", "Groovy", "android",
+               "maven", // TODO: check whether it works in AS (it was marked optional before
+               "properties")
+}
+
 dependencies {
     compile(projectDist(":kotlin-stdlib"))
     compile(project(":core:util.runtime"))
@@ -8,22 +14,13 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:light-classes"))
-    compileOnly(ideaSdkDeps("openapi", "idea"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":idea:idea-test-framework"))
-    testCompileOnly(ideaSdkDeps("idea_rt"))
     testRuntime(projectDist(":kotlin-reflect"))
-    testRuntime(ideaSdkDeps("*.jar"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "Groovy"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "maven", optional = true))
-    testRuntime(ideaPluginDeps("*.jar", plugin = "properties"))
     testRuntime(project(":idea:idea-android"))
     testRuntime(project(":idea:idea-gradle"))
     testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false }
@@ -33,6 +30,17 @@ dependencies {
     testRuntime(project(":plugins:android-extensions-ide"))
 }
 
+afterEvaluate {
+    dependencies {
+        compileOnly(intellij { include("openapi.jar", "idea.jar") })
+        testCompileOnly(intellij { include("idea_rt.jar") })
+        testRuntime(intellij())
+        compile(intellijPlugins("junit", "gradle", "Groovy", "android",
+                                "maven", // TODO: check whether it works in AS (it was marked optional before
+                                "properties"))
+    }
+}
+
 sourceSets {
     "main" { projectDefault() }
     "test" { projectDefault() }