From 7466181499f4d9420d77433d4893d8fef9bd606c Mon Sep 17 00:00:00 2001
From: abe-winter <abe-winter@users.noreply.github.com>
Date: Wed, 10 Apr 2024 16:27:32 -0400
Subject: [PATCH] RSDK-7263 include RDK + APK sha in app's version string (#8)

* env vars for app version, bump versionCode, base version 0.1.0

* sigh missing paren

* get dash right in version suffix
---
 .github/workflows/build.yml | 5 +++--
 app/build.gradle.kts        | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dfaf73..88d54f0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,13 +50,14 @@ jobs:
       run: |
         mkdir ../dist
         source $SDKMAN_DIR/bin/sdkman-init.sh
+        export APK_VERSION_SUFFIX=-$(date +%y%m%d)-$(cd ../rdk && git rev-parse --short HEAD)-$(git rev-parse --short HEAD)
         # todo(review): is it safe to use gradle in path instead of gradlew? or way to make gradlew use system gradle?
         RDK_PATH=$(realpath ../rdk/droid-rdk.arm64.aar) gradle --no-daemon assembleDebug
         mv app/build/outputs/apk/debug/app-debug.apk \
-          ../dist/rdk-$(date +%y%m%d)-$(cd ../rdk && git rev-parse --short HEAD)-$(git rev-parse --short HEAD).aarch64.apk
+          ../dist/rdk$APK_VERSION_SUFFIX.aarch64.apk
         RDK_PATH=$(realpath ../rdk/droid-rdk.amd64.aar) gradle --no-daemon assembleDebug
         mv app/build/outputs/apk/debug/app-debug.apk \
-          ../dist/rdk-$(date +%y%m%d)-$(cd ../rdk && git rev-parse --short HEAD)-$(git rev-parse --short HEAD).x86_64.apk
+          ../dist/rdk$APK_VERSION_SUFFIX.x86_64.apk
     - uses: actions/upload-artifact@v4
       with:
         name: Arm APK
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 48f8e82..2f724a7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.viam.rdk.fgservice"
         minSdk = 28
         targetSdk = 28
-        versionCode = 1
-        versionName = "0.0.1"
+        versionCode = 2
+        versionName = "${System.getenv("APK_VERSION") ?: "0.1.0"}${System.getenv("APK_VERSION_SUFFIX") ?: ""}"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {