Skip to content
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

[tool] Improve using project files in build targets #166211

Merged
merged 2 commits into from
Apr 1, 2025

Conversation

loic-sharma
Copy link
Member

The Flutter tool's build system executes targets that take inputs and produces outputs. Previously, targets would hardcode paths if they needed to use Flutter project files as inputs/outputs. For example:

class FooTarget extends Target {
  @override
  List<Source> get inputs => <Source>[
    Source.pattern('{PROJECT_DIR}/foo/bar'),
  ];
}

This is problematic as the FlutterProject is the source of truth for where a Flutter project's files are located:

  1. If we change a project file's location, we need to update FlutterProject as well as any hardcoded target inputs/outputs.
  2. Project files' location can be dynamic. For example, a Flutter app puts iOS files in the ios/ directory, but a Flutter module puts iOS files in the .ios/ directory. Targets need to duplicate FlutterProject's logic to determine the project file's location.

As a result, hardcoding project file paths in targets can be error-prone.

This introduces a new Source factory that lets you use the FlutterProject to create the source:

class FooTarget extends Target {
  @override
  List<Source> get inputs => <Source>[
    Source.fromProject((FlutterProject project) => project.fooFile),
  ];
}

Part of #163874

Next pull request: #165916

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@github-actions github-actions bot added tool Affects the "flutter" command-line tool. See also t: labels. team-ios Owned by iOS platform team labels Mar 30, 2025
@@ -222,12 +226,26 @@ class SourceVisitor implements ResolvedFiles {
}
sources.add(entity as File);
}

