diff --git a/build.gradle.kts b/build.gradle.kts index e5d9527df..81e0f8461 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,13 +11,6 @@ repositories { mavenLocal() google() maven { url = uri("https://jitpack.io") } - // Required for FlexVer-Java - maven { - url = uri("https://repo.sleeping.town") - content { - includeGroup("com.unascribed") - } - } } dependencies { @@ -25,7 +18,6 @@ dependencies { implementation(libs.smali) // Used in JsonGenerator. implementation(libs.gson) - implementation(libs.flexver) } kotlin { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b768c3564..5f7bd2727 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,10 +2,8 @@ revanced-patcher = "19.0.0" smali = "3.0.3" gson = "2.10.1" -flexver = "1.1.1" [libraries] revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" } smali = { module = "com.android.tools.smali:smali", version.ref = "smali" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } -flexver = { module = "com.unascribed:flexver-java", version.ref = "flexver" } diff --git a/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt b/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt index 1db846370..8e5af8acd 100644 --- a/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt +++ b/src/main/kotlin/app/revanced/meta/ReadmeGenerator.kt @@ -2,7 +2,6 @@ package app.revanced.meta import app.revanced.patcher.PatchSet import app.revanced.patcher.patch.Patch -import com.unascribed.flexver.FlexVerComparator import java.io.File internal class ReadmeGenerator : PatchesFileGenerator { @@ -27,36 +26,18 @@ internal class ReadmeGenerator : PatchesFileGenerator { .entries .sortedByDescending { it.value.size } .forEach { (`package`, patches) -> - val supportVersions = buildMap { - patches.forEach { patch -> - patch.compatiblePackages?.single { compatiblePackage -> compatiblePackage.name == `package` }?.versions?.let { - it.forEach { version -> merge(version, 1, Integer::sum) } - } - } - } - - val minVersion = supportVersions.let { commonMap -> - commonMap.maxByOrNull { it.value }?.value?.let { - commonMap.entries.filter { supported -> supported.value == it } - .minOfWith(FlexVerComparator::compare, Map.Entry::key) - } ?: "all" - } - val maxVersion = supportVersions.let { commonMap -> - commonMap.maxByOrNull { it.value }?.value?.let { - commonMap.entries.filter { supported -> supported.value == it } - .maxOfWith(FlexVerComparator::compare, Map.Entry::key) - } ?: "all" - } - output.apply { appendLine("### [\uD83D\uDCE6 `${`package`}`](https://play.google.com/store/apps/details?id=${`package`})") appendLine("
\n") appendLine(TABLE_HEADER) patches.sortedBy { it.name }.forEach { patch -> + val supportedVersionArray = + patch.compatiblePackages?.single { it.name == `package` }?.versions val supportedVersion = - if ( - patch.compatiblePackages?.single { it.name == `package` }?.versions?.isNotEmpty() == true - ) { + if (supportedVersionArray?.isNotEmpty() == true) { + val minVersion = supportedVersionArray.elementAt(0) + val maxVersion = + supportedVersionArray.elementAt(supportedVersionArray.size - 1) if (minVersion == maxVersion) maxVersion else