Safely split all lists in build/intermediates/paparazzi/debug/resourc…

…es.txt (#998)
cashapp · Jul 15, 2023 · 1907730 · 1907730
1 parent 22ad0a7
commit 1907730
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/paparazzi/src/main/java/app/cash/paparazzi/Environment.kt b/paparazzi/src/main/java/app/cash/paparazzi/Environment.kt
@@ -67,13 +67,16 @@ fun detectEnvironment(): Environment {
     assetsDir = appTestDir.resolve(configLines[4]).toString(),
     packageName = configLines[0],
     compileSdkVersion = configLines[2].toInt(),
-    resourcePackageNames = configLines[5].split(","),
-    localResourceDirs = configLines[6].split(",").map { projectDir.resolve(it).toString() },
-    moduleResourceDirs = configLines[7].split(",").filter { it.isNotEmpty() }.map { projectDir.resolve(it).toString() },
-    libraryResourceDirs = configLines[8].split(",").map { artifactsCacheDir.resolve(it).toString() }
+    resourcePackageNames = configLines[5].split(),
+    localResourceDirs = configLines[6].split().map { projectDir.resolve(it).toString() },
+    moduleResourceDirs = configLines[7].split().map { projectDir.resolve(it).toString() },
+    libraryResourceDirs = configLines[8].split().map { artifactsCacheDir.resolve(it).toString() }
   )
 }
 
+private fun String.split(): List<String> =
+  this.split(",").filter { it.isNotEmpty() }
+
 private fun androidSdkPath(): String {
   val osName = System.getProperty("os.name").lowercase(Locale.US)
   val sdkPathDir = if (osName.startsWith("windows")) {