wordpress-mobile · jkmassel · Mar 3, 2026 · Mar 3, 2026 · Mar 3, 2026 · Mar 3, 2026
diff --git a/.buildkite/commands/gradle-cache-build.sh b/.buildkite/commands/gradle-cache-build.sh
@@ -14,9 +14,9 @@ bundle exec fastlane run configure_apply
 
 echo "--- :hammer_and_wrench: Building"
 if [ "$1" = "wordpress" ]; then
-  ./gradlew assembleWordpressWasabiDebug
+  ./gradlew assembleWordpressDebug
 fi
 
 if [ "$1" = "jetpack" ]; then
-  ./gradlew assembleJetpackWasabiDebug
+  ./gradlew assembleJetpackDebug
 fi
diff --git a/.buildkite/commands/lint.sh b/.buildkite/commands/lint.sh
@@ -15,17 +15,17 @@ bundle exec fastlane check_declared_locales_consistency app:"$1"
 echo "--- :microscope: Linting"
 
 if [ "$1" = "wordpress" ]; then
-  ./gradlew lintWordpressVanillaRelease
+  ./gradlew lintWordpressRelease
   exit 0
 fi
 
 if [ "$1" = "jetpack" ]; then
   set +e
-  ./gradlew lintJetpackVanillaRelease
+  ./gradlew lintJetpackRelease
   lint_exit_code=$?
   set -e
 
-  upload_sarif_to_github "WordPress/build/reports/lint-results-jetpackVanillaRelease.sarif"
+  upload_sarif_to_github "WordPress/build/reports/lint-results-jetpackRelease.sarif"
   exit $lint_exit_code
 fi
 

diff --git a/.buildkite/commands/run-unit-tests.sh b/.buildkite/commands/run-unit-tests.sh
@@ -10,12 +10,12 @@ fi
 echo "+++ 🧪 Testing"
 set +e
 ./gradlew \
-  testWordpressWasabiDebugUnitTest \
+  testWordpressDebugUnitTest \
   :libs:processors:test \
   :libs:image-editor:testDebugUnitTest \
   :libs:fluxc:testDebugUnitTest \
   :libs:login:testDebugUnitTest \
-  koverXmlReportWordpressWasabiDebug \
+  koverXmlReportWordpressDebug \
   :libs:processors:koverXmlReportJvm \
   :libs:image-editor:koverXmlReportDebug \
   :libs:fluxc:koverXmlReportDebug \
