From a3a3a7b46d2802d12afa09d0726f334beed8caed Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Thu, 18 Dec 2025 20:01:35 +0800 Subject: [PATCH] Simplify release process --- .github/workflows/releases.yml | 3 +++ app/build.gradle.kts | 12 +++++++++--- app/src/main/kotlin/com/hippo/ehviewer/Settings.kt | 3 +-- .../main/kotlin/com/hippo/ehviewer/util/AppConfig.kt | 2 -- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 47885050c..4772dc51d 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -50,15 +50,18 @@ jobs: - name: Generate Baseline Profile run: ./gradlew generateBaselineProfile -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" + -Prelease # https://github.com/mikepenz/AboutLibraries/issues/1225 - name: Generate aboutlibraries.json run: ./gradlew :app:prepareLibraryDefinitionsDefaultRelease --rerun :app:prepareLibraryDefinitionsMarshmallowRelease --rerun + -Prelease - name: Build run: ./gradlew assembleRelease + -Prelease - name: Rename Apks run: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2239e78b5..5e7bed243 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -52,12 +52,18 @@ android { }.standardOutput.asText.get().trim().removePrefix("https://github.com/").removePrefix("git@github.com:") .removeSuffix(".git") + val snapshot = !hasProperty("release") + defaultConfig { applicationId = "moe.tarsin.ehviewer" versionCode = 180063 - versionName = "1.15.0" - versionNameSuffix = "-SNAPSHOT" - buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName${versionNameSuffix.orEmpty()}\"") + versionName = if (snapshot) { + "1.15.0-SNAPSHOT" + } else { + "1.14.6" + } + buildConfigField("boolean", "SNAPSHOT", "$snapshot") + buildConfigField("String", "RAW_VERSION_NAME", "\"$versionName\"") buildConfigField("String", "COMMIT_SHA", "\"$commitSha\"") buildConfigField("long", "COMMIT_TIME", commitTime) buildConfigField("String", "REPO_NAME", "\"$repoName\"") diff --git a/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt b/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt index 3a90f4acb..cb69a41c6 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/Settings.kt @@ -16,7 +16,6 @@ import com.ehviewer.core.preferences.edit import com.hippo.ehviewer.client.data.FavListUrlBuilder import com.hippo.ehviewer.download.DownloadsFilterMode import com.hippo.ehviewer.download.SortMode -import com.hippo.ehviewer.util.AppConfig import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType import java.util.Locale @@ -120,7 +119,7 @@ object Settings : DataStorePreferences(null) { // About val backupBeforeUpdate = boolPref("backup_before_update", false) - val useCIUpdateChannel = boolPref("ci_update_channel", AppConfig.isSnapshot) + val useCIUpdateChannel = boolPref("ci_update_channel", BuildConfig.SNAPSHOT) val updateIntervalDays = intPref("update_interval_days", 7) // Misc diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt index c428e6542..6419b6597 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/AppConfig.kt @@ -49,8 +49,6 @@ object AppConfig { val commitTime = ParserUtils.formatDate(BuildConfig.COMMIT_TIME * 1000) - val isSnapshot = "SNAPSHOT" in BuildConfig.VERSION_NAME - private val externalAppDir: File? get() { if (Environment.MEDIA_MOUNTED == Environment.getExternalStorageState()) {