From 92e448f211d0a2fe21632bde6865109b59705456 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Tue, 9 Sep 2025 20:13:41 -0500
Subject: [PATCH] chore(build): prioritize injected version properties (#3043)

---
 app/build.gradle.kts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2cd4d0443..4af116954 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -59,9 +59,13 @@ android {
         applicationId = Configs.APPLICATION_ID
         minSdk = Configs.MIN_SDK
         targetSdk = Configs.TARGET_SDK
-        // Prioritize ENV, then fallback to git commit count for versionCode
-        versionCode = (System.getenv("VERSION_CODE") ?: gitVersionProvider.get()).toInt()
-        versionName = System.getenv("VERSION_NAME") ?: Configs.VERSION_NAME_BASE
+        // Prioritize injected props, then ENV, then fallback to git commit count
+        versionCode = (project.findProperty("android.injected.version.code")?.toString()?.toInt()
+            ?: System.getenv("VERSION_CODE")?.toInt()
+            ?: gitVersionProvider.get().toInt())
+        versionName = (project.findProperty("android.injected.version.name")?.toString()
+            ?: System.getenv("VERSION_NAME")
+            ?: Configs.VERSION_NAME_BASE)
         testInstrumentationRunner = "com.geeksville.mesh.TestRunner"
         buildConfigField("String", "MIN_FW_VERSION", "\"${Configs.MIN_FW_VERSION}\"")
         buildConfigField("String", "ABS_MIN_FW_VERSION", "\"${Configs.ABS_MIN_FW_VERSION}\"")