@@ -45,7 +45,7 @@ echo "--- 🚦 Collecting Test Results"
 
 # Define test result directories for each module
 declare -A TEST_RESULT_DIRS=(
-  ["WordPress:wordpress"]="WordPress/build/test-results/testWordpressWasabiDebugUnitTest"
+  ["WordPress:wordpress"]="WordPress/build/test-results/testWordpressDebugUnitTest"
   ["processors"]="libs/processors/build/test-results/test"
   ["image-editor"]="libs/image-editor/build/test-results/testDebugUnitTest"
   ["fluxc"]="libs/fluxc/build/test-results/testDebugUnitTest"

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -78,25 +78,30 @@ steps:
     steps:
       - label: "Dependency Tree Diff"
         command: |
-          comment_with_dependency_diff 'WordPress' 'wordpressVanillaReleaseRuntimeClasspath'
+          comment_with_dependency_diff 'WordPress' 'wordpressReleaseRuntimeClasspath'
         if: build.pull_request.id != null
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/diff/*"
+        # TODO: Remove soft_fail after this PR merges and trunk
+        # uses the new variant names (without buildType flavors)
+        soft_fail: true
 
       - label: "Merged Manifest Diff WordPress"
-        command: ".buildkite/commands/diff-merged-manifest.sh wordpressVanillaRelease"
+        command: ".buildkite/commands/diff-merged-manifest.sh wordpressRelease"
         if: build.pull_request.id != null
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/diff_manifest/**/**/*"
+        soft_fail: true
 
       - label: "Merged Manifest Diff Jetpack"
-        command: ".buildkite/commands/diff-merged-manifest.sh jetpackVanillaRelease"
+        command: ".buildkite/commands/diff-merged-manifest.sh jetpackRelease"
         if: build.pull_request.id != null
         plugins: [$CI_TOOLKIT]
         artifact_paths:
           - "**/build/reports/diff_manifest/**/**/*"
+        soft_fail: true
 
   #################
   # Unit Tests

diff --git a/.claude/skills/run-app/SKILL.md b/.claude/skills/run-app/SKILL.md
@@ -8,7 +8,7 @@ description: >
 
 # Run App
 
-Build and run the Jetpack wasabi debug variant on a connected Android
+Build and run the Jetpack debug variant on a connected Android
 device or emulator. By default this skill builds and runs the
 **Jetpack** app. Only build the WordPress app if the user explicitly
 asks for it.
@@ -17,16 +17,16 @@ asks for it.
 
 ### 1. Build the app
 
-By default, build the Jetpack wasabi debug variant:
+By default, build the Jetpack debug variant:
 
 ```bash
-./gradlew assembleJetpackWasabiDebug
+./gradlew assembleJetpackDebug
 ```
 
 If the user explicitly asks for the WordPress app instead, run:
 
 ```bash
-./gradlew assembleWordPressWasabiDebug
+./gradlew assembleWordPressDebug
 ```
 
 ### 2. Check for connected devices
@@ -89,14 +89,14 @@ Gradle versions):
 **Jetpack (default):**
 
 ```bash
-APK=$(find WordPress/build/outputs/apk/jetpackWasabi/debug \
+APK=$(find WordPress/build/outputs/apk/jetpack/debug \
   -name '*.apk' ! -name '*androidTest*' | head -1)
 ```
 
 **WordPress (only if the user explicitly requested it):**
 
 ```bash
-APK=$(find WordPress/build/outputs/apk/wordpressWasabi/debug \
+APK=$(find WordPress/build/outputs/apk/wordpress/debug \
   -name '*.apk' ! -name '*androidTest*' | head -1)
 ```
 
@@ -109,8 +109,8 @@ adb [-s <serial>] install -r "$APK"
 
 Then launch the app:
 
-- **Jetpack**: `adb [-s <serial>] shell am start -n com.jetpack.android.beta/org.wordpress.android.ui.WPLaunchActivity`
-- **WordPress**: `adb [-s <serial>] shell am start -n org.wordpress.android.beta/org.wordpress.android.ui.WPLaunchActivity`
+- **Jetpack**: `adb [-s <serial>] shell am start -n com.jetpack.android/org.wordpress.android.ui.WPLaunchActivity`
+- **WordPress**: `adb [-s <serial>] shell am start -n org.wordpress.android/org.wordpress.android.ui.WPLaunchActivity`
 
 ### 6. Report the result
 

diff --git a/CLAUDE.md b/CLAUDE.md
@@ -5,21 +5,21 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 ## Build and Test Commands
 
 ### Main Build Commands
-- `./gradlew assembleWordPressVanillaDebug` - Build debug APK for WordPress app
-- `./gradlew assembleJetpackVanillaDebug` - Build debug APK for Jetpack app
-- `./gradlew installWordPressVanillaDebug` - Install debug APK to connected device
-- `./gradlew installJetpackVanillaDebug` - Install debug APK for Jetpack to device
+- `./gradlew assembleWordPressDebug` - Build debug APK for WordPress app
+- `./gradlew assembleJetpackDebug` - Build debug APK for Jetpack app
+- `./gradlew installWordPressDebug` - Install debug APK to connected device
+- `./gradlew installJetpackDebug` - Install debug APK for Jetpack to device
 
 ### Testing Commands
-- `./gradlew :WordPress:testWordPressVanillaDebugUnitTest` - Run unit tests for WordPress app
-- `./gradlew :WordPress:connectedWordPressVanillaDebugAndroidTest` - Run instrumented tests for WordPress app
+- `./gradlew :WordPress:testWordPressDebugUnitTest` - Run unit tests for WordPress app
+- `./gradlew :WordPress:connectedWordPressDebugAndroidTest` - Run instrumented tests for WordPress app
 - `bundle exec fastlane build_and_run_instrumented_test app:wordpress` - Build and run WordPress instrumented tests in Firebase Test Lab
 - `bundle exec fastlane build_and_run_instrumented_test app:jetpack` - Build and run Jetpack instrumented tests in Firebase Test Lab
 
 ### Code Quality Commands
 - `./gradlew checkstyle` - Run Checkstyle linter (generates report in `WordPress/build/reports/checkstyle/checkstyle.html`)
 - `./gradlew detekt` - Run Detekt linter for Kotlin (generates report in `WordPress/build/reports/detekt/detekt.html`)
-- `./gradlew lintWordPressVanillaRelease` - Run Android lint on WordPress release variant
+- `./gradlew lintWordPressRelease` - Run Android lint on WordPress release variant
 
 ## Architecture Overview
 
@@ -30,8 +30,8 @@ This repository builds two apps from shared codebase:
 
 ### Product Flavors and Build Types
 - **App Flavors**: `wordpress`, `jetpack`
-- **Build Type Flavors**: `vanilla` (release/beta), `wasabi` (development), `jalapeno` (CI/prototype)
-- Common development variant: `jetpackWasabiDebug`
+- **Build Types**: `debug`, `release`
+- Common development variant: `jetpackDebug`
 
 ### Module Architecture
 ```
@@ -121,7 +121,7 @@ WordPress/src/main/java/org/wordpress/android/
   other members (properties, init blocks, constructors, functions)
 
 ### Development Workflow
-- Default development flavor: `jetpackWasabi` (Jetpack app with beta suffix)
+- Default development variant: `jetpackDebug`
 - Remote build cache available for faster builds (requires setup)
 - Fastlane used for release automation and testing
 - Secrets managed via `secrets.properties` file (not in repo)

diff --git a/README.md b/README.md
@@ -21,11 +21,11 @@ Notes:
 
 To build, install, and test the project from the command line:
 
-    $ ./gradlew assembleWordPressVanillaDebug                        # assemble the debug .apk
-    $ ./gradlew installWordPressVanillaDebug                         # install the debug .apk if you have an
+    $ ./gradlew assembleWordPressDebug                        # assemble the debug .apk
+    $ ./gradlew installWordPressDebug                         # install the debug .apk if you have an
                                                                      # emulator or an Android device connected
-    $ ./gradlew :WordPress:testWordPressVanillaDebugUnitTest         # assemble, install and run unit tests
-    $ ./gradlew :WordPress:connectedWordPressVanillaDebugAndroidTest # assemble, install and run Android tests
+    $ ./gradlew :WordPress:testWordPressDebugUnitTest         # assemble, install and run unit tests
+    $ ./gradlew :WordPress:connectedWordPressDebugAndroidTest # assemble, install and run Android tests
 
 ## Running the app ##
 
@@ -49,7 +49,7 @@ Note: Access to WordPress.com features is temporarily disabled in the developmen
     │       │   ├── java        # main project java code
     │       │   └── res         # main project resources
     │       ├── debug           # debug variant
-    │       └── wasabi          # wasabi variant specific resources and manifest
+    │       └── release         # release variant
 
 ## Google Configuration ##
 

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -54,11 +54,11 @@ fladle {
 }
 
 String appPathForVariant(String app) {
-    String path = "outputs/apk/${app}Vanilla/debug"
+    String path = "outputs/apk/${app}/debug"
     return new File(layout.buildDirectory.dir(path).get().asFile, '*.apk').absolutePath
 }
 String testPathForVariant(String app) {
-    String path = "outputs/apk/androidTest/${app}Vanilla/debug"
+    String path = "outputs/apk/androidTest/${app}/debug"
     return new File(layout.buildDirectory.dir(path).get().asFile, '*.apk').absolutePath
 }
 
@@ -195,7 +195,7 @@ android {
         targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
 
-    flavorDimensions = ['app', 'buildType']
+    flavorDimensions = ['app']
 
 
     productFlavors {
@@ -242,29 +242,6 @@ android {
             resourceConfigurations += ["in", "iw"]
         }
 
-        // Used for release/beta testing builds. Usually shouldn't be build locally.
-        // AppName: WordPress/Jetpack
-        vanilla {
-            dimension "buildType"
-
-            buildConfigField "boolean", "ENABLE_DEBUG_SETTINGS", "false"
-        }
-
-        // Used for local development - preferred variant for developers.
-        // AppName: WordPress Beta/Jetpack Beta
-        wasabi {
-            isDefault true
-            applicationIdSuffix ".beta"
-            dimension "buildType"
-        }
-
-        // Used for CI builds on PRs (aka "Prototype Builds"). Can be used locally when a developer needs to install multiple versions of the app on the same device.
-        // AppName: WordPress Pre-Alpha/Jetpack Pre-Alpha
-        jalapeno {
-            applicationIdSuffix ".prealpha"
-            dimension "buildType"
-        }
-
         // Also dynamically add additional `buildConfigFields` to our app flavors from any `wp.`/`jp.`-prefixed property in `secrets.properties`
         addBuildConfigFieldsFromPrefixedProperties(wordpress, gradle.ext.secretProperties, ['wp'])
         addBuildConfigFieldsFromPrefixedProperties(jetpack, gradle.ext.secretProperties, ['wp', 'jp']) // Inherit same properties used from WP first then overwrite with JP-specific ones
@@ -276,9 +253,11 @@ android {
             // but we don't obfuscate the bytecode.
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+            buildConfigField "boolean", "ENABLE_DEBUG_SETTINGS", "false"
         }
 
         debug {
+            applicationIdSuffix ".prealpha"
             minifyEnabled false
             pseudoLocalesEnabled true
         }

diff --git a/WordPress/google-services.json-example b/WordPress/google-services.json-example
@@ -88,48 +88,6 @@
         }
       }
     },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:123:android:abc",
-        "android_client_info": {
-          "package_name": "org.wordpress.android.beta"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "123-abc.apps.googleusercontent.com",
-          "client_type": 3
-        },
-        {
-          "client_id": "",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "org.wordpress.android.beta",
-            "certificate_hash": ""
-          }
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": ""
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 2,
-          "analytics_property": {
-            "tracking_id": ""
-          }
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 1
-        }
-      }
-    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:123:android:abc",
@@ -213,48 +171,6 @@
           "status": 1
         }
       }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:123:android:abc",
-        "android_client_info": {
-          "package_name": "com.jetpack.android.beta"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "123-abc.apps.googleusercontent.com",
-          "client_type": 3
-        },
-        {
-          "client_id": "",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "com.jetpack.android.beta",
-            "certificate_hash": ""
-          }
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": ""
-        }
-      ],
-      "services": {
-        "analytics_service": {
-          "status": 2,
-          "analytics_property": {
-            "tracking_id": ""
-          }
-        },
-        "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
-        },
-        "ads_service": {
-          "status": 1
-        }
-      }
     }
   ],
   "configuration_version": "1"

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.kt b/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.kt
@@ -57,7 +57,7 @@ class LoginFlow {
 
         // Follow the magic link to continue login
         // Intent is invoked directly rather than through a browser as WireMock is unavailable once in the background
-        val appVariant = BuildConfig.FLAVOR_app
+        val appVariant = BuildConfig.FLAVOR
         val intent =
             Intent(Intent.ACTION_VIEW, Uri.parse("$appVariant://magic-login?token=valid_token"))
                 .setPackage(ApplicationProvider.getApplicationContext<Context>().packageName)