null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change beta version suffix logic (again)

Browse source 
Instead of going by commits, it will be (01, 02, 03, etc) based on the last beta version (if any)
This commit is contained in:
Jays2Kings 2023-03-23 15:48:23 -04:00
parent 59ec510e2d
commit 760615fbc6
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle.kts
View file

@ -40,7 +40,7 @@ android {
multiDexEnabled = true multiDexEnabled = true
buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"") buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
buildConfigField("String", "BETA_COMMIT_COUNT", "\"${getCommitCountSinceLastRelease()}\"") buildConfigField("String", "BETA_COUNT", "\"${getBetaCount()}\"")
buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"") buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")
buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"") buildConfigField("String", "BUILD_TIME", "\"${getBuildTime()}\"")
buildConfigField("Boolean", "INCLUDE_UPDATER", "false") buildConfigField("Boolean", "INCLUDE_UPDATER", "false")
@ -79,8 +79,7 @@ android {
create("beta") { create("beta") {
initWith(getByName("release")) initWith(getByName("release"))
buildConfigField("boolean", "BETA", "true") buildConfigField("boolean", "BETA", "true")
versionNameSuffix = "-b${getBetaCount()}"
versionNameSuffix = "-b${getCommitCountSinceLastRelease()}"
} }
} }

13
buildSrc/src/main/kotlin/Commands.kt
View file

@ -11,15 +11,14 @@ fun Project.getCommitCount(): String {
// return "1" // return "1"
} }
fun Project.getCommitCountSinceLastRelease(): String { fun Project.getBetaCount(): String {
val betaTags = runCommand("git tag -l --sort=refname v${AndroidVersions.versionName}-b*") val betaTags = runCommand("git tag -l --sort=refname v${AndroidVersions.versionName}-b*")
return if (betaTags.isNotEmpty()) { return String.format("%02d", if (betaTags.isNotEmpty()) {
val betaTag = betaTags.split("\n").last() val betaTag = betaTags.split("\n").last().substringAfter("-b").toIntOrNull()
runCommand("git rev-list --count $betaTag..HEAD").toIntOrNull()?.toString() ?: "1" ((betaTag ?: 0) + 1)
} else { } else {
val lastTag = runCommand("git describe --tags --abbrev=0") 1
runCommand("git rev-list --count $lastTag..HEAD").toIntOrNull()?.toString() ?: "1" })
}
// return "1" // return "1"
} }