From a0f546471ff71df41dd8db0a149165834fbd8dcc Mon Sep 17 00:00:00 2001
From: Darcy Wong <darcy_wong@sil.org>
Date: Thu, 10 Nov 2022 15:27:29 +0700
Subject: [PATCH] chore(android/app): Revert version.gradle

Keep build-utils code to just KMAPro so it doesn't affect FV Android
---
 android/KMAPro/kMAPro/build.gradle | 21 +++++++++++++++++++++
 android/version.gradle             | 20 +-------------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 4c6d263175..70f3e45739 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -73,6 +73,8 @@ android {
     applicationVariants.all { variant ->
         // Append tier and environment to app name
         // Beware: Gradle sync will nullify these values
+        executeBuildUtils()
+
         String appSuffix = ''
         String environment = VERSION_ENVIRONMENT
         String tag = VERSION_TAG
@@ -155,6 +157,25 @@ dependencies {
     }
 }
 
+// Use build-utils.sh to get common build version info.
+// Beware: Android Studio IDE Gradle sync will invalidate these values
+def executeBuildUtils() {
+    try {
+        exec {
+            commandLine 'bash', '-c', 'pwd; THIS_SCRIPT=build.gradle; . ../../../resources/build/build-utils.sh'
+        }
+    }
+    catch(Exception e) {
+        GradleException("Exception: $e")
+    }
+    // Debugging
+    println "version.gradle TAG: " + System.getenv("VERSION_TAG") + ", ENVIRONMENT: " + System.getenv("VERSION_ENVIRONMENT");
+    ext {
+        VERSION_TAG=System.getenv("VERSION_TAG")
+        VERSION_ENVIRONMENT=System.getenv("VERSION_ENVIRONMENT")
+    }
+}
+
 /*def void dumpProperties(it){
     //println "Examining $it.name:"
     //println "Meta:"
diff --git a/android/version.gradle b/android/version.gradle
index 237d37fa18..71bb04378e 100644
--- a/android/version.gradle
+++ b/android/version.gradle
@@ -57,26 +57,8 @@ def getVersionEnvironment = { ->
     }
 }
 
-// Use build-utils.sh to get common build version info.
-// Beware: Android Studio IDE Gradle sync will invalidate these values
-def executeBuildUtils() {
-    try {
-        exec {
-            commandLine 'bash', '-c', 'pwd; THIS_SCRIPT=build.gradle; . ../../../resources/build/build-utils.sh'
-        }
-    }
-    catch(Exception e) {
-        GradleException("Exception: $e")
-    }
-    // Debugging
-    println "version.gradle TAG: " + System.getenv("VERSION_TAG") + ", ENVIRONMENT: " + System.getenv("VERSION_ENVIRONMENT");
-}
-
-executeBuildUtils()
-
 ext {
     VERSION_CODE=getVersionCode()
     VERSION_NAME=getVersionName()
-    VERSION_ENVIRONMENT=System.getenv("VERSION_ENVIRONMENT")
-    VERSION_TAG=System.getenv("VERSION_TAG")
+    VERSION_ENVIRONMENT=getVersionEnvironment()
 }
\ No newline at end of file