Merge branch 'develop' into chore/move-tipcards-out-of-beta

Author: bmc08gt

.github/workflows/build-upload-android-alpha.yml

@@ -10,7 +10,7 @@ env:
 on:
   push:
     tags:
-      - 'v1.*'
+      - 'v*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
 
     defaultConfig {
         applicationId = Android.namespace
-        versionCode = Android.versionCode
-        versionName = "1.1.$versionCode"
+        versionCode = Packaging.versionCode
+        versionName = Packaging.versionName
 
         minSdk = Android.minSdkVersion
         targetSdk = Android.targetSdkVersion

app/src/main/java/com/getcode/view/main/account/AccountHome.kt

@@ -134,7 +134,7 @@ fun AccountHome(
                         .padding(top = CodeTheme.dimens.grid.x7)
                         .fillMaxWidth()
                         .align(Alignment.Center),
-                    text = "v${BuildConfig.VERSION_NAME}",
+                    text = "Version ${BuildConfig.VERSION_NAME} • Build ${BuildConfig.VERSION_CODE}",
                     color = CodeTheme.colors.textSecondary,
                     style = CodeTheme.typography.textSmall.copy(
                         textAlign = TextAlign.Center

buildSrc/src/main/java/Dependencies.kt

@@ -2,14 +2,23 @@
 
 object Android {
     const val namespace = "com.getcode"
-    const val versionCode = 410
     const val compileSdkVersion = 34
     const val minSdkVersion = 24
     const val targetSdkVersion = 34
     const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     const val buildToolsVersion = "34.0.0"
 }
 
+object Packaging {
+    private const val majorVersion = 2
+    private const val minorVersion = 1
+    private const val patchVersion = 7
+    const val buildNumber = 411
+
+    val versionCode = buildNumber
+    val versionName = "$majorVersion.$minorVersion.$patchVersion"
+}
+
 object Versions {
     const val java = "17"
     const val kotlin = "1.9.23"