From 14fde339effd100d96cd67479a6964f318e975ea Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <Yan.Zhulanow@jetbrains.com>
Date: Wed, 26 Apr 2017 21:20:52 +0300
Subject: [PATCH] Minor: Fix Android JPS test

---
 .../android-extensions-jps/src/KotlinAndroidJpsPlugin.kt        | 2 +-
 plugins/plugins-tests/plugins-tests.iml                         | 1 +
 .../kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt      | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt b/plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
index 4d30dae6104..07ba17cf045 100644
--- a/plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
+++ b/plugins/android-extensions/android-extensions-jps/src/KotlinAndroidJpsPlugin.kt
@@ -91,7 +91,7 @@ class KotlinAndroidJpsPlugin : KotlinJpsCompilerArgumentsProvider {
     companion object {
         private val ANDROID_JPS_UTIL_CLASS_FQNAME = "org.jetbrains.jps.android.AndroidJpsUtil"
 
-        private val JAR_FILE_NAME = "kotlin-android-extensions-compiler-plugin.jar"
+        private val JAR_FILE_NAME = "android-extensions-compiler.jar"
         private val ANDROID_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.android"
 
         private val VARIANT_OPTION_NAME = "variant"
diff --git a/plugins/plugins-tests/plugins-tests.iml b/plugins/plugins-tests/plugins-tests.iml
index febe57d3853..4922c477991 100755
--- a/plugins/plugins-tests/plugins-tests.iml
+++ b/plugins/plugins-tests/plugins-tests.iml
@@ -30,6 +30,7 @@
         <jarDirectory url="file://$MODULE_DIR$/../../../ideaSDK/plugins/gradle/lib" recursive="false" type="SOURCES" />
       </library>
     </orderEntry>
+    <orderEntry type="library" scope="TEST" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="java-model-wrappers" scope="TEST" />
     <orderEntry type="module" module-name="light-classes" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="junit-plugin" level="project" />
diff --git a/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
index d57b46c2ec1..b66332367b9 100644
--- a/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
+++ b/plugins/plugins-tests/tests/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
@@ -28,7 +28,7 @@ import java.io.File
 
 abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() {
 
-    private val SDK_NAME = "Android API 23 Platform"
+    private val SDK_NAME = "Android API 21 Platform"
 
     fun doTest(path: String) {
         addJdkAndAndroidSdk()