Remove wasabi, jalapeno, and the buildType flavor dimension by jkmassel · Pull Request #22651 · wordpress-mobile/WordPress-Android

jkmassel · 2026-03-03T20:35:03Z

Description

Removes the three buildType flavors (vanilla, wasabi, jalapeno) and the entire buildType flavor dimension from the project. These flavors existed only for cosmetic differences (app name, icon) and side-by-side installation via applicationIdSuffix, but caused Gradle cache fragmentation across CI jobs since each job compiled a different variant independently.

Variant names simplify from e.g. wordpressVanillaDebug to wordpressDebug. All CI jobs now share the same variant, maximizing Gradle remote cache reuse.

What changed

Removed vanilla, wasabi, jalapeno flavor definitions and the buildType dimension from WordPress/build.gradle
Moved ENABLE_DEBUG_SETTINGS from vanilla flavor to release buildType
Deleted 4 source set directories: wasabi/, jalapeno/, jetpackWasabi/, jetpackJalapeno/
Simplified WordPressPublicData and JetpackPublicData (removed flavor-specific package name logic)
Updated all CI scripts (lint, unit tests, cache population, diff reports)
Updated all Fastlane lanes (build, test, screenshots, prototype builds)
Removed .beta/.prealpha permission declarations from Jetpack manifest
Cleaned up google-services.json-example
Updated documentation (CLAUDE.md, README.md, coding-style.md, etc.)

Testing instructions

Build verification:

./gradlew assembleWordpressDebug

Build succeeds

./gradlew assembleJetpackDebug

Build succeeds

./gradlew lintWordpressRelease

Lint passes

./gradlew testWordpressDebugUnitTest

Unit tests pass

Check CI pipeline

All CI jobs pass with the updated variant names

🤖 Generated with Claude Code

The three buildType flavors (vanilla, wasabi, jalapeno) existed only for cosmetic differences (app name, icon) and side-by-side installation via applicationIdSuffix. They caused Gradle cache fragmentation across CI jobs since each job compiled a different variant independently. This removes the entire buildType flavor dimension, simplifying variant names from e.g. wordpressVanillaDebug to wordpressDebug. All CI jobs now share the same variant, maximizing Gradle remote cache reuse. - Remove vanilla, wasabi, jalapeno flavor definitions from build.gradle - Remove the buildType flavor dimension (keep only app dimension) - Move ENABLE_DEBUG_SETTINGS to release buildType (false) vs default (true) - Delete wasabi, jalapeno, jetpackWasabi, jetpackJalapeno source sets - Simplify WordPressPublicData and JetpackPublicData - Update all CI scripts, Fastlane lanes, and documentation Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

dangermattic · 2026-03-03T20:36:31Z

	1 Warning
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

The diff tools compare against the base branch (trunk), which still uses the old variant names (wordpressVanillaRelease). Until this PR merges, these jobs will fail when checking out trunk. soft_fail prevents them from blocking the build. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Prototype builds upload to Firebase App Distribution, which expects the .prealpha package suffix (from the old jalapeno flavor). Adding applicationIdSuffix ".prealpha" to the debug buildType preserves this and also maintains side-by-side installation with production apps. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

wpmobilebot · 2026-03-03T21:55:01Z

📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Android
	Build Type	Debug
	Version	pr22651-c97d937
	Build Number	`1485`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`c97d937`
	Installation URL	04vuknh1bsc58

Note: Google Login is not supported on these builds.

wpmobilebot · 2026-03-03T21:57:11Z

📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

	App Name	WordPress Android
	Build Type	Debug
	Version	pr22651-c97d937
	Build Number	`1485`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`c97d937`
	Installation URL	43s82697e7rlo

Note: Google Login is not supported on these builds.

FLAVOR_app only exists with multi-dimension flavors. With the buildType dimension removed, use BuildConfig.FLAVOR instead (which now contains "wordpress" or "jetpack" directly). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

codecov · 2026-03-03T23:33:17Z

Codecov Report

❌ Patch coverage is 0% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.12%. Comparing base (a390930) to head (c97d937).
⚠️ Report is 9 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...press/android/util/publicdata/JetpackPublicData.kt	0.00%	9 Missing ⚠️
...ess/android/util/publicdata/WordPressPublicData.kt	0.00%	4 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##            trunk   #22651   +/-   ##
=======================================
  Coverage   38.12%   38.12%           
=======================================
  Files        2263     2263           
  Lines      115827   115816   -11     
  Branches    16090    16084    -6     
=======================================
  Hits        44157    44157           
+ Misses      68045    68034   -11     
  Partials     3625     3625

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

nbradbury · 2026-03-04T19:31:13Z

@jkmassel All four test steps pass and CI is clear, so this looks good to me. I'll wait for others to take a look before approving.

adalpari · 2026-03-05T08:39:40Z

