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

Build: fix finding layout-api jar in parcelize box test due to platform change

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-11-25 14:29:41 +03:00
parent cc1a0bf6d7
commit e251a9be14
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt
+2 -1
View File
@@ -32,6 +32,7 @@ abstract class AbstractParcelizeIrBoxTest : AbstractParcelizeBoxTest() {
abstract class AbstractParcelizeBoxTest : CodegenTestCase() {
companion object {
val LIBRARY_KT = File("plugins/parcelize/parcelize-compiler/testData/boxLib.kt")
private const val ANDROID_TOOLS_PREFIX = "studio.android.sdktools."
private val androidPluginPath: String by lazy {
System.getProperty("ideaSdk.androidPlugin.path")?.takeIf { File(it).isDirectory }
@@ -39,7 +40,7 @@ abstract class AbstractParcelizeBoxTest : CodegenTestCase() {
}
private fun getLayoutLibFile(pattern: String): File {
val nameRegex = "^$pattern-[0-9\\.]+\\.jar$".toRegex()
val nameRegex = "^($ANDROID_TOOLS_PREFIX)?$pattern-[0-9\\.]+\\.jar$".toRegex()
return File(androidPluginPath).listFiles().orEmpty().singleOrNull { it.name.matches(nameRegex) }
?: error("Can't find file for pattern $nameRegex in $androidPluginPath. " +
"Available files: \n${File(androidPluginPath).list().orEmpty().asList()}")