[reland] Support conditional bundling of assets based on --flavor
#139834
Conversation
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
oops enable for `flutter daemon` and `flutter run --machine` nit working (ugly) flavor-collision-handling logic nits add commented out tests refactor main test a little update tests and add support for deferred components assets remove extra log statements add a test for assetsentry parsing get build_info.dart changes under test fix asset bundle test for windows make asset bundle tests work on Windows typos remove feature for web typo fix some tests fix xcode_backend_test remove feature for web fix a test fix oopsie fix test try fix xcode backend test restore in-order sequencing of install tests augment flavors integration tests with flavor-specific assets checks add support to HotRunner (untested) more diff cleanup remove support for flavors for platforms that we haven't documented flavors support for enable for web add tests to asset bundle tests add tests for CopyAssets target and fix logic for unflavored builds clean up print statements simplify pubspec syntax implement group pubspec syntax (very hacky) group parsing actually works (image displays at runtime) xcode sends flavor, we use flavor in asset bundling (hacky) gradle-sends-flavor-to-flutter-assembler run update-packages fix test: clean up after flavors test fixing rebasing oopsies rebasing because frob asked me to add tech debt note about redundant parsing make flavor matching behavior more explicit remove unused flavor parameter nits nit test based on android manifest (#1) * remove trace and fix test * update to use AssetManifest.bin; mirror change in flavors_test_ios --------- oops again oops remove redundant flavor arg from HotRunner nits change `flavor` to `flavors` to allow multiple flavors per asset consider flavor in AssetsEntry.hashCode fix some tests fix flavors for deferred components disallow overlapping entries of different flavors allow empty flavor when passing to xcode This shouldn't really matter because the app won't shouldn't build with any empty flavor. if flavor is null or empty, do not pass it to xcode via -d remove redundant --flavor option in assemble command make AssetsEntry parsing functions pure revert unnecessary extraction of expression into local variable remove duplicate Xcode define cleanup Co-Authored-By: Christopher Fujino <fujino@google.com> Co-Authored-By: Andrew Kolos <andrewrkolos@gmail.com>
d120df3 to
45c375d
Compare
Contributor
|
Is this the tl;dr diff between this PR and the last one? |
Contributor
|
actually, all i really care about is if you fixed the test. did you get it to pass presubmit? |
Contributor
Author
Yup—https://github.com/flutter/flutter/pull/139834/checks?check_run_id=19614729659 |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 14, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 14, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 14, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Dec 14, 2023
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Dec 14, 2023
flutter/flutter@11a9cb7...a51e33a 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 223f4b2465dd to caf33276468b (1 revision) (flutter/flutter#140156) 2023-12-14 engine-flutter-autoroll@skia.org Roll Packages from b5958e2 to 1151191 (10 revisions) (flutter/flutter#140154) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from a3f9393f9591 to 223f4b2465dd (1 revision) (flutter/flutter#140151) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 913446eca57c to a3f9393f9591 (2 revisions) (flutter/flutter#140144) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 923f9e29d4b5 to 913446eca57c (1 revision) (flutter/flutter#140132) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9f7004e3e30e to 923f9e29d4b5 (7 revisions) (flutter/flutter#140130) 2023-12-14 magder@google.com Add self back to CODEOWNERS (flutter/flutter#140080) 2023-12-14 git@reb0.org Adapt wording for required Android SDK for plugins (flutter/flutter#140043) 2023-12-14 andrewrkolos@gmail.com [reland] Support conditional bundling of assets based on `--flavor` (flutter/flutter#139834) 2023-12-14 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll Flutter Engine from 9f7004e3e30e to 45b95f264d63 (1 revision)" (flutter/flutter#140123) 2023-12-14 dacoharkes@google.com [deps] update Android SDK to 34 (flutter/flutter#138183) 2023-12-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9f7004e3e30e to 45b95f264d63 (1 revision) (flutter/flutter#140108) 2023-12-14 31859944+LongCatIsLooong@users.noreply.github.com Catch `Stopwatch` with static analysis (flutter/flutter#140019) 2023-12-14 goderbauer@google.com Overlay supports unconstrained environments (flutter/flutter#139513) 2023-12-14 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 2.22.10 to 3.22.11 (flutter/flutter#140087) 2023-12-14 rmolivares@renzo-olivares.dev Remove deprecated `ThemeData.selectedRowColor` (flutter/flutter#139080) 2023-12-14 15619084+vashworth@users.noreply.github.com Unpin mac_toolchain version (flutter/flutter#139938) 2023-12-14 chingjun@google.com Optimize file transfer when using proxied devices. (flutter/flutter#139968) 2023-12-14 38378650+hgraceb@users.noreply.github.com Add commonly used parameter names (flutter/flutter#140027) 2023-12-13 engine-flutter-autoroll@skia.org Roll Flutter Engine from fc3267724e1b to 9f7004e3e30e (4 revisions) (flutter/flutter#140090) 2023-12-13 737941+loic-sharma@users.noreply.github.com [Windows] Remove header guard from generated key map (flutter/flutter#140082) 2023-12-13 reidbaker@google.com Do not use project in do last (flutter/flutter#139325) 2023-12-13 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#140024) 2023-12-13 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Warn when Gradle plugins are applied using the legacy "apply script method" way" (flutter/flutter#140102) 2023-12-13 58190796+MitchellGoodwin@users.noreply.github.com Swap iOS back button icon in Material app bar (flutter/flutter#134754) 2023-12-13 engine-flutter-autoroll@skia.org Roll Packages from 80aa46a to b5958e2 (10 revisions) (flutter/flutter#140069) 2023-12-13 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9039ac78cf03 to fc3267724e1b (26 revisions) (flutter/flutter#140084) 2023-12-13 barpac02@gmail.com Warn when Gradle plugins are applied using the legacy "apply script method" way (flutter/flutter#139690) 2023-12-13 magder@google.com Add self as bundler dependabot reviewer (flutter/flutter#140081) 2023-12-13 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Make tests more resilient to Skia gold failures and refactor flutter_goldens for extensive technical debt removal" (flutter/flutter#140085) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC dit@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Feb 16, 2024
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Reland of #132985. Fixes the path to AssetManifest.bin in flavors_test_ios
Pre-launch Checklist
///).