feat: release v1.0.3 with multi-release semantic version resolution
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
Build & Release Android APK / Build & Publish Release APK (push) Waiting to run
This commit is contained in:
@@ -11,8 +11,8 @@ android {
|
|||||||
applicationId = "com.expapp.trigger"
|
applicationId = "com.expapp.trigger"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 34
|
targetSdk = 34
|
||||||
versionCode = 2
|
versionCode = 3
|
||||||
versionName = "1.0.2"
|
versionName = "1.0.3"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
vectorDrawables {
|
||||||
|
|||||||
@@ -47,7 +47,8 @@ class UpdateManager(
|
|||||||
currentVersionName: String,
|
currentVersionName: String,
|
||||||
callback: (UpdateCheckResult) -> Unit
|
callback: (UpdateCheckResult) -> Unit
|
||||||
) {
|
) {
|
||||||
val url = "https://api.github.com/repos/$githubRepo/releases/latest"
|
// Query releases list so we always inspect the highest semantic version
|
||||||
|
val url = "https://api.github.com/repos/$githubRepo/releases"
|
||||||
|
|
||||||
val request = Request.Builder()
|
val request = Request.Builder()
|
||||||
.url(url)
|
.url(url)
|
||||||
@@ -78,49 +79,73 @@ class UpdateManager(
|
|||||||
|
|
||||||
val body = res.body?.string().orEmpty()
|
val body = res.body?.string().orEmpty()
|
||||||
try {
|
try {
|
||||||
val json = JsonParser.parseString(body).asJsonObject
|
val jsonElement = JsonParser.parseString(body)
|
||||||
val tagName = json.get("tag_name")?.asString.orEmpty()
|
val releasesArray = if (jsonElement.isJsonArray) {
|
||||||
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
|
jsonElement.asJsonArray
|
||||||
val changelog = json.get("body")?.asString.orEmpty()
|
} else {
|
||||||
|
// In case a single release object was returned
|
||||||
|
val arr = com.google.gson.JsonArray()
|
||||||
|
if (jsonElement.isJsonObject) arr.add(jsonElement.asJsonObject)
|
||||||
|
arr
|
||||||
|
}
|
||||||
|
|
||||||
val assets = json.getAsJsonArray("assets")
|
var highestRelease: ReleaseInfo? = null
|
||||||
var apkUrl: String? = null
|
|
||||||
var apkName = "app-release.apk"
|
|
||||||
var apkSize = 0L
|
|
||||||
|
|
||||||
if (assets != null) {
|
for (item in releasesArray) {
|
||||||
for (element in assets) {
|
if (!item.isJsonObject) continue
|
||||||
val assetObj = element.asJsonObject
|
val json = item.asJsonObject
|
||||||
val name = assetObj.get("name")?.asString.orEmpty()
|
if (json.has("draft") && json.get("draft").asBoolean) continue
|
||||||
if (name.endsWith(".apk", ignoreCase = true)) {
|
|
||||||
apkUrl = assetObj.get("browser_download_url")?.asString
|
val tagName = json.get("tag_name")?.asString.orEmpty()
|
||||||
apkName = name
|
val cleanVer = tagName.removePrefix("v").removePrefix("V").trim()
|
||||||
apkSize = assetObj.get("size")?.asLong ?: 0L
|
val title = json.get("name")?.asString?.ifBlank { tagName } ?: tagName
|
||||||
break
|
val changelog = json.get("body")?.asString.orEmpty()
|
||||||
|
|
||||||
|
val assets = json.getAsJsonArray("assets")
|
||||||
|
var apkUrl: String? = null
|
||||||
|
var apkName = "app-release.apk"
|
||||||
|
var apkSize = 0L
|
||||||
|
|
||||||
|
if (assets != null) {
|
||||||
|
for (element in assets) {
|
||||||
|
val assetObj = element.asJsonObject
|
||||||
|
val name = assetObj.get("name")?.asString.orEmpty()
|
||||||
|
if (name.endsWith(".apk", ignoreCase = true)) {
|
||||||
|
apkUrl = assetObj.get("browser_download_url")?.asString
|
||||||
|
apkName = name
|
||||||
|
apkSize = assetObj.get("size")?.asLong ?: 0L
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!apkUrl.isNullOrBlank()) {
|
||||||
|
val releaseInfo = ReleaseInfo(
|
||||||
|
tagName = tagName,
|
||||||
|
versionName = cleanVer,
|
||||||
|
title = title,
|
||||||
|
changelog = changelog,
|
||||||
|
downloadUrl = apkUrl,
|
||||||
|
apkFileName = apkName,
|
||||||
|
sizeBytes = apkSize
|
||||||
|
)
|
||||||
|
|
||||||
|
if (highestRelease == null || isNewerVersion(cleanVer, highestRelease.versionName)) {
|
||||||
|
highestRelease = releaseInfo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (apkUrl.isNullOrBlank()) {
|
if (highestRelease == null) {
|
||||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val cleanRemoteVersion = tagName.removePrefix("v").removePrefix("V").trim()
|
|
||||||
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
|
val cleanLocalVersion = currentVersionName.removePrefix("v").removePrefix("V").trim()
|
||||||
|
|
||||||
if (isNewerVersion(cleanRemoteVersion, cleanLocalVersion)) {
|
if (isNewerVersion(highestRelease.versionName, cleanLocalVersion)) {
|
||||||
val releaseInfo = ReleaseInfo(
|
|
||||||
tagName = tagName,
|
|
||||||
versionName = cleanRemoteVersion,
|
|
||||||
title = title,
|
|
||||||
changelog = changelog,
|
|
||||||
downloadUrl = apkUrl,
|
|
||||||
apkFileName = apkName,
|
|
||||||
sizeBytes = apkSize
|
|
||||||
)
|
|
||||||
runOnMain {
|
runOnMain {
|
||||||
callback(UpdateCheckResult.UpdateAvailable(releaseInfo))
|
callback(UpdateCheckResult.UpdateAvailable(highestRelease))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
runOnMain { callback(UpdateCheckResult.UpToDate) }
|
||||||
|
|||||||
Reference in New Issue
Block a user