fix: Version name is not being used

This commit is contained in:
Ahmad Ansori Palembani 2024-07-30 09:36:25 +07:00
parent 56bff3c939
commit 736e608db2
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6

View file

@ -31,9 +31,9 @@ fun runCommand(command: String): String {
return String(byteOut.toByteArray()).trim() return String(byteOut.toByteArray()).trim()
} }
val versionName = "1.8.5" val _versionName = "1.8.5"
val betaCount by lazy { val betaCount by lazy {
val betaTags = runCommand("git tag -l --sort=refname v${versionName}-b*") val betaTags = runCommand("git tag -l --sort=refname v${_versionName}-b*")
String.format("%02d", if (betaTags.isNotEmpty()) { String.format("%02d", if (betaTags.isNotEmpty()) {
val betaTag = betaTags.split("\n").last().substringAfter("-b").toIntOrNull() val betaTag = betaTags.split("\n").last().substringAfter("-b").toIntOrNull()
@ -55,11 +55,12 @@ android {
defaultConfig { defaultConfig {
applicationId = "eu.kanade.tachiyomi" applicationId = "eu.kanade.tachiyomi"
versionCode = 139 versionCode = 139
versionName = versionName versionName = _versionName
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled = true multiDexEnabled = true
buildConfigField("String", "COMMIT_COUNT", "\"${commitCount}\"") buildConfigField("String", "COMMIT_COUNT", "\"${commitCount}\"")
buildConfigField("String", "BETA_COUNT", "\"${betaCount}\"")
buildConfigField("String", "COMMIT_SHA", "\"${commitHash}\"") buildConfigField("String", "COMMIT_SHA", "\"${commitHash}\"")
buildConfigField("String", "BUILD_TIME", "\"${buildTime}\"") buildConfigField("String", "BUILD_TIME", "\"${buildTime}\"")
buildConfigField("Boolean", "INCLUDE_UPDATER", "false") buildConfigField("Boolean", "INCLUDE_UPDATER", "false")