Fix version code safeguard

Moving the version code safeguard in order to make it
configuration cache compliant.

2 files changed, 11 insertions, 17 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 9571b9819a..28c9f354b1 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -236,9 +236,6 @@ android {
             inputs.dir(rustJniLibsDir)
             dependsOn("cargoBuild")
         }
-
-        // Ensure all relevant assemble tasks depend on our ensure task.
-        tasks["assemble$capitalizedVariantName"].dependsOn(tasks["ensureValidVersionCode"])
     }
 }
 
@@ -300,17 +297,6 @@ androidComponents {
     }
 }
 
-// This is a safety net to avoid generating too big version codes, since that could potentially be
-// hard and inconvenient to recover from.
-tasks.register("ensureValidVersionCode") {
-    doLast {
-        val versionCode = project.android.defaultConfig.versionCode!!
-        if (versionCode >= MAX_ALLOWED_VERSION_CODE) {
-            throw GradleException("Bad version code: $versionCode")
-        }
-    }
-}
-
 tasks.register("printVersion") {
     doLast {
         println("versionCode=${project.android.defaultConfig.versionCode}")
diff --git a/android/buildSrc/src/main/kotlin/Utils.kt b/android/buildSrc/src/main/kotlin/Utils.kt
index d939363827..f9f9a7528c 100644
--- a/android/buildSrc/src/main/kotlin/Utils.kt
+++ b/android/buildSrc/src/main/kotlin/Utils.kt
@@ -1,4 +1,3 @@
-import java.util.*
 import org.gradle.api.Project
 
 // This is a hack and will not work correctly under all scenarios.
@@ -18,8 +17,17 @@ fun Project.isDevBuild(): Boolean {
     return versionName.contains("-dev-")
 }
 
-fun Project.generateVersionCode(): Int =
-    getIntPropertyOrNull("mullvad.app.config.override.versionCode") ?: execVersionCodeCargoCommand()
+fun Project.generateVersionCode(): Int {
+    val versionCode =
+        getIntPropertyOrNull("mullvad.app.config.override.versionCode")
+            ?: execVersionCodeCargoCommand()
+    // This is a safety net to avoid generating too big version codes, since that could potentially
+    // be hard and inconvenient to recover from.
+    require(versionCode <= MAX_ALLOWED_VERSION_CODE) {
+        "versionCode ($versionCode) must be <= $MAX_ALLOWED_VERSION_CODE"
+    }
+    return versionCode
+}
 
 fun Project.generateVersionName(): String =
     getStringPropertyOrNull("mullvad.app.config.override.versionName")