Merge pull request #10 from LikeTheSalad/release/2.4.0

Release/2.4.0

Author: LikeTheSalad

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 2.4.0
+---
+
+* Allowing other values folder names.
+
 Version 2.3.1
 ---
 

android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/valuedir/ValueDirFinder.kt

@@ -6,7 +6,7 @@ import java.io.File
 
 object ValueDirFinder {
 
-    private val VALUES_FOLDER_NAME_REGEX = Regex("values(-([a-z]{2}(-r[A-Z]{2})*))*")
+    private val VALUES_FOLDER_NAME_REGEX = Regex("values(-(.+))*")
 
     fun findValueDirs(resDir: ResDir): List<ValueDir> {
         val valueFolders = resDir.dir.listFiles { _, name ->

android-resource-collector/src/test/dummy/res/values-v30/someFile.txt

@@ -19,7 +19,9 @@ class ValueDirFinderTest {
         Truth.assertThat(result).containsExactly(
             ValueDir(resDir, getResourceFile("res/values"), Language.Default),
             ValueDir(resDir, getResourceFile("res/values-es"), Language.Custom("es")),
-            ValueDir(resDir, getResourceFile("res/values-es-rUS"), Language.Custom("es-rUS"))
+            ValueDir(resDir, getResourceFile("res/values-es-rUS"), Language.Custom("es-rUS")),
+            ValueDir(resDir, getResourceFile("res/values-v5"), Language.Custom("v5")),
+            ValueDir(resDir, getResourceFile("res/values-v30"), Language.Custom("v30"))
         )
     }
 }

android-resource-collector/src/test/dummy/res/values-v5/someFile.txt

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.version=1.9.22
 group=com.likethesalad.tools.resources
-version=2.3.1
+version=2.4.0