From febab82c7edd8f86c65e703b5b9bf18006c6c860 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Thu, 30 Nov 2017 15:16:37 +0100
Subject: [PATCH] Switch jps android test to platform 26

---
 .../testData/codegen/android/FakeActivity.kt                | 2 +-
 .../testData/codegen/android/FakeDialog.kt                  | 2 +-
 .../testData/codegen/android/FakeView.kt                    | 2 +-
 .../kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt  | 6 +++---
 .../testData/android/simple/simple.iml                      | 2 +-
 .../testData/android/simple/simple.ipr                      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeActivity.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeActivity.kt
index 217cb406805..97389136037 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeActivity.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeActivity.kt
@@ -4,5 +4,5 @@ import android.view.View
 import android.content.Context
 
 open class Activity: Context {
-    open fun findViewById(id: Int): View? = null
+    open fun <T : View> findViewById(id: Int): T? = null
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeDialog.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeDialog.kt
index 9cf31a60ad5..f4f098ce52d 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeDialog.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeDialog.kt
@@ -3,5 +3,5 @@ package android.app
 import android.view.View
 
 open class Dialog {
-    open fun findViewById(id: Int): View? = null
+    open fun <T : View> findViewById(id: Int): T? = null
 }
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeView.kt b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeView.kt
index c59bf08820f..1c0fb2bd108 100644
--- a/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeView.kt
+++ b/plugins/android-extensions/android-extensions-compiler/testData/codegen/android/FakeView.kt
@@ -3,5 +3,5 @@ package android.view
 import android.content.Context
 
 open class View(ctx: Context) {
-    open fun findViewById(id: Int): View? = null
+    open fun <T : View> findViewById(id: Int): T? = null
 }
diff --git a/plugins/android-extensions/android-extensions-jps/test/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt b/plugins/android-extensions/android-extensions-jps/test/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
index 63c9f99595a..5a9b2abcdc2 100644
--- a/plugins/android-extensions/android-extensions-jps/test/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
+++ b/plugins/android-extensions/android-extensions-jps/test/org/jetbrains/kotlin/jps/build/android/AbstractAndroidJpsTestCase.kt
@@ -29,7 +29,7 @@ import java.io.File
 
 abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() {
 
-    private val SDK_NAME = "Android API 21 Platform"
+    private val SDK_NAME = "Android API 26 Platform"
 
     fun doTest(path: String) {
         addJdkAndAndroidSdk()
@@ -42,10 +42,10 @@ abstract class AbstractAndroidJpsTestCase : BaseKotlinJpsBuildTestCase() {
     private fun addJdkAndAndroidSdk(): JpsSdk<JpsSimpleElement<JpsAndroidSdkProperties>> {
         val jdkName = "java_sdk"
         addJdk(jdkName)
-        val properties = JpsAndroidSdkProperties("android-23", jdkName)
+        val properties = JpsAndroidSdkProperties("android-26", jdkName)
         val sdkPath = KotlinTestUtils.findAndroidSdk().canonicalPath
         val library = myModel.global.addSdk(SDK_NAME, sdkPath, "", JpsAndroidSdkType.INSTANCE, JpsSimpleElementImpl(properties))
-        library.addRoot(File(sdkPath + "/platforms/android-23/android.jar"), JpsOrderRootType.COMPILED)
+        library.addRoot(File(sdkPath + "/platforms/android-26/android.jar"), JpsOrderRootType.COMPILED)
         return library.properties
     }
 }
diff --git a/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml b/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml
index 1358b15fd0b..2be1d3ce5bc 100644
--- a/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml
+++ b/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.iml
@@ -36,7 +36,7 @@
             <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
             <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
         </content>
-        <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
+        <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
         <orderEntry type="sourceFolder" forTests="false" />
         <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     </component>
diff --git a/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr b/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr
index 512ca70514c..a3d32e38202 100644
--- a/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr
+++ b/plugins/android-extensions/android-extensions-jps/testData/android/simple/simple.ipr
@@ -11,7 +11,7 @@
         <module fileurl="file://$PROJECT_DIR$/simple.iml" filepath="$PROJECT_DIR$/simple.iml" />
     </modules>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 21 Platform" project-jdk-type="Android SDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 26 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>