Make Android fetch versionName and versionCode from mullvad-version

2 files changed, 29 insertions, 2 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 44ea1f7f32..265e0666c0 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -28,8 +28,8 @@ android {
         applicationId = "net.mullvad.mullvadvpn"
         minSdkVersion(Versions.Android.minSdkVersion)
         targetSdkVersion(Versions.Android.targetSdkVersion)
-        versionCode = 22020002
-        versionName = "2022.2-beta2"
+        versionCode = generateVersionCode()
+        versionName = generateVersionName()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -162,6 +162,13 @@ tasks.register("ensureJniDirectoryExist") {
     }
 }
 
+tasks.create("printVersion") {
+    doLast {
+        println("versionCode=${project.android.defaultConfig.versionCode}")
+        println("versionName=${project.android.defaultConfig.versionName}")
+    }
+}
+
 play {
     serviceAccountCredentials = file("play-api-key.json")
 }
diff --git a/android/buildSrc/src/main/kotlin/Utils.kt b/android/buildSrc/src/main/kotlin/Utils.kt
new file mode 100644
index 0000000000..96c44b78c2
--- /dev/null
+++ b/android/buildSrc/src/main/kotlin/Utils.kt
@@ -0,0 +1,20 @@
+import java.io.ByteArrayOutputStream
+import org.gradle.api.Project
+import org.gradle.process.ExecSpec
+
+fun Project.execWithOutput(spec: ExecSpec.() -> Unit) =
+    ByteArrayOutputStream().use { outputStream ->
+        exec {
+            this.spec()
+            this.standardOutput = outputStream
+        }
+        outputStream.toString().trim()
+    }
+
+fun Project.generateVersionCode() = execWithOutput {
+    commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionCode")
+}.toInt()
+
+fun Project.generateVersionName() = execWithOutput {
+    commandLine("cargo", "run", "-q", "--bin", "mullvad-version", "versionName")
+}