azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TEST] Fix compilation of CodegenTestsOnAndroidGenerator.kt

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-02 13:34:55 +03:00
committed by TeamCityServer
parent b416c669b0
commit dbc85a5f18
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
+2 -3
View File
@@ -269,8 +269,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
continue continue
} }
val fullFileText = val fullFileText = FileUtil.loadFile(file, true)
FileUtil.loadFile(file, true).replace("COROUTINES_PACKAGE", "kotlin.coroutines")
if (fullFileText.contains("// WITH_COROUTINES")) { if (fullFileText.contains("// WITH_COROUTINES")) {
if (fullFileText.contains("kotlin.coroutines.experimental")) continue if (fullFileText.contains("kotlin.coroutines.experimental")) continue
@@ -317,7 +316,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
} }
private fun createTestFiles(file: File, expectedText: String): List<KotlinBaseTest.TestFile> = private fun createTestFiles(file: File, expectedText: String): List<KotlinBaseTest.TestFile> =
CodegenTestCase.createTestFilesFromFile(file, expectedText, "kotlin.coroutines", false, TargetBackend.JVM) CodegenTestCase.createTestFilesFromFile(file, expectedText, false, TargetBackend.JVM)
companion object { companion object {
const val GRADLE_VERSION = "5.6.4" // update GRADLE_SHA_256 on change const val GRADLE_VERSION = "5.6.4" // update GRADLE_SHA_256 on change