From 270a09a93462b0883351330491fa8dcc1af3be8b Mon Sep 17 00:00:00 2001
From: Titouan Thibaud <tthibaud@mozilla.com>
Date: Thu, 23 Oct 2025 11:45:40 -0400
Subject: [PATCH] Get the version name from the release tag in the release
 workflow

---
 .github/workflows/release_apk.yml | 5 ++++-
 app/build.gradle.kts              | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release_apk.yml b/.github/workflows/release_apk.yml
index 63bc7b7..999f5dc 100644
--- a/.github/workflows/release_apk.yml
+++ b/.github/workflows/release_apk.yml
@@ -31,13 +31,16 @@ jobs:
 #    - name: Run unit tests
 #      run: ./gradlew testDebugUnitTest
 
+    - name: Extract version name
+      run: echo "VERSION_NAME=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
+
     - name: Build Release APK
       env:
         KEYSTORE_FILE: ${{ github.workspace }}/keystore.jks
         KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
         KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
         KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-      run: ./gradlew assembleRelease
+      run: ./gradlew assembleRelease -PversionName=${{ env.VERSION_NAME }} -PversionCode=${{ github.run_number }}
 
     - name: Rename APK
       run: mv app/build/outputs/apk/release/app-release.apk app/build/outputs/apk/release/tryfox.apk
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cad7609..3ca89db 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "org.mozilla.tryfox"
         minSdk = 26
         targetSdk = 36
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = (findProperty("versionCode") as String?)?.toInt() ?: 1
+        versionName = (findProperty("versionName") as String?) ?: "0.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }