fix(readme-generator): attempt sorting versions with FlexVer (ReVan…

…ced#2059) Co-authored-by: oSumAtrIX <[email protected]>
tamnguyenchi93 · May 7, 2023 · a54c464 · a54c464
1 parent 82e7d3b
commit a54c464
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,13 +17,22 @@ repositories {
             password = githubPassword
         }
     }
+    // Required for FlexVer-Java
+    maven {
+        url = uri("https://repo.sleeping.town")
+        content {
+            includeGroup("com.unascribed")
+        }
+    }
 }
 
 dependencies {
     implementation("app.revanced:revanced-patcher:7.1.1")
     implementation("app.revanced:multidexlib2:2.5.3-a3836654")
     // Required for meta
     implementation("com.google.code.gson:gson:2.10.1")
+    // Required for FlexVer-Java
+    implementation("com.unascribed:flexver-java:1.0.2")
 }
 
 kotlin {

diff --git a/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt b/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt
@@ -5,6 +5,7 @@ import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.extensions.PatchExtensions.description
 import app.revanced.patcher.extensions.PatchExtensions.patchName
 import app.revanced.patcher.patch.Patch
+import com.unascribed.flexver.FlexVerComparator
 import java.io.File
 
 internal class ReadmeGenerator : PatchesFileGenerator {
@@ -37,9 +38,8 @@ internal class ReadmeGenerator : PatchesFileGenerator {
                     }
                 }.let { commonMap ->
                     commonMap.maxByOrNull { it.value }?.value?.let {
-                        // This is not foolproof, because for example v1.0.0-dev.0 will be returned instead of v1.0.0-release.
-                        // Unfortunately this can not be solved easily because versioning can be complex.
-                        commonMap.entries.filter { mostCommon -> mostCommon.value == it }.maxBy { it.key }.key
+                        commonMap.entries.filter { mostCommon -> mostCommon.value == it }
+                            .maxOfWith(FlexVerComparator::compare, Map.Entry<String, Int>::key)
                     } ?: "all"
                 }