fix: ensure all devices get 32-bit and 64-bit ABIs from the Play Store

android/app/build.gradle

@@ -295,6 +295,16 @@ android {
                 abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
             }
         }
+        // Build type for intel devices (chromebooks and rare phones)
+        intel {
+            minifyEnabled enableProguardInReleaseBuilds
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
+            matchingFallbacks = ['release']
+            ndk {
+                abiFilters "x86", "x86_64"
+            }
+        }
         debug {
             // We need to set this to null so that we can override it for variants
             signingConfig signingConfigs.debug
@@ -317,6 +327,12 @@ android {
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
+            // The special intel (x86) build type needs to have a different
+            // version code to the release build type if they are to be
+            // published alongside each other on the Play Store
+            if (variant.buildType.name == "intel") {
+                output.versionCodeOverride = 1048576 + defaultConfig.versionCode
+            }
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
             // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.

bitrise.yml

@@ -81,7 +81,7 @@ workflows:
     before_run:
       - primary
     envs:
-      - GRADLE_TASKS: assembleApp assembleIccaRelease bundleAppUniversal -x assembleAppDebug
+      - GRADLE_TASKS: assembleApp assembleIccaRelease assembleAppUniversal assembleAppIntel -x assembleAppDebug
         opts:
           is_expand: false
     steps:
@@ -112,6 +112,7 @@ workflows:
                   # Uppercase flavor or remove
                   filename="${filename/-qa-/-QA-}"
                   filename="${filename/-icca-release/-ICCA}"
+                  filename="${filename/-app-intel/-x86}"
                   filename="${filename/-app-release/}"
                   filename="${filename/-app-/-}"
                   # Construct path with new filename
@@ -142,10 +143,12 @@ workflows:
                 RELEASE_APK_PATH=$(echo -n "${BITRISE_APK_PATH_LIST//|/$'\n'}" | grep mapeo-.*[0-9]\.apk)
                 UNIVERSAL_APK_PATH=$(echo -n "${BITRISE_APK_PATH_LIST//|/$'\n'}" | grep mapeo-.*[0-9]-universal\.apk)
                 ICCA_RELEASE_APK_PATH=$(echo -n "${BITRISE_APK_PATH_LIST//|/$'\n'}" | grep mapeo-.*ICCA\.apk)
+                INTEL_RELEASE_APK_PATH=$(echo -n "${BITRISE_APK_PATH_LIST//|/$'\n'}" | grep mapeo-.*x86\.apk)
 
                 envman add --key RELEASE_APK_PATH --value "$RELEASE_APK_PATH"
                 envman add --key UNIVERSAL_APK_PATH --value "$UNIVERSAL_APK_PATH"
                 envman add --key ICCA_RELEASE_APK_PATH --value "$ICCA_RELEASE_APK_PATH"
+                envman add --key INTEL_RELEASE_APK_PATH --value "$INTEL_RELEASE_APK_PATH"
       - [email protected]:
           title: Upload APK for Arm
           inputs:
@@ -200,12 +203,11 @@ workflows:
             - files_to_upload: $RELEASE_APK_PATH
             - body: "See [changelog](https://github.com/digidem/mapeo-mobile/blob/develop/CHANGELOG.md) for a detailed list of changes"
             - api_token: $GITHUB_TOKEN
-      - google-play-deploy@3.0.2:
+      - google-play-deploy@3.7.2:
           inputs:
             - service_account_json_key_path: $BITRISEIO_SERVICE_ACCOUNT_JSON_KEY_URL
             - track: beta
-            - apk_path: $RELEASE_APK_PATH
-            - app_path: $BITRISE_AAB_PATH
+            - app_path: $RELEASE_APK_PATH|$INTEL_RELEASE_APK_PATH
             - package_name: com.mapeo
     meta:
       bitrise.io: null