Move ensure checks

Author: albin-mullvad

android/app/build.gradle.kts

@@ -224,6 +224,9 @@ android {
             into("${rootDir.parent}/dist")
             include { it.name.endsWith(".apk") }
             rename { "$artifactName.apk" }
+            dependsOn(tasks.get("ensureRelayListExist"))
+            dependsOn(tasks.get("ensureJniDirectoryExist"))
+            dependsOn(tasks.get("ensureValidVersionCode"))
         }
 
         val createDistBundle =
@@ -232,6 +235,9 @@ android {
                 into("${rootDir.parent}/dist")
                 include { it.name.endsWith(".aab") }
                 rename { "$artifactName.aab" }
+                dependsOn(tasks.get("ensureRelayListExist"))
+                dependsOn(tasks.get("ensureJniDirectoryExist"))
+                dependsOn(tasks.get("ensureValidVersionCode"))
             }
 
         createDistBundle.dependsOn("bundle$capitalizedVariantName")
@@ -304,14 +310,6 @@ tasks.create("printVersion") {
 
 play { serviceAccountCredentials.set(file("play-api-key.json")) }
 
-tasks.whenTaskAdded {
-    if (name.startsWith("assemble")) {
-        dependsOn(tasks.get("ensureRelayListExist"))
-        dependsOn(tasks.get("ensureJniDirectoryExist"))
-        dependsOn(tasks.get("ensureValidVersionCode"))
-    }
-}
-
 dependencies {
     implementation(projects.lib.common)
     implementation(projects.lib.daemonGrpc)

android/scripts/update-lockfile.sh

@@ -16,8 +16,6 @@ GRADLE_TASKS=(
     "compileDebugUnitTestKotlin"
     "assembleAndroidTest"
     "lint"
-    "-x:app:ensureRelayListExist"
-    "-x:app:ensureJniDirectoryExist"
 )
 
 export GRADLE_OPTS