Ensure tasks using android sdk or android jar have proper dependencies

A test task, that uses android dependency but does not depend on
a corresponding configuration, would fail when it was run after
'clean' task.
I've extracted 'useAndroidSdk', 'useAndroidJar' extensions
making it harder for a developer to forget to set up task dependencies.

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

@@ -4,7 +4,6 @@ description = "Kotlin Android Extensions Compiler"
 apply { plugin("kotlin") }
 
 val robolectricClasspath by configurations.creating
-val androidJar by configurations.creating
 
 dependencies {
     testCompile(intellijCoreDep()) { includeJars("intellij-core") }
@@ -30,7 +29,6 @@ dependencies {
     testRuntime(intellijPluginDep("junit")) { includeJars("idea-junit", "resources_en") }
 
     robolectricClasspath(commonDep("org.robolectric", "robolectric"))
-    androidJar(project(":custom-dependencies:android-sdk", configuration = "androidJar"))
 }
 
 sourceSets {
@@ -54,10 +52,10 @@ projectTest {
     environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath)
     dependsOn(":dist")
     workingDir = rootDir
+    useAndroidJar()
     doFirst {
         val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath
         systemProperty("ideaSdk.androidPlugin.path", androidPluginPath)
         systemProperty("robolectric.classpath", robolectricClasspath.asPath)
-        systemProperty("android.jar", androidJar.singleFile.canonicalPath)
     }
 }

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

@@ -5,9 +5,6 @@ apply { plugin("kotlin") }
 
 jvmTarget = "1.6"
 
-val androidSdk by configurations.creating
-val androidJar by configurations.creating
-
 dependencies {
     testRuntime(intellijDep())
 
@@ -53,9 +50,6 @@ dependencies {
     testRuntime(intellijPluginDep("java-decompiler"))
     testRuntime(intellijPluginDep("maven"))
     testRuntime(intellijPluginDep("android"))
-
-    androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
-    androidJar(project(":custom-dependencies:android-sdk", configuration = "androidJar"))
 }
 
 sourceSets {
@@ -67,11 +61,10 @@ testsJar {}
 
 projectTest {
     dependsOn(":kotlin-android-extensions-runtime:dist")
-    dependsOn(androidSdk)
     workingDir = rootDir
+    useAndroidSdk()
+    useAndroidJar()
     doFirst {
-        systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
-        systemProperty("android.jar", androidJar.singleFile.canonicalPath)
         systemProperty("idea.home.path", intellijRootDir().canonicalPath)
     }
 }

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

@@ -1,8 +1,6 @@
 
 apply { plugin("kotlin") }
 
-val androidSdk by configurations.creating
-
 dependencies {
     testRuntime(intellijDep())
 
@@ -25,8 +23,6 @@ dependencies {
     testRuntime(intellijPluginDep("android"))
     testRuntime(intellijDep("jps-build-test"))
     testRuntime(intellijDep("jps-standalone"))
-
-    androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk"))
 }
 
 sourceSets {
@@ -36,8 +32,8 @@ sourceSets {
 
 projectTest {
     workingDir = rootDir
+    useAndroidSdk()
     doFirst {
-        systemProperty("android.sdk", androidSdk.singleFile.canonicalPath)
         systemProperty("idea.home.path", intellijRootDir().canonicalPath)
     }
 }