Skip to content

[native_assets] Roll dependencies #166282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 3, 2025
Merged

Conversation

dcharkes
Copy link
Contributor

@dcharkes dcharkes commented Mar 31, 2025

Updating the dart-lang/native dependencies to the ones published today.

No functional changes, but CodeAsset does not expose an architecture and os anymore (dart-lang/native#2127). Instead these should be taken from what is passed in for the CodeConfig. This PR refactors the DartBuildResult to carry around the Target with CodeAssets as FlutterCodeAssets.

(This PR avoid refactoring relevant code due to #164094 already refactoring this code.)

@dcharkes dcharkes requested review from a team and matanlurey as code owners March 31, 2025 19:18
@github-actions github-actions bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop team-ios Owned by iOS platform team labels Mar 31, 2025
@dcharkes dcharkes requested a review from bkonyi March 31, 2025 19:18
@matanlurey matanlurey removed their request for review March 31, 2025 20:15
@dcharkes dcharkes requested a review from mosuem April 1, 2025 07:24
Copy link
Contributor

@bkonyi bkonyi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally LGTM with a couple of nits.

final List<Uri> dependencies;

Map<String, Object?> toJson() => <String, Object?>{
'dependencies': <Object?>[for (final Uri dep in dependencies) dep.toString()],
'code_assets': <Object?>[for (final CodeAsset code in codeAssets) code.encode().toJson()],
'code_assets': <Object?>[
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit for a possible follow up PR: if we're encoding / decoding JSON, we should define keys as constants to avoid accidentally introducing bugs with typos.

];
}

class FlutterCodeAsset {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have some basic documentation.

@dcharkes dcharkes added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 2, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Apr 2, 2025
@matanlurey matanlurey removed this pull request from the merge queue due to a manual request Apr 2, 2025
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 2, 2025
@dcharkes dcharkes added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Apr 3, 2025
Merged via the queue into master with commit dec31cb Apr 3, 2025
152 checks passed
@auto-submit auto-submit bot deleted the roll-native-assets-2025-04-01 branch April 3, 2025 06:11
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 3, 2025
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Apr 3, 2025
Roll Flutter from a0b1b3253416 to 02f13c37841f (37 revisions)

flutter/flutter@a0b1b32...02f13c3

2025-04-03 engine-flutter-autoroll@skia.org Roll Packages from 07496eb to 4a36dc6 (3 revisions) (flutter/flutter#166542)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from b67e53719e78 to 5f65df75febd (2 revisions) (flutter/flutter#166538)
2025-04-03 magder@google.com Update docs to debug the Android embedder (flutter/flutter#166170)
2025-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 72562ca93bb5 to d174ec16c3ea (1 revision) (flutter/flutter#166525)
2025-04-03 matej.knopp@gmail.com [macOS] Implement merged UI and platform thread (flutter/flutter#162883)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from f91412f5d89d to b67e53719e78 (1 revision) (flutter/flutter#166527)
2025-04-03 engine-flutter-autoroll@skia.org Roll Packages from 125c117 to 07496eb (31 revisions) (flutter/flutter#166457)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from 2be12bc2668b to f91412f5d89d (2 revisions) (flutter/flutter#166517)
2025-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 2a1a13cc3a91 to 72562ca93bb5 (2 revisions) (flutter/flutter#166514)
2025-04-03 dacoharkes@google.com [native_assets] Roll dependencies (flutter/flutter#166282)
2025-04-03 bruno.leroux@gmail.com Fix read only TextField focus traversal on macOS (flutter/flutter#166056)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from c106d7831592 to 2be12bc2668b (1 revision) (flutter/flutter#166509)
2025-04-03 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from v7PGvypiiWLO8PbsZ... to vYisSsIgqw0mqFRVJ... (flutter/flutter#166508)
2025-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from b8b4076b1237 to 2a1a13cc3a91 (1 revision) (flutter/flutter#166504)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from 75a0ec473181 to c106d7831592 (1 revision) (flutter/flutter#166499)
2025-04-03 34465683+rkishan516@users.noreply.github.com Migrate to Theme.brightnessOf method (flutter/flutter#163950)
2025-04-03 34465683+rkishan516@users.noreply.github.com Fix: Range slider show overlay for both thumbs on hovering one (flutter/flutter#165393)
2025-04-03 victorsanniay@gmail.com Deprecate ExpansionTileController (flutter/flutter#166368)
2025-04-03 kalathiyadimil@gmail.com Add styling parameters in `PopupMenuDivider` (flutter/flutter#164790)
2025-04-03 matanlurey@users.noreply.github.com Fix ISSUE_TEMPLATE Ordering: `10 < 9`, but `10 > 09` (flutter/flutter#166455)
2025-04-03 katelovett@google.com Skip flaking scheduler test (flutter/flutter#166471)
2025-04-02 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#166043)
2025-04-02 yjbanov@google.com [a11y] add SemanticsValidationResult (flutter/flutter#165935)
2025-04-02 58529443+srujzs@users.noreply.github.com Remove unnecessary cache busting mechanism in hot restart (flutter/flutter#166295)
2025-04-02 engine-flutter-autoroll@skia.org Roll Skia from 52cbb917fffd to 75a0ec473181 (21 revisions) (flutter/flutter#166484)
2025-04-02 30870216+gaaclarke@users.noreply.github.com Started pixel aligning hairlines (flutter/flutter#166351)
2025-04-02 47866232+chunhtai@users.noreply.github.com Adds semantics role and adjust semantics for navigation bar (flutter/flutter#162467)
2025-04-02 jacksongardner@google.com Reland "[skwasm] Dynamic Threading" (flutter/flutter#166454)
2025-04-02 dkwingsmt@users.noreply.github.com [dart:ui] Add `Path.addRSuperellipse` (flutter/flutter#166045)
2025-04-02 34465683+rkishan516@users.noreply.github.com Fix: Hero animation for page transition (flutter/flutter#164469)
2025-04-02 34465683+rkishan516@users.noreply.github.com Fix: DelegateTransition for cupertino sheet route (flutter/flutter#164675)
2025-04-02 engine-flutter-autoroll@skia.org Roll Fuchsia Test Scripts from AEdsljKmUiPk92Wvv... to FZdRtNwH7jmADecj6... (flutter/flutter#166383)
2025-04-02 jonahwilliams@google.com [Impeller] cache for text shadows. (flutter/flutter#166228)
2025-04-02 34871572+gmackall@users.noreply.github.com Convert `AppPluginLoaderPlugin` to Kotlin, and add `NativePluginLoaderReflectionBridge` to expose it in Kotlin (flutter/flutter#166027)
2025-04-02 engine-flutter-autoroll@skia.org Roll Dart SDK from 4e1f02bc704f to b8b4076b1237 (7 revisions) (flutter/flutter#166474)
2025-04-02 mit@google.com Update Roadmap (flutter/flutter#166332)
2025-04-02 matanlurey@users.noreply.github.com Update `CODEOWNERS` (flutter/flutter#166444)

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 bmparr@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

...
CodixNinja pushed a commit to CodixNinja/packages that referenced this pull request May 15, 2025
Roll Flutter from a0b1b3253416 to 02f13c37841f (37 revisions)

flutter/flutter@a0b1b32...02f13c3

2025-04-03 engine-flutter-autoroll@skia.org Roll Packages from d10d5af to 95f8e65 (3 revisions) (flutter/flutter#166542)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from b67e53719e78 to 5f65df75febd (2 revisions) (flutter/flutter#166538)
2025-04-03 magder@google.com Update docs to debug the Android embedder (flutter/flutter#166170)
2025-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 72562ca93bb5 to d174ec16c3ea (1 revision) (flutter/flutter#166525)
2025-04-03 matej.knopp@gmail.com [macOS] Implement merged UI and platform thread (flutter/flutter#162883)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from f91412f5d89d to b67e53719e78 (1 revision) (flutter/flutter#166527)
2025-04-03 engine-flutter-autoroll@skia.org Roll Packages from 0d5d57b to d10d5af (31 revisions) (flutter/flutter#166457)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from 2be12bc2668b to f91412f5d89d (2 revisions) (flutter/flutter#166517)
2025-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from 2a1a13cc3a91 to 72562ca93bb5 (2 revisions) (flutter/flutter#166514)
2025-04-03 dacoharkes@google.com [native_assets] Roll dependencies (flutter/flutter#166282)
2025-04-03 bruno.leroux@gmail.com Fix read only TextField focus traversal on macOS (flutter/flutter#166056)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from c106d7831592 to 2be12bc2668b (1 revision) (flutter/flutter#166509)
2025-04-03 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from v7PGvypiiWLO8PbsZ... to vYisSsIgqw0mqFRVJ... (flutter/flutter#166508)
2025-04-03 engine-flutter-autoroll@skia.org Roll Dart SDK from b8b4076b1237 to 2a1a13cc3a91 (1 revision) (flutter/flutter#166504)
2025-04-03 engine-flutter-autoroll@skia.org Roll Skia from 75a0ec473181 to c106d7831592 (1 revision) (flutter/flutter#166499)
2025-04-03 34465683+rkishan516@users.noreply.github.com Migrate to Theme.brightnessOf method (flutter/flutter#163950)
2025-04-03 34465683+rkishan516@users.noreply.github.com Fix: Range slider show overlay for both thumbs on hovering one (flutter/flutter#165393)
2025-04-03 victorsanniay@gmail.com Deprecate ExpansionTileController (flutter/flutter#166368)
2025-04-03 kalathiyadimil@gmail.com Add styling parameters in `PopupMenuDivider` (flutter/flutter#164790)
2025-04-03 matanlurey@users.noreply.github.com Fix ISSUE_TEMPLATE Ordering: `10 < 9`, but `10 > 09` (flutter/flutter#166455)
2025-04-03 katelovett@google.com Skip flaking scheduler test (flutter/flutter#166471)
2025-04-02 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#166043)
2025-04-02 yjbanov@google.com [a11y] add SemanticsValidationResult (flutter/flutter#165935)
2025-04-02 58529443+srujzs@users.noreply.github.com Remove unnecessary cache busting mechanism in hot restart (flutter/flutter#166295)
2025-04-02 engine-flutter-autoroll@skia.org Roll Skia from 52cbb917fffd to 75a0ec473181 (21 revisions) (flutter/flutter#166484)
2025-04-02 30870216+gaaclarke@users.noreply.github.com Started pixel aligning hairlines (flutter/flutter#166351)
2025-04-02 47866232+chunhtai@users.noreply.github.com Adds semantics role and adjust semantics for navigation bar (flutter/flutter#162467)
2025-04-02 jacksongardner@google.com Reland "[skwasm] Dynamic Threading" (flutter/flutter#166454)
2025-04-02 dkwingsmt@users.noreply.github.com [dart:ui] Add `Path.addRSuperellipse` (flutter/flutter#166045)
2025-04-02 34465683+rkishan516@users.noreply.github.com Fix: Hero animation for page transition (flutter/flutter#164469)
2025-04-02 34465683+rkishan516@users.noreply.github.com Fix: DelegateTransition for cupertino sheet route (flutter/flutter#164675)
2025-04-02 engine-flutter-autoroll@skia.org Roll Fuchsia Test Scripts from AEdsljKmUiPk92Wvv... to FZdRtNwH7jmADecj6... (flutter/flutter#166383)
2025-04-02 jonahwilliams@google.com [Impeller] cache for text shadows. (flutter/flutter#166228)
2025-04-02 34871572+gmackall@users.noreply.github.com Convert `AppPluginLoaderPlugin` to Kotlin, and add `NativePluginLoaderReflectionBridge` to expose it in Kotlin (flutter/flutter#166027)
2025-04-02 engine-flutter-autoroll@skia.org Roll Dart SDK from 4e1f02bc704f to b8b4076b1237 (7 revisions) (flutter/flutter#166474)
2025-04-02 mit@google.com Update Roadmap (flutter/flutter#166332)
2025-04-02 matanlurey@users.noreply.github.com Update `CODEOWNERS` (flutter/flutter#166444)

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 bmparr@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

...
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 20, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a: desktop Running on desktop team-ios Owned by iOS platform team tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants