Remove wasabi, jalapeno, and the buildType flavor dimension#22651
Open
Remove wasabi, jalapeno, and the buildType flavor dimension#22651
Conversation
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>
Collaborator
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>
Contributor
|
|
Contributor
|
|
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 Report❌ Patch coverage is
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. 🚀 New features to boost your workflow:
|
Contributor
|
@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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Removes the three buildType flavors (vanilla, wasabi, jalapeno) and the entire
buildTypeflavor dimension from the project. These flavors existed only for cosmetic differences (app name, icon) and side-by-side installation viaapplicationIdSuffix, but caused Gradle cache fragmentation across CI jobs since each job compiled a different variant independently.Variant names simplify from e.g.
wordpressVanillaDebugtowordpressDebug. All CI jobs now share the same variant, maximizing Gradle remote cache reuse.What changed
vanilla,wasabi,jalapenoflavor definitions and thebuildTypedimension fromWordPress/build.gradleENABLE_DEBUG_SETTINGSfrom vanilla flavor toreleasebuildTypewasabi/,jalapeno/,jetpackWasabi/,jetpackJalapeno/WordPressPublicDataandJetpackPublicData(removed flavor-specific package name logic).beta/.prealphapermission declarations from Jetpack manifestgoogle-services.json-exampleTesting instructions
Build verification:
./gradlew assembleWordpressDebug./gradlew assembleJetpackDebug./gradlew lintWordpressRelease./gradlew testWordpressDebugUnitTest🤖 Generated with Claude Code