Configure Kotlin for Android: add kotlin plugin to project build.gradle file.

Do not add mavenCentral dependency if jcenter is present

generators/generators.iml

@@ -33,5 +33,6 @@
     <orderEntry type="module" module-name="container" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="build-common" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin-android-plugin" scope="TEST" />
   </component>
 </module>

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.android.AbstractAndroidCompletionTest
 import org.jetbrains.kotlin.android.AbstractAndroidFindUsagesTest
 import org.jetbrains.kotlin.android.AbstractAndroidGotoTest
 import org.jetbrains.kotlin.android.AbstractAndroidRenameTest
+import org.jetbrains.kotlin.android.configure.AbstractConfigureProjectTest
 import org.jetbrains.kotlin.annotation.AbstractAnnotationProcessorBoxTest
 import org.jetbrains.kotlin.asJava.AbstractCompilerLightClassTest
 import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
@@ -568,7 +569,6 @@ fun main(args: Array<String>) {
         }
 
         testClass<AbstractConfigureProjectByChangingFileTest>() {
-            model("configuration/android-gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestAndroidGradle")
             model("configuration/gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestGradle")
             model("configuration/maven", extension = null, recursive = false, testMethod = "doTestWithMaven")
             model("configuration/js-maven", extension = null, recursive = false, testMethod = "doTestWithJSMaven")
@@ -974,6 +974,12 @@ fun main(args: Array<String>) {
         }
     }
 
+    testGroup("idea/kotlin-android-plugin/tests", "idea/testData") {
+        testClass<AbstractConfigureProjectTest>() {
+            model("configuration/android-gradle", pattern = """(\w+)_before\.gradle$""", testMethod = "doTestAndroidGradle")
+        }
+    }
+
     testGroup("plugins/android-jps-plugin/tests", "plugins/android-jps-plugin/testData") {
         testClass<AbstractAndroidJpsTestCase>() {
             model("android", recursive = false, extension = null)