Build: fix finding layout-api jar in parcelize box test due to platfo…

…rm change
JetBrains · Nov 28, 2020 · e251a9b · e251a9b
1 parent cc1a0bf
commit e251a9b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...oid-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt b/...oid-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/AbstractParcelBoxTest.kt
@@ -28,20 +28,24 @@ abstract class AbstractParcelBoxTest : CodegenTestCase() {
     companion object {
         val LIBRARY_KT = File("plugins/android-extensions/android-extensions-compiler/testData/parcel/boxLib.kt")
 
+        private fun String.withoutAndroidPrefix(): String = removePrefix("studio.android.sdktools.")
+
         private val androidPluginPath: String by lazy {
             System.getProperty("ideaSdk.androidPlugin.path")?.takeIf { File(it).isDirectory }
                 ?: throw RuntimeException("Unable to get a valid path from 'ideaSdk.androidPlugin.path' property, please point it to the Idea android plugin location")
         }
 
         val layoutlibJar: File by lazy {
-            File(androidPluginPath).listFiles { _, name ->
+            File(androidPluginPath).listFiles { _, rawName ->
+                val name = rawName.withoutAndroidPrefix()
                 name.startsWith("layoutlib-") && name.endsWith(".jar")
                         && !name.startsWith("layoutlib-api-") && !name.startsWith("layoutlib-loader")
             }?.firstOrNull() ?: error("Unable to locate layoutlib jar in '$androidPluginPath'")
         }
 
         val layoutlibApiJar: File by lazy {
-            File(androidPluginPath).listFiles { _, name ->
+            File(androidPluginPath).listFiles { _, rawName ->
+                val name = rawName.withoutAndroidPrefix()
                 name.startsWith("layoutlib-api-") && name.endsWith(".jar")
             }?.firstOrNull() ?: error("Unable to locate layoutlib-api jar in '$androidPluginPath'")
         }

diff --git a/.../parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt b/.../parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt
@@ -32,14 +32,15 @@ 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 }
                 ?: throw RuntimeException("Unable to get a valid path from 'ideaSdk.androidPlugin.path' property, please point it to the Idea android plugin location")
         }
 
         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()}")