From 753d31159358914fbbd2228b6274d993f4466900 Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 24 Aug 2022 11:56:42 +0200 Subject: [PATCH] Tweak versioning and bump (1.3.14-rc0) --- .../main/java/eu/darken/capod/common/BuildConfigWrap.kt | 1 + .../eu/darken/capod/main/ui/settings/SettingsFragment.kt | 2 +- build.gradle | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt b/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt index 3a110d98..b0b77747 100644 --- a/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt +++ b/app/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt @@ -42,4 +42,5 @@ object BuildConfigWrap { val VERSION_DESCRIPTION_LONG: String = "v$VERSION_NAME ($VERSION_CODE) [$GIT_SHA] ${FLAVOR}_$BUILD_TYPE" val VERSION_DESCRIPTION_SHORT: String = "v$VERSION_NAME [$GIT_SHA] $FLAVOR" + val VERSION_DESCRIPTION_TINY: String = "v$VERSION_NAME" } diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt index a447ad62..790beb80 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/SettingsFragment.kt @@ -68,7 +68,7 @@ class SettingsFragment : Fragment2(R.layout.settings_fragment), } ui.toolbar.apply { - subtitle = BuildConfigWrap.VERSION_DESCRIPTION_SHORT + subtitle = BuildConfigWrap.VERSION_DESCRIPTION_TINY setNavigationOnClickListener { requireActivity().onBackPressed() } } diff --git a/build.gradle b/build.gradle index db3662fb..132693a8 100644 --- a/build.gradle +++ b/build.gradle @@ -8,13 +8,12 @@ buildscript { 'version' : [ 'major': 1, 'minor': 3, - 'patch': 13, - 'build': 7, + 'patch': 14, + 'build': 0, ], ] - ext.buildConfig.version['name'] = "${buildConfig.version.major}.${buildConfig.version.minor}.${buildConfig.version.patch}" - ext.buildConfig.version['fullName'] = "${buildConfig.version.name}.${buildConfig.version.build}" + ext.buildConfig.version['name'] = "${buildConfig.version.major}.${buildConfig.version.minor}.${buildConfig.version.patch}-rc${buildConfig.version.build}" ext.buildConfig.version['code'] = buildConfig.version.major * 1000000 + buildConfig.version.minor * 10000 + buildConfig.version.patch * 100 + buildConfig.version.build ext.versions = [