mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-27 20:37:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge changes from upstream and fix conflicts.

Browse Source
This commit is contained in:
KaiserBh
2024-01-17 03:23:34 +11:00
parent f51f94d7a6 653940613d
commit 47a6bd7b8f
177 changed files with 484 additions and 1732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
domain/src/main/java/tachiyomi/domain/release/interactor/GetApplicationRelease.kt
View File

@@ -54,11 +54,11 @@ class GetApplicationRelease(
// Removes prefixes like "r" or "v"
val newVersion = versionTag.replace("[^\\d.]".toRegex(), "")
return if (isPreview) {
// Preview builds: based on releases in "tachiyomiorg/tachiyomi-preview" repo
// Preview builds: based on releases in "mihonapp/mihon-preview" repo
// tagged as something like "r1234"
newVersion.toInt() > commitCount
} else {
// Release builds: based on releases in "tachiyomiorg/tachiyomi" repo
// Release builds: based on releases in "mihonapp/mihon" repo
// tagged as something like "v0.1.2"
val oldVersion = versionName.replace("[^\\d.]".toRegex(), "")

2
domain/src/main/java/tachiyomi/domain/release/model/Release.kt
View File

@@ -25,7 +25,7 @@ data class Release(
else -> ""
}
return assets.find { it.contains("tachiyomi$apkVariant-") } ?: assets[0]
return assets.find { it.contains("mihon$apkVariant-") } ?: assets[0]
}
/**