void visitProjectSource(ProjectSourceBuilder builder, bool optional) {
final File source = builder(_project);
Copy link
Member Author

@loic-sharma loic-sharma Mar 30, 2025

Choose a reason for hiding this comment

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

In the future, we could allow the builder to return Files or Directorys by changing its return type to FileSystemEntity. We don't have any scenarios that need this today, so I didn't implement this.

@loic-sharma loic-sharma requested review from vashworth and bkonyi March 31, 2025 17:44
Copy link
Contributor

@vashworth vashworth left a comment

Choose a reason for hiding this comment

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

Awesome improvement!

/// The source is provided by a [FlutterProject].
///
/// If [optional] is true, the file is not required to exist. In this case, it
/// is never resolved as an input.
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: Can you provide an example in the comment?

Copy link
Member Author

Choose a reason for hiding this comment

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

Added!

@loic-sharma loic-sharma requested a review from a team as a code owner March 31, 2025 22:47
@loic-sharma loic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 1, 2025
@auto-submit auto-submit bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 1, 2025
Copy link
Contributor

auto-submit bot commented Apr 1, 2025

autosubmit label was removed for flutter/flutter/166211, because - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label.

@loic-sharma loic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 1, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Apr 1, 2025
Merged via the queue into flutter:master with commit a48a1f0 Apr 1, 2025
138 checks passed
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 1, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 1, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 1, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 1, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 1, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 2, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 2, 2025
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Apr 2, 2025
Roll Flutter from 05b5e7910544 to a0b1b3253416 (37 revisions)

flutter/flutter@05b5e79...a0b1b32

2025-04-01 [email protected] Roll Dart SDK from b4d374ec59ec to 4e1f02bc704f (2 revisions) (flutter/flutter#166342)
2025-04-01 [email protected] Trim any text before osascript JSON response (flutter/flutter#166296)
2025-04-01 [email protected] [Gen-l10n] Add `Message.resourceId` and `locale` to all `L10nException` error messages (flutter/flutter#163654)
2025-04-01 [email protected] Add `--ignore-timeouts` flag for `flutter test` command (flutter/flutter#164437)
2025-04-01 [email protected] Update TESTOWNERS username (flutter/flutter#166191)
2025-04-01 [email protected] Roll Skia from 4b07443e6071 to 52cbb917fffd (4 revisions) (flutter/flutter#166329)
2025-04-01 [email protected] Roll Dart SDK from 6b07a09cbd2d to b4d374ec59ec (2 revisions) (flutter/flutter#166321)
2025-04-01 [email protected] [tool] Improve using project files in build targets (flutter/flutter#166211)
2025-04-01 [email protected] Rename FlRenderer to FlCompositorOpenGL (flutter/flutter#166037)
2025-04-01 [email protected] [engine, web_ui] Fix instances of library_private_types_in_public_api (flutter/flutter#166156)
2025-04-01 [email protected] Roll Dart SDK from 509faa921c95 to 6b07a09cbd2d (1 revision) (flutter/flutter#166301)
2025-04-01 [email protected] [Impeller] small cpu perf for text contents. (flutter/flutter#166199)
2025-04-01 [email protected] [android_engine_test] disable old HC mode tests. (flutter/flutter#166293)
2025-04-01 [email protected] [impeller] fixes diagonal antialiased lines (flutter/flutter#166298)
2025-04-01 [email protected] Roll Skia from 5f262bd2cbb4 to 4b07443e6071 (10 revisions) (flutter/flutter#166299)
2025-03-31 [email protected] [Impeller] Directly tessellate conics to linear path segments (flutter/flutter#166165)
2025-03-31 [email protected] [tool] Don't write the .flutter-plugins-dependencies file if it is unchanged (flutter/flutter#166164)
2025-03-31 [email protected] Move `.cxx` directory out of `android/app` (flutter/flutter#166277)
2025-03-31 [email protected] Fix typo in carousel.dart (flutter/flutter#164727)
2025-03-31 [email protected] Roll Dart SDK from c5fa06710bb6 to 509faa921c95 (1 revision) (flutter/flutter#166283)
2025-03-31 [email protected] Public nodes needing paint or layout (flutter/flutter#166148)
2025-03-31 [email protected] [Gen-l10n] Infer placeholder types on both templates and localizations (flutter/flutter#163690)
2025-03-31 [email protected] [Engine][iOS] Cancel animation when recieved `UIKeyboardWillHideNotification` with duration 0.0 (flutter/flutter#164884)
2025-03-31 [email protected] [fuchsia] Remove explicit LogSink and InspectSink routing and use dictionaries instead (flutter/flutter#162780)
2025-03-31 [email protected] Updated to latest AVD to Support Android 16 (API 36) (flutter/flutter#165926)
2025-03-31 [email protected] Feat: Add brightnessOf method for theme (flutter/flutter#163733)
2025-03-31 [email protected] Marks Linux_mokey new_gallery__crane_perf to be flaky (flutter/flutter#165964)
2025-03-31 [email protected] [ Tool ] Correctly select entrypoint target for web build from positional argument list (flutter/flutter#166260)
2025-03-31 [email protected] [Impeller] remove validation warning ignores. (flutter/flutter#166205)
2025-03-31 [email protected] [Impeller] handle shader ordering bug on macOS. (flutter/flutter#165937)
2025-03-31 [email protected] Fix CODEOWNERS for the iOS review team (flutter/flutter#166178)
2025-03-31 [email protected] Remove `<meta content="IE=Edge" http-equiv="X-UA-Compatible">` (flutter/flutter#166252)
2025-03-31 [email protected] Roll Dart SDK from b9c35e05feb5 to c5fa06710bb6 (1 revision) (flutter/flutter#166251)
2025-03-31 [email protected] Roll Skia from 418c68ea5ccb to 5f262bd2cbb4 (2 revisions) (flutter/flutter#166244)
2025-03-31 [email protected] Roll Skia from b6a3bbd1d153 to 418c68ea5ccb (1 revision) (flutter/flutter#166236)
2025-03-31 [email protected] [Impeller] fix min filter for GL external textures. (flutter/flutter#166224)
2025-03-31 [email protected] Roll Skia from 10f4cf9a817d to b6a3bbd1d153 (13 revisions) (flutter/flutter#166231)

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 [email protected],[email protected] 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

...
masterromuald pushed a commit to masterromuald/packages that referenced this pull request Apr 3, 2025
…r#8985)

Roll Flutter from 05b5e7910544 to a0b1b3253416 (37 revisions)

flutter/flutter@05b5e79...a0b1b32

2025-04-01 [email protected] Roll Dart SDK from b4d374ec59ec to 4e1f02bc704f (2 revisions) (flutter/flutter#166342)
2025-04-01 [email protected] Trim any text before osascript JSON response (flutter/flutter#166296)
2025-04-01 [email protected] [Gen-l10n] Add `Message.resourceId` and `locale` to all `L10nException` error messages (flutter/flutter#163654)
2025-04-01 [email protected] Add `--ignore-timeouts` flag for `flutter test` command (flutter/flutter#164437)
2025-04-01 [email protected] Update TESTOWNERS username (flutter/flutter#166191)
2025-04-01 [email protected] Roll Skia from 4b07443e6071 to 52cbb917fffd (4 revisions) (flutter/flutter#166329)
2025-04-01 [email protected] Roll Dart SDK from 6b07a09cbd2d to b4d374ec59ec (2 revisions) (flutter/flutter#166321)
2025-04-01 [email protected] [tool] Improve using project files in build targets (flutter/flutter#166211)
2025-04-01 [email protected] Rename FlRenderer to FlCompositorOpenGL (flutter/flutter#166037)
2025-04-01 [email protected] [engine, web_ui] Fix instances of library_private_types_in_public_api (flutter/flutter#166156)
2025-04-01 [email protected] Roll Dart SDK from 509faa921c95 to 6b07a09cbd2d (1 revision) (flutter/flutter#166301)
2025-04-01 [email protected] [Impeller] small cpu perf for text contents. (flutter/flutter#166199)
2025-04-01 [email protected] [android_engine_test] disable old HC mode tests. (flutter/flutter#166293)
2025-04-01 [email protected] [impeller] fixes diagonal antialiased lines (flutter/flutter#166298)
2025-04-01 [email protected] Roll Skia from 5f262bd2cbb4 to 4b07443e6071 (10 revisions) (flutter/flutter#166299)
2025-03-31 [email protected] [Impeller] Directly tessellate conics to linear path segments (flutter/flutter#166165)
2025-03-31 [email protected] [tool] Don't write the .flutter-plugins-dependencies file if it is unchanged (flutter/flutter#166164)
2025-03-31 [email protected] Move `.cxx` directory out of `android/app` (flutter/flutter#166277)
2025-03-31 [email protected] Fix typo in carousel.dart (flutter/flutter#164727)
2025-03-31 [email protected] Roll Dart SDK from c5fa06710bb6 to 509faa921c95 (1 revision) (flutter/flutter#166283)
2025-03-31 [email protected] Public nodes needing paint or layout (flutter/flutter#166148)
2025-03-31 [email protected] [Gen-l10n] Infer placeholder types on both templates and localizations (flutter/flutter#163690)
2025-03-31 [email protected] [Engine][iOS] Cancel animation when recieved `UIKeyboardWillHideNotification` with duration 0.0 (flutter/flutter#164884)
2025-03-31 [email protected] [fuchsia] Remove explicit LogSink and InspectSink routing and use dictionaries instead (flutter/flutter#162780)
2025-03-31 [email protected] Updated to latest AVD to Support Android 16 (API 36) (flutter/flutter#165926)
2025-03-31 [email protected] Feat: Add brightnessOf method for theme (flutter/flutter#163733)
2025-03-31 [email protected] Marks Linux_mokey new_gallery__crane_perf to be flaky (flutter/flutter#165964)
2025-03-31 [email protected] [ Tool ] Correctly select entrypoint target for web build from positional argument list (flutter/flutter#166260)
2025-03-31 [email protected] [Impeller] remove validation warning ignores. (flutter/flutter#166205)
2025-03-31 [email protected] [Impeller] handle shader ordering bug on macOS. (flutter/flutter#165937)
2025-03-31 [email protected] Fix CODEOWNERS for the iOS review team (flutter/flutter#166178)
2025-03-31 [email protected] Remove `<meta content="IE=Edge" http-equiv="X-UA-Compatible">` (flutter/flutter#166252)
2025-03-31 [email protected] Roll Dart SDK from b9c35e05feb5 to c5fa06710bb6 (1 revision) (flutter/flutter#166251)
2025-03-31 [email protected] Roll Skia from 418c68ea5ccb to 5f262bd2cbb4 (2 revisions) (flutter/flutter#166244)
2025-03-31 [email protected] Roll Skia from b6a3bbd1d153 to 418c68ea5ccb (1 revision) (flutter/flutter#166236)
2025-03-31 [email protected] [Impeller] fix min filter for GL external textures. (flutter/flutter#166224)
2025-03-31 [email protected] Roll Skia from 10f4cf9a817d to b6a3bbd1d153 (13 revisions) (flutter/flutter#166231)

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 [email protected],[email protected] 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

...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants