Merge branch 'improve-rust-crate-versioning'

1 files changed, 9 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")
 }