Commit 92305c9d authored by sebastian.sellmair's avatar sebastian.sellmair Committed by intellij-monorepo-bot
Browse files

[Kotlin][Import] Require and setup JDK_11 for running tests with Android

KTIJ-21692

(cherry picked from commit f0e6aec4b3e3b11f6ba34ecb5ab83a8acb5ca619)

GitOrigin-RevId: 7b4b75445c868a75c5652dc1f6a228675981fb45
parent af1b2894
Branches unavailable Tags unavailable
No related merge requests found
Showing with 4 additions and 1 deletion
+4 -1
......@@ -545,6 +545,7 @@ class GradleFacetImportTest8 : KotlinGradleImportingTestCase() {
@Ignore // android.sdk needed
fun testAndroidGradleJsDetection() {
configureByFiles()
@Suppress("DEPRECATION_ERROR")
createLocalPropertiesSubFileForAndroid()
importProject()
......@@ -567,6 +568,7 @@ class GradleFacetImportTest8 : KotlinGradleImportingTestCase() {
@Ignore // android.sdk needed
fun testKotlinAndroidPluginDetection() {
configureByFiles()
@Suppress("DEPRECATION_ERROR")
createLocalPropertiesSubFileForAndroid()
importProject()
......@@ -858,4 +860,4 @@ class GradleFacetImportTest8 : KotlinGradleImportingTestCase() {
ImportSpecBuilder(super.createImportSpec()).createDirectoriesForEmptyContentRoots().build()
override fun testDataDirName(): String = "gradleFacetImportTest"
}
\ No newline at end of file
}
......@@ -119,6 +119,7 @@ abstract class KotlinGradleImportingTestCase : GradleImportingTestCase() {
}.toList()
}
@Deprecated("Use .setupAndroid() instead", level = DeprecationLevel.ERROR)
protected fun createLocalPropertiesSubFileForAndroid() {
createProjectSubFile(
"local.properties",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment