Fixed FxR Version Code

app/build.gradle

@@ -563,34 +563,9 @@ if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcd
 // -------------------------------------------------------------------------------------------------
 
 android.applicationVariants.all { variant ->
-    def buildType = variant.buildType.name
     if (gradle.hasProperty('userProperties.taskclusterBuild')) {
-        def versionCode = generatedVersionCode
-
-        // The Google Play Store does not allow multiple APKs for the same app that all have the
-        // same version code. Therefore we need to have different version codes for our ARM and x86
-        // builds.
-        // Our generated version code has a length of 8 (See tools/gradle/versionCode.gradle).
-        // We will prefix our ARM builds with 1 and our x86 builds with 2. Our x86 builds need a
-        // higher version code to avoid installing ARM builds on an x86 device with ARM
-        // compatibility mode.
-        def multiplier = 100000000
-
-        if (variant.flavorName.contains("x86_64")) {
-            versionCode = versionCode + (3 * multiplier)
-        } else if (variant.flavorName.contains("Aarch64")) {
-            versionCode = versionCode + (2 * multiplier)
-        } else if (variant.flavorName.contains("Arm")) {
-            versionCode = versionCode + (1 * multiplier)
-        }
-
         variant.outputs.each { output ->
-            output.versionCodeOverride = versionCode
+            output.versionCodeOverride = generatedVersionCode
         }
     }
-
-    println("----------------------------------------------")
-    println("Build type:   " + buildType)
-    println("Flavor:       " + variant.flavorName)
-    println("Version code: " + variant.mergedFlavor.versionCode)
 }

app/src/common/shared/org/mozilla/vrbrowser/utils/StringUtils.java

@@ -92,7 +92,7 @@ public static boolean contains(String[] aTarget, String aText) {
      * @return String The converted date in the format yyyy-MM-dd
      */
     public static String versionCodeToDate(final @NonNull Context context, final int aVersionCode) {
-        String versionCode = Integer.toString(aVersionCode);
+        String versionCode = Integer.toString(aVersionCode - 100000000);
 
         String formatted;
         try {

tools/gradle/versionCode.gradle

@@ -37,7 +37,9 @@ ext {
     // minute.
     def time = new SimpleDateFormat("HHmm").format(today)
 
-    generatedVersionCode = (year + day + time) as int
+    def baseNumber = (year + day + time) as int
+
+    generatedVersionCode = 100000000 + baseNumber
 
     println("Generated versionCode: $generatedVersionCode")
     println()