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

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

@@ -1,34 +1,31 @@
 
 apply { plugin("kotlin") }
 
-configureIntellijPlugin {
-    setPlugins("android")
-}
+val androidSdk by configurations.creating
 
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":jps-plugin"))
     compile(project(":plugins:android-extensions-compiler"))
-    compile(ideaPluginDeps("android-jps-plugin", plugin = "android", subdir = "lib/jps"))
+    compileOnly(intellijDep()) { includeJars("openapi", "jps-builders") }
+    compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
+    compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") }
 
     testCompile(projectTests(":jps-plugin"))
     testCompile(project(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
     testCompile(projectTests(":kotlin-build-common"))
-}
+    testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") }
+    testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") }
 
-afterEvaluate {
-    dependencies {
-        compileOnly(intellij { include("openapi.jar", "jps-builders.jar") })
-        compile(intellijPlugin("android") { include("**/android-jps-plugin.jar") })
-        testCompileOnly(intellijExtra("jps-build-test") { include("jps-build-test.jar") } )
-        testRuntime(intellijPlugin("android"))
-        testRuntime(intellijCoreJar())
-        testRuntime(intellij())
-        testRuntime(intellijExtra("jps-build-test"))
-        testRuntime(intellijExtra("jps-standalone"))
-    }
+    testRuntime(intellijPluginDep("android"))
+    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntime(intellijDep())
+    testRuntime(intellijDep("jps-build-test"))
+    testRuntime(intellijDep("jps-standalone"))
+
+    androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
 }
 
 sourceSets {
@@ -38,6 +35,9 @@ sourceSets {
 
 projectTest {
     workingDir = rootDir
+    doFirst {
+        systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
+    }
 }
 
 testsJar {}