Reland "Move dart-lang/ai to a top level third party dependency in engine (#187268)"#187378
Merged
Merged
Conversation
…utter#187268) This should fix the flutter-web builders which were broken when this package was removed from the Dart SDK DEPS file in https://dart-review.googlesource.com/c/sdk/+/507220. It moves the dart-lang/ai repository to the top level `engine/src/flutter/third_party/` dir. This may be a new precedent for Dart packages, but other third party DEPS are in there. It also updates the pubspec paths to point to the new location. Includes a manual Dart roll to 3cdc25e8ffe98c61b36af485573639dc833b75cb. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. --------- Co-authored-by: Alexander Aprelev <aam@google.com>
|
It looks like this pull request may not have tests. Please make sure to add tests or get an explicit test exemption before merging. If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix? Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. If you believe this PR qualifies for a test exemption, contact "@test-exemption-reviewer" in the #hackers channel in Discord (don't just cc them here, they won't see it!). The test exemption team is a small volunteer group, so all reviewers should feel empowered to ask for tests, without delegating that responsibility entirely to the test exemption group. |
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates the dependency override path for dart_mcp in engine/src/flutter/pubspec.yaml and removes several snapshot files, including analysis_server.dart.snapshot and dart_mcp_server_aot.dart.snapshot, from the list of binaries with entitlements in run_verify_binaries_codesigned_tests.dart. There are no review comments, and I have no feedback to provide.
jakemac53
previously approved these changes
Jun 1, 2026
jakemac53
approved these changes
Jun 1, 2026
Member
|
Thanks for rolling this back in, @jason-simmons ! |
This was referenced Jun 2, 2026
auto-submit Bot
pushed a commit
to flutter/packages
that referenced
this pull request
Jun 2, 2026
flutter/flutter@54e199a...701665b 2026-06-02 engine-flutter-autoroll@skia.org Roll Skia from c97e939eb5c9 to 279b17fe9fc1 (16 revisions) (flutter/flutter#187425) 2026-06-02 bdero@google.com [Flutter GPU] Add block-compressed texture format support (BC, ETC2, ASTC LDR) (flutter/flutter#187281) 2026-06-02 bdero@google.com [Impeller] Allow attaching specific texture mip levels and slices (flutter/flutter#187066) 2026-06-02 bdero@google.com [Impeller] Fix GLES command submission status before context is current (flutter/flutter#187293) 2026-06-02 engine-flutter-autoroll@skia.org Roll Dart SDK from 3cdc25e8ffe9 to d39850bf4a01 (9 revisions) (flutter/flutter#187409) 2026-06-01 jason-simmons@users.noreply.github.com [Impeller] Use glVertexAttribDivisor on GLES3 and glVertexAttribDivisorEXT on GLES2 with the extension (flutter/flutter#187313) 2026-06-01 matt.boetger@gmail.com [Android] Add Javadoc documentation to TextInputChannel (flutter/flutter#186018) 2026-06-01 mvincentong@gmail.com Read FLTEnableWideGamut from Dart bundle (flutter/flutter#186509) 2026-06-01 matt.boetger@gmail.com [flutter_tools] Remove obsolete AndroidX console warning during Gradle builds (flutter/flutter#186077) 2026-06-01 kjlubick@users.noreply.github.com [skia] Update gni file list name hsw -> ml3 (flutter/flutter#184892) 2026-06-01 zhongliu88889@gmail.com [web] Always sync slider input attrs regardless of gesture mode (flutter/flutter#187217) 2026-06-01 zhongliu88889@gmail.com [flutter_driver] Don't throw when stderr is unavailable on web (flutter/flutter#187190) 2026-06-01 116356835+AbdeMohlbi@users.noreply.github.com Remove unused code in `FlutterPluginUtils.kt` (flutter/flutter#187012) 2026-06-01 taak140@gmail.com [flutter_tools] Fix `flutter drive --chrome-binary` being ignored on web (flutter/flutter#185481) 2026-06-01 davidmartos96@gmail.com Eager failure when building and no XCode build settings (flutter/flutter#184726) 2026-06-01 goung123@gmail.com Fix Windows Korean IME caret position during composition (flutter/flutter#186353) 2026-06-01 okorohelijah@google.com iOS: update provisioning profile for 2026-2027 cert (flutter/flutter#187280) 2026-06-01 154381524+flutteractionsbot@users.noreply.github.com Sync CHANGELOG.md from stable (flutter/flutter#187380) 2026-06-01 jason-simmons@users.noreply.github.com Reland "Move dart-lang/ai to a top level third party dependency in engine (#187268)" (flutter/flutter#187378) 2026-06-01 stuartmorgan@google.com Add vector_math to Framework triage (flutter/flutter#187389) 2026-06-01 engine-flutter-autoroll@skia.org Roll Packages from e930ced to f5d50ca (4 revisions) (flutter/flutter#187381) 2026-06-01 mr_nadeem_iqbal@yahoo.com [flutter_tools] Reject archive entries that escape into a sibling directory by name prefix (#185794) (flutter/flutter#186647) 2026-06-01 bkonyi@google.com [flutter_tools] Fix widget_preview unawaited async write race condition (flutter/flutter#187177) 2026-06-01 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#187375) 2026-06-01 engine-flutter-autoroll@skia.org Roll Skia from 0aee4675e0ad to c97e939eb5c9 (7 revisions) (flutter/flutter#187371) 2026-06-01 mr_nadeem_iqbal@yahoo.com docs: Stack.clipBehavior = Clip.none does not extend hit testing (#160787) (flutter/flutter#186643) 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 stuartmorgan@google.com,tarrinneal@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
creatorpiyush
pushed a commit
to creatorpiyush/packages
that referenced
this pull request
Jun 10, 2026
…r#11822) flutter/flutter@54e199a...701665b 2026-06-02 engine-flutter-autoroll@skia.org Roll Skia from c97e939eb5c9 to 279b17fe9fc1 (16 revisions) (flutter/flutter#187425) 2026-06-02 bdero@google.com [Flutter GPU] Add block-compressed texture format support (BC, ETC2, ASTC LDR) (flutter/flutter#187281) 2026-06-02 bdero@google.com [Impeller] Allow attaching specific texture mip levels and slices (flutter/flutter#187066) 2026-06-02 bdero@google.com [Impeller] Fix GLES command submission status before context is current (flutter/flutter#187293) 2026-06-02 engine-flutter-autoroll@skia.org Roll Dart SDK from 3cdc25e8ffe9 to d39850bf4a01 (9 revisions) (flutter/flutter#187409) 2026-06-01 jason-simmons@users.noreply.github.com [Impeller] Use glVertexAttribDivisor on GLES3 and glVertexAttribDivisorEXT on GLES2 with the extension (flutter/flutter#187313) 2026-06-01 matt.boetger@gmail.com [Android] Add Javadoc documentation to TextInputChannel (flutter/flutter#186018) 2026-06-01 mvincentong@gmail.com Read FLTEnableWideGamut from Dart bundle (flutter/flutter#186509) 2026-06-01 matt.boetger@gmail.com [flutter_tools] Remove obsolete AndroidX console warning during Gradle builds (flutter/flutter#186077) 2026-06-01 kjlubick@users.noreply.github.com [skia] Update gni file list name hsw -> ml3 (flutter/flutter#184892) 2026-06-01 zhongliu88889@gmail.com [web] Always sync slider input attrs regardless of gesture mode (flutter/flutter#187217) 2026-06-01 zhongliu88889@gmail.com [flutter_driver] Don't throw when stderr is unavailable on web (flutter/flutter#187190) 2026-06-01 116356835+AbdeMohlbi@users.noreply.github.com Remove unused code in `FlutterPluginUtils.kt` (flutter/flutter#187012) 2026-06-01 taak140@gmail.com [flutter_tools] Fix `flutter drive --chrome-binary` being ignored on web (flutter/flutter#185481) 2026-06-01 davidmartos96@gmail.com Eager failure when building and no XCode build settings (flutter/flutter#184726) 2026-06-01 goung123@gmail.com Fix Windows Korean IME caret position during composition (flutter/flutter#186353) 2026-06-01 okorohelijah@google.com iOS: update provisioning profile for 2026-2027 cert (flutter/flutter#187280) 2026-06-01 154381524+flutteractionsbot@users.noreply.github.com Sync CHANGELOG.md from stable (flutter/flutter#187380) 2026-06-01 jason-simmons@users.noreply.github.com Reland "Move dart-lang/ai to a top level third party dependency in engine (#187268)" (flutter/flutter#187378) 2026-06-01 stuartmorgan@google.com Add vector_math to Framework triage (flutter/flutter#187389) 2026-06-01 engine-flutter-autoroll@skia.org Roll Packages from e930ced to f5d50ca (4 revisions) (flutter/flutter#187381) 2026-06-01 mr_nadeem_iqbal@yahoo.com [flutter_tools] Reject archive entries that escape into a sibling directory by name prefix (#185794) (flutter/flutter#186647) 2026-06-01 bkonyi@google.com [flutter_tools] Fix widget_preview unawaited async write race condition (flutter/flutter#187177) 2026-06-01 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#187375) 2026-06-01 engine-flutter-autoroll@skia.org Roll Skia from 0aee4675e0ad to c97e939eb5c9 (7 revisions) (flutter/flutter#187371) 2026-06-01 mr_nadeem_iqbal@yahoo.com docs: Stack.clipBehavior = Clip.none does not extend hit testing (#160787) (flutter/flutter#186643) 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 stuartmorgan@google.com,tarrinneal@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
Contributor
|
Failed to create CP due to merge conflicts. |
8 tasks
camsim99
pushed a commit
to flutteractionsbot/flutter
that referenced
this pull request
Jun 10, 2026
…gine (flutter#187268)" (flutter#187378) Includes: * a manual Dart roll to 3cdc25e8ffe98c61b36af485573639dc833b75cb * updates to `run_verify_binaries_codesigned_tests.dart` that match the current state of the Dart SDK binaries --------- Co-authored-by: Jacob MacDonald <jakemac@google.com> Co-authored-by: Alexander Aprelev <aam@google.com>
10 tasks
auto-submit Bot
pushed a commit
that referenced
this pull request
Jun 12, 2026
….pre release (#187872) Updates DEPS to update the Dart revision to aad8be4ce3077a809f0b4f3325c6d8a6908aad54 and makes the following changes that Dart version update (this list includes all of the commits in this PR!!): | Commit | Reasoning | | ------------- | ------------- | |9cddb59 | New Dart version removed `ai` repository from their internal DEPS in dart-lang/sdk@06bdbd7 (cherry pick of #187378) | | a6fb7ec | Actual commit that updates Dart version 🎯 | | 527ebc7 | Required to compile the engine with the new Dart version (cherry pick of #187013) | | 37c44d7 | Also required to compile the engine with the new Dart version (cherry pick of #187091) | | aafb985 | Ignore; reverted in 03b6bf1 | | dc91998 | Update LICENSES according to new Dart version | | 2cd036e | Ignore; reverted in 03b6bf1 | | 50a3ace | Formats engine Dart files according to updated formatter in new version of Dart SDK (part of #186690) | | ec37bf7 | Updated snapshot symbol assertions as a consequence of dart-lang/sdk@d36adba (cherry pick of #186812) | | a46d1e8 | Same as above | | 5a21bc3 | Fixes new `unawaited_return_in_try_block` analyzer errors caused by new Dart version (part of #186690) | |03b6bf1 | Reverts unnecessary analysis errors I added earlier } All of these fixes are included in this PR because their causes are a consequence of updating the Dart revision to the latest Dart beta (3.13.0-167.1.beta). Part of #187787. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.
LongCatIsLooong
added a commit
to LongCatIsLooong/flutter
that referenced
this pull request
Jun 15, 2026
auto-submit Bot
pushed a commit
that referenced
this pull request
Jun 16, 2026
… test to include new Dart snapshots (#188050) to unblock the beta candidate tree. This CP combines #186754 and #187378. Also added an empty line to a `.mm` file to trigger engine rebuild. This change won't be merged back to master so the empty line should be fine. This commit, if merged, won't have an entry in the changelog since it is not user-facing / does not affect app / plugin devs. Re: the list of binaries, [the most recent 2 commits on master](https://github.com/flutter/flutter/commits/master/dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart) that edited `run_verify_binaries_codesigned_tests.dart` have both been cherry-picked into the beta branch. I have verified that `git diff upstream/master -- dev/bots/suite_runners/run_verify_binaries_codesigned_tests.dart` is clean. `SHARD=verify_binaries_pre_codesigned bin/cache/dart-sdk/bin/dart dev/bots/test.dart` fails but that's likely because the engine revision was still on 0a9f488c13. The current dart revision is [aad8be4ce3077a809f0b4f3325c6d8a6908aad54](https://dart.googlesource.com/sdk/+show/aad8be4ce3077a809f0b4f3325c6d8a6908aad54) > Version 3.13.0-167.1.beta > > Merge 3.13.0-167.0.dev into beta The dart revision associated with #186754 was [66873d2da857](https://dart.googlesource.com/sdk/+show/66873d2da857), > Version 3.13.0-108.0.dev > > Merge 0aa709e8cce030d45dd6173f70e6963752f0130e into dev The dart revision associated with #187378 was [3cdc25e8ffe98c61b36af485573639dc833b75cb](https://dart.googlesource.com/sdk/+show/3cdc25e8ffe98c61b36af485573639dc833b75cb) > Version 3.13.0-149.0.dev > > Merge f710c4338a82b73e780519893cba959b38db1778 into dev
13 tasks
via-guy
pushed a commit
to via-guy/flutter
that referenced
this pull request
Jun 26, 2026
…gine (flutter#187268)" (flutter#187378) Includes: * a manual Dart roll to 3cdc25e8ffe98c61b36af485573639dc833b75cb * updates to `run_verify_binaries_codesigned_tests.dart` that match the current state of the Dart SDK binaries --------- Co-authored-by: Jacob MacDonald <jakemac@google.com> Co-authored-by: Alexander Aprelev <aam@google.com>
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
5 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.
Includes:
run_verify_binaries_codesigned_tests.dartthat match the current state of the Dart SDK binaries