diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6acd6dfff..007b88c92 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,7 +68,8 @@ android { minSdk = 28 targetSdk = 34 versionCode = 180043 - versionName = "1.8.9.6-gms" + versionName = "1.8.9.6" + versionNameSuffix = "-gms" resourceConfigurations.addAll( listOf( "zh", @@ -89,6 +90,7 @@ android { buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"") buildConfigField("String", "BUILD_TIME", "\"$buildTime\"") buildConfigField("String", "REPO_NAME", "\"$repoName\"") + buildConfigField("String", "VERSION_NAME_SUFFIX", "\"$versionNameSuffix\"") } externalNativeBuild { diff --git a/app/src/main/java/com/hippo/ehviewer/updater/AppUpdater.kt b/app/src/main/java/com/hippo/ehviewer/updater/AppUpdater.kt index 12f20265f..206f44403 100644 --- a/app/src/main/java/com/hippo/ehviewer/updater/AppUpdater.kt +++ b/app/src/main/java/com/hippo/ehviewer/updater/AppUpdater.kt @@ -21,7 +21,6 @@ import java.util.zip.ZipInputStream private const val API_URL = "https://api.github.com/repos/${BuildConfig.REPO_NAME}" private const val RELEASE_URL = "$API_URL/releases" private const val LATEST_RELEASE_URL = "$RELEASE_URL/latest" -private const val GMS_SUFFIX = "-gms" object AppUpdater { suspend fun checkForUpdate(forceCheck: Boolean = false): Release? { @@ -49,7 +48,7 @@ object AppUpdater { } else { val curVersion = BuildConfig.VERSION_NAME val release = ghRequest(LATEST_RELEASE_URL).executeAndParseAs() - val latestVersion = release.version + GMS_SUFFIX + val latestVersion = release.version + BuildConfig.VERSION_NAME_SUFFIX val description = release.info if (latestVersion != curVersion) { val downloadUrl = ghRequest("$RELEASE_URL/tags/$latestVersion")