WordPress/build.gradle

        }

        debug {
+            applicationIdSuffix ".prealpha"


❓ Any special reason why debug variant is adding prealpha now? Is it just a preference, or maybe to avoid CI conflicts, since it seems to be using that in jalapeño?
Just a nitpick, but we don't really have alpha or beta. So, it looks a bit strange.

That's a good question @adalpari , and I'll try to answer for @jkmassel (if I might, and until he adds his answer)... 😊 🙏

Ideally we would have that applicationIdSuffix set to .debug, this is the default way of doing that, so that we have two apps installed on the same device side-by-side, both, the debug and release apps.

With Jetpack/WordPress, this debug version of the app was either the .beta (for Wasabi) or the .prealpha (for Jalapeno), so we could have chosen either one or the other, same result.

Choosing .prealpha (or .beta) instead of going for a new .debug suffix is (IMHO) the right call as it will prevent us from (possibly) breaking something Firebase related (see google-services.json). This is because otherwise, we would need to add such new .debug Firebase project(s), for both Jetpack and WordPress, and then go through the hoops-and-loops of this process, possibly breaking things in-between (of course, until we then fix them). For example, see the Jetpack configuration in Firebase:

As such, and having said that, I think Jeremy make the right call here, doing what he did. 💯 🤞

Choosing .prealpha (or .beta) instead of going for a new .debug suffix is (IMHO) the right call as it will prevent us from (possibly) breaking something Firebase related

This was the reasoning – I wanted to be able to continue to upload to Firebase for PR builds without needing to modify remote configuration.

If we want to squash this down too I'm good with it, but maybe a subsequent PR?

adalpari

Changes look good to me, and testing steps work as expected, so I'm approving it.

(Just left a minor question)

ParaskP7

👋 @jkmassel and thanks for this change, this is awesome and I am excited for you on this change, long overdue! 🥇 ❤️ 🙇

FYI: I've identified a couple of changes that you might want to apply before merging this, thus I am requesting changes, bear with me for just that bit, please... 🙏 (nothing too serious)

.buildkite/pipeline.yml

ParaskP7 · 2026-03-05T11:36:10Z

gradle.properties


 # Dependency Analysis Plugin
-dependency.analysis.android.ignored.variants=release,wordpressVanillaDebug,wordpressVanillaRelease,wordpressWasabiDebug,wordpressWasabiRelease,wordpressJalapenoRelease,jetpackVanillaDebug,jetpackVanillaRelease,jetpackWasabiDebug,jetpackWasabiRelease,jetpackJalapenoRelease
+dependency.analysis.android.ignored.variants=release,wordpressDebug,wordpressRelease,jetpackDebug,jetpackRelease


Warning (⚠️): This change will break the Dependency Analysis process, please update it to:

dependency.analysis.android.ignored.variants=release,wordpressRelease,jetpackRelease

This change will effectively allow the wordpressDebug and jetpackDebug variants to be scanned. Otherwise, nothing will be scanned and this process with just build successfully in a few seconds, but without doing anything. 😊

FYI: Note that the previous version of the configuration was ignoring all of them variants, except those two below:

wordpressJalapenoDebug

jetpackJalapenoDebug

I'm pretty sure that change goes with #22651 (comment) – after this PR lands, I'll fix up the dependency analysis job in a subsequent PR?

LMK if I'm wrong!

Actually no @jkmassel , this change and Dependency Analysis are two different things, and don't relate with each other. With this change, if merged this as is, it will affect this scheduled build, and this Sunday (if this gets merged, and not fixed by then), it will alter (or break) this Grafana view for JP/WPAndroid and those stats (plus Slack reporting, etc).

Btw, the change is pretty simple and (very) low effort, just this replace L14 with this, that's all:

dependency.analysis.android.ignored.variants=release,wordpressRelease,jetpackRelease

Applied your suggestion in c97d937, thanks!!

WordPress/src/jalapeno/res/drawable/app_icon_background.xml

WordPress/src/jetpack/AndroidManifest.xml

Move the jalapeno/jetpackJalapeno debug icon resources into debug and jetpackDebug source sets so debug builds retain a visually distinct app icon and "Pre-Alpha" app name. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

ParaskP7 · 2026-03-06T07:01:16Z

FYI: Almost everything has been resolved, and when this change gets pushed, it'll be all ✅ from my side! Cc @jkmassel

sonarqubecloud · 2026-03-06T18:27:19Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

jkmassel and others added 2 commits March 3, 2026 13:49

jkmassel requested review from ParaskP7 and adalpari March 3, 2026 22:03

jkmassel marked this pull request as ready for review March 4, 2026 19:01

jkmassel self-assigned this Mar 4, 2026

jkmassel added the Tooling label Mar 4, 2026

jkmassel added this to the 26.7 milestone Mar 4, 2026

jkmassel requested a review from nbradbury March 4, 2026 19:01

adalpari reviewed Mar 5, 2026

View reviewed changes

adalpari approved these changes Mar 5, 2026

View reviewed changes

ParaskP7 requested changes Mar 5, 2026

View reviewed changes

jkmassel requested a review from ParaskP7 March 5, 2026 16:05

Add distinct prealpha icons for debug builds

a63475c

Move the jalapeno/jetpackJalapeno debug icon resources into debug and jetpackDebug source sets so debug builds retain a visually distinct app icon and "Pre-Alpha" app name. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Address Petros’ feedback

c97d937

jkmassel enabled auto-merge (squash) March 6, 2026 18:25

jkmassel requested a review from dcalhoun March 6, 2026 20:22

Conversation

jkmassel commented Mar 3, 2026 • edited by adalpari Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

What changed

Testing instructions

Uh oh!

dangermattic commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

nbradbury commented Mar 4, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

ParaskP7 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ParaskP7 commented Mar 6, 2026

Uh oh!

sonarqubecloud bot commented Mar 6, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jkmassel commented Mar 3, 2026 •

edited by adalpari

Loading

dangermattic commented Mar 3, 2026 •

edited

Loading

wpmobilebot commented Mar 3, 2026 •

edited

Loading

wpmobilebot commented Mar 3, 2026 •

edited

Loading

codecov bot commented Mar 3, 2026 •

edited

Loading