Bump version to 8.1.4

app/build.gradle.kts

@@ -24,9 +24,9 @@ plugins {
 
 apply(from = "static-ips.gradle.kts")
 
-val canonicalVersionCode = 1669
-val canonicalVersionName = "8.4.0"
-val currentHotfixVersion = 0
+val canonicalVersionCode = 1660
+val canonicalVersionName = "8.1.4"
+val currentHotfixVersion = 1
 val maxHotfixVersions = 100
 
 // We don't want versions to ever end in 0 so that they don't conflict with nightly versions
@@ -51,9 +51,10 @@ val localProperties: Properties? = if (localPropertiesFile.exists()) {
   null
 }
 val quickstartCredentialsDir: String? = localProperties?.getProperty("quickstart.credentials.dir")
-val benchmarkBackupFile: String? = localProperties?.getProperty("benchmark.backup.file")
 
 val selectableVariants = listOf(
+  "nightlyBackupRelease",
+  "nightlyBackupSpinner",
   "nightlyProdSpinner",
   "nightlyProdPerf",
   "nightlyProdRelease",
@@ -467,6 +468,17 @@ android {
       buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
       buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")
     }
+
+    create("backup") {
+      initWith(getByName("staging"))
+
+      dimension = "environment"
+
+      applicationIdSuffix = ".backup"
+
+      buildConfigField("boolean", "MANAGES_APP_UPDATES", "true")
+      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Backup\"")
+    }
   }
 
   lint {
@@ -532,15 +544,6 @@ android {
       }
       variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
     }
-
-    onVariants(selector().withBuildType("benchmark")) { variant ->
-      val taskProvider = tasks.register<CopyBenchmarkBackupTask>("copyBenchmarkBackup${variant.name.capitalize()}") {
-        if (benchmarkBackupFile != null) {
-          inputFile.set(File(benchmarkBackupFile))
-        }
-      }
-      variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
-    }
   }
 
   val releaseDir = "$projectDir/src/release/java"
@@ -654,7 +657,6 @@ dependencies {
   implementation(libs.androidx.concurrent.futures)
   implementation(libs.androidx.autofill)
   implementation(libs.androidx.biometric)
-  implementation(libs.androidx.core.telecom)
   implementation(libs.androidx.sharetarget)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.asynclayoutinflater)
@@ -913,27 +915,3 @@ abstract class CopyQuickstartCredentialsTask : DefaultTask() {
     chosen.copyTo(dest.resolve(chosen.name), overwrite = true)
   }
 }
-
-abstract class CopyBenchmarkBackupTask : DefaultTask() {
-  @get:InputFile
-  @get:Optional
-  abstract val inputFile: RegularFileProperty
-
-  @get:OutputDirectory
-  abstract val outputDir: DirectoryProperty
-
-  @TaskAction
-  fun copy() {
-    val dest = outputDir.get().asFile.resolve("backups")
-    dest.mkdirs()
-
-    if (!inputFile.isPresent) {
-      logger.lifecycle("benchmark.backup.file is not set in local.properties. Benchmark tests using backup data will crash at runtime.")
-      return
-    }
-
-    val backupFile = inputFile.get().asFile
-    logger.lifecycle("Using benchmark backup: ${backupFile.absolutePath} (${backupFile.length() / 1024}KB)")
-    backupFile.copyTo(dest.resolve("backup.binproto"), overwrite = true)
-  }
-}