diff --git a/packages/flutter_tools/lib/executable.dart b/packages/flutter_tools/lib/executable.dart index 9927cf906b3..a1894b0f7cd 100644 --- a/packages/flutter_tools/lib/executable.dart +++ b/packages/flutter_tools/lib/executable.dart @@ -11,6 +11,7 @@ import 'src/base/platform.dart'; import 'src/base/template.dart'; import 'src/base/terminal.dart'; import 'src/base/user_messages.dart'; +import 'src/build_system/build_targets.dart'; import 'src/cache.dart'; import 'src/commands/analyze.dart'; import 'src/commands/assemble.dart'; @@ -47,6 +48,7 @@ import 'src/devtools_launcher.dart'; import 'src/features.dart'; import 'src/globals.dart' as globals; // Files in `isolated` are intentionally excluded from google3 tooling. +import 'src/isolated/build_targets.dart'; import 'src/isolated/mustache_template.dart'; import 'src/isolated/resident_web_runner.dart'; import 'src/pre_run_validator.dart'; @@ -110,6 +112,7 @@ Future main(List args) async { logger: globals.logger, botDetector: globals.botDetector, ), + BuildTargets: () => const BuildTargetsImpl(), Logger: () { final LoggerFactory loggerFactory = LoggerFactory( outputPreferences: globals.outputPreferences, diff --git a/packages/flutter_tools/lib/src/build_system/build_targets.dart b/packages/flutter_tools/lib/src/build_system/build_targets.dart new file mode 100644 index 00000000000..8a71c0bc233 --- /dev/null +++ b/packages/flutter_tools/lib/src/build_system/build_targets.dart @@ -0,0 +1,58 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import '../base/file_system.dart'; +import '../web/compiler_config.dart'; +import './build_system.dart'; + +/// Commonly used build [Target]s. +abstract class BuildTargets { + const BuildTargets(); + + Target get copyFlutterBundle; + Target get releaseCopyFlutterBundle; + Target get generateLocalizationsTarget; + Target get dartPluginRegistrantTarget; + Target webServiceWorker(FileSystem fileSystem, List compileConfigs); +} + +/// BuildTargets that return NoOpTarget for every action. +class NoOpBuildTargets extends BuildTargets { + const NoOpBuildTargets(); + + @override + Target get copyFlutterBundle => const _NoOpTarget(); + + @override + Target get releaseCopyFlutterBundle => const _NoOpTarget(); + + @override + Target get generateLocalizationsTarget => const _NoOpTarget(); + + @override + Target get dartPluginRegistrantTarget => const _NoOpTarget(); + + @override + Target webServiceWorker(FileSystem fileSystem, List compileConfigs) => const _NoOpTarget(); +} + +/// A [Target] that does nothing. +class _NoOpTarget extends Target { + const _NoOpTarget(); + + @override + String get name => 'no_op'; + + @override + List get inputs => const []; + + @override + List get outputs => const []; + + @override + List get dependencies => const []; + + @override + Future build(Environment environment) async {} +} diff --git a/packages/flutter_tools/lib/src/build_system/targets/assets.dart b/packages/flutter_tools/lib/src/build_system/targets/assets.dart index 8b5d8275a90..14424b51b4b 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/assets.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/assets.dart @@ -12,10 +12,10 @@ import '../../convert.dart'; import '../../devfs.dart'; import '../build_system.dart'; import '../depfile.dart'; +import '../tools/scene_importer.dart'; +import '../tools/shader_compiler.dart'; import 'common.dart'; import 'icon_tree_shaker.dart'; -import 'scene_importer.dart'; -import 'shader_compiler.dart'; /// A helper function to copy an asset bundle into an [environment]'s output /// directory. diff --git a/packages/flutter_tools/lib/src/build_system/targets/common.dart b/packages/flutter_tools/lib/src/build_system/targets/common.dart index 46f35b7e95b..ba03270c526 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/common.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/common.dart @@ -16,12 +16,12 @@ import '../../globals.dart' as globals show xcode; import '../build_system.dart'; import '../depfile.dart'; import '../exceptions.dart'; +import '../tools/shader_compiler.dart'; import 'assets.dart'; import 'dart_plugin_registrant.dart'; import 'icon_tree_shaker.dart'; import 'localizations.dart'; import 'native_assets.dart'; -import 'shader_compiler.dart'; /// Copies the pre-built flutter bundle. // This is a one-off rule for implementing build bundle in terms of assemble. diff --git a/packages/flutter_tools/lib/src/build_system/targets/ios.dart b/packages/flutter_tools/lib/src/build_system/targets/ios.dart index f05a91e3501..9ca6e543a20 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/ios.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/ios.dart @@ -20,10 +20,10 @@ import '../../reporting/reporting.dart'; import '../build_system.dart'; import '../depfile.dart'; import '../exceptions.dart'; +import '../tools/shader_compiler.dart'; import 'assets.dart'; import 'common.dart'; import 'icon_tree_shaker.dart'; -import 'shader_compiler.dart'; /// Supports compiling a dart kernel file to an assembly file. /// diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart index 7b5035c2f16..e8249b56144 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart @@ -29,15 +29,6 @@ import '../exceptions.dart'; import 'assets.dart'; import 'localizations.dart'; -/// Whether the application has web plugins. -const String kHasWebPlugins = 'HasWebPlugins'; - -/// Base href to set in index.html in flutter build command -const String kBaseHref = 'baseHref'; - -/// The caching strategy to use for service worker generation. -const String kServiceWorkerStrategy = 'ServiceWorkerStrategy'; - @visibleForTesting List updateDartDefines(List dartDefines, WebRendererMode webRenderer) { final Set dartDefinesSet = dartDefines.toSet(); diff --git a/packages/flutter_tools/lib/src/build_system/targets/scene_importer.dart b/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart similarity index 99% rename from packages/flutter_tools/lib/src/build_system/targets/scene_importer.dart rename to packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart index 1c10dfcd78f..b8e65958c6e 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/scene_importer.dart +++ b/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart @@ -92,7 +92,7 @@ class SceneImporter { /// See [Target.inputs]. static const List inputs = [ Source.pattern( - '{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/targets/scene_importer.dart'), + '{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/tools/scene_importer.dart'), Source.hostArtifact(HostArtifact.scenec), ]; diff --git a/packages/flutter_tools/lib/src/build_system/targets/shader_compiler.dart b/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart similarity index 99% rename from packages/flutter_tools/lib/src/build_system/targets/shader_compiler.dart rename to packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart index 4c9d48fb779..bef6474cabb 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/shader_compiler.dart +++ b/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart @@ -136,7 +136,7 @@ class ShaderCompiler { /// /// See [Target.inputs]. static const List inputs = [ - Source.pattern('{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/targets/shader_compiler.dart'), + Source.pattern('{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/tools/shader_compiler.dart'), Source.hostArtifact(HostArtifact.impellerc), ]; diff --git a/packages/flutter_tools/lib/src/bundle_builder.dart b/packages/flutter_tools/lib/src/bundle_builder.dart index f8d204db639..1a6c950aab8 100644 --- a/packages/flutter_tools/lib/src/bundle_builder.dart +++ b/packages/flutter_tools/lib/src/bundle_builder.dart @@ -12,9 +12,8 @@ import 'base/logger.dart'; import 'build_info.dart'; import 'build_system/build_system.dart'; import 'build_system/depfile.dart'; -import 'build_system/targets/common.dart'; -import 'build_system/targets/scene_importer.dart'; -import 'build_system/targets/shader_compiler.dart'; +import 'build_system/tools/scene_importer.dart'; +import 'build_system/tools/shader_compiler.dart'; import 'bundle.dart'; import 'cache.dart'; import 'devfs.dart'; @@ -78,8 +77,8 @@ class BundleBuilder { generateDartPluginRegistry: true, ); final Target target = buildInfo.mode == BuildMode.debug - ? const CopyFlutterBundle() - : const ReleaseCopyFlutterBundle(); + ? globals.buildTargets.copyFlutterBundle + : globals.buildTargets.releaseCopyFlutterBundle; final BuildResult result = await buildSystem.build(target, environment); if (!result.success) { diff --git a/packages/flutter_tools/lib/src/commands/create_base.dart b/packages/flutter_tools/lib/src/commands/create_base.dart index d69dc48910c..93c9050c9b0 100644 --- a/packages/flutter_tools/lib/src/commands/create_base.dart +++ b/packages/flutter_tools/lib/src/commands/create_base.dart @@ -544,6 +544,7 @@ abstract class CreateBase extends FlutterCommand { await generateLocalizationsSyntheticPackage( environment: environment, buildSystem: globals.buildSystem, + buildTargets: globals.buildTargets, ); } final List platformsForMigrateConfig = [SupportedPlatform.root]; diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart index e443ec994af..e9217782d7b 100644 --- a/packages/flutter_tools/lib/src/commands/packages.dart +++ b/packages/flutter_tools/lib/src/commands/packages.dart @@ -307,6 +307,7 @@ class PackagesGetCommand extends FlutterCommand { await generateLocalizationsSyntheticPackage( environment: environment, buildSystem: globals.buildSystem, + buildTargets: globals.buildTargets, ); } else if (rootProject.directory.childFile('l10n.yaml').existsSync()) { final Environment environment = Environment( diff --git a/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart b/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart index fdef6fd47ac..655b365fc6c 100644 --- a/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart +++ b/packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart @@ -8,11 +8,12 @@ import '../base/common.dart'; import '../base/file_system.dart'; import '../base/utils.dart'; import '../build_system/build_system.dart'; -import '../build_system/targets/localizations.dart'; +import '../build_system/build_targets.dart'; Future generateLocalizationsSyntheticPackage({ required Environment environment, required BuildSystem buildSystem, + required BuildTargets buildTargets, }) async { final FileSystem fileSystem = environment.fileSystem; @@ -54,7 +55,7 @@ Future generateLocalizationsSyntheticPackage({ } final BuildResult result = await buildSystem.build( - const GenerateLocalizationsTarget(), + buildTargets.generateLocalizationsTarget, environment, ); diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart index 6697b5fa635..298058f4a78 100644 --- a/packages/flutter_tools/lib/src/devfs.dart +++ b/packages/flutter_tools/lib/src/devfs.dart @@ -15,8 +15,8 @@ import 'base/logger.dart'; import 'base/net.dart'; import 'base/os.dart'; import 'build_info.dart'; -import 'build_system/targets/scene_importer.dart'; -import 'build_system/targets/shader_compiler.dart'; +import 'build_system/tools/scene_importer.dart'; +import 'build_system/tools/shader_compiler.dart'; import 'compile.dart'; import 'convert.dart' show base64, utf8; import 'vmservice.dart'; diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart index 9cdf8ad3a42..bb39d9b14d2 100644 --- a/packages/flutter_tools/lib/src/globals.dart +++ b/packages/flutter_tools/lib/src/globals.dart @@ -27,6 +27,7 @@ import 'base/terminal.dart'; import 'base/time.dart'; import 'base/user_messages.dart'; import 'build_system/build_system.dart'; +import 'build_system/build_targets.dart'; import 'cache.dart'; import 'custom_devices/custom_devices_config.dart'; import 'device.dart'; @@ -54,6 +55,7 @@ import 'version.dart'; Artifacts? get artifacts => context.get(); BuildSystem get buildSystem => context.get()!; +BuildTargets get buildTargets => context.get()!; Cache get cache => context.get()!; CocoaPodsValidator? get cocoapodsValidator => context.get(); Config get config => context.get()!; diff --git a/packages/flutter_tools/lib/src/isolated/build_targets.dart b/packages/flutter_tools/lib/src/isolated/build_targets.dart new file mode 100644 index 00000000000..e721495a289 --- /dev/null +++ b/packages/flutter_tools/lib/src/isolated/build_targets.dart @@ -0,0 +1,32 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import '../base/file_system.dart'; +import '../build_system/build_system.dart'; +import '../build_system/build_targets.dart'; +import '../build_system/targets/common.dart'; +import '../build_system/targets/dart_plugin_registrant.dart'; +import '../build_system/targets/localizations.dart'; +import '../build_system/targets/web.dart'; +import '../web/compiler_config.dart'; + +class BuildTargetsImpl extends BuildTargets { + const BuildTargetsImpl(); + + @override + Target get copyFlutterBundle => const CopyFlutterBundle(); + + @override + Target get releaseCopyFlutterBundle => const ReleaseCopyFlutterBundle(); + + @override + Target get generateLocalizationsTarget => const GenerateLocalizationsTarget(); + + @override + Target get dartPluginRegistrantTarget => const DartPluginRegistrantTarget(); + + @override + Target webServiceWorker(FileSystem fileSystem, List compileConfigs) => + WebServiceWorker(fileSystem, compileConfigs); +} diff --git a/packages/flutter_tools/lib/src/isolated/devfs_web.dart b/packages/flutter_tools/lib/src/isolated/devfs_web.dart index ac056760dac..61714715fb2 100644 --- a/packages/flutter_tools/lib/src/isolated/devfs_web.dart +++ b/packages/flutter_tools/lib/src/isolated/devfs_web.dart @@ -24,8 +24,8 @@ import '../base/logger.dart'; import '../base/net.dart'; import '../base/platform.dart'; import '../build_info.dart'; -import '../build_system/targets/scene_importer.dart'; -import '../build_system/targets/shader_compiler.dart'; +import '../build_system/tools/scene_importer.dart'; +import '../build_system/tools/shader_compiler.dart'; import '../bundle_builder.dart'; import '../cache.dart'; import '../compile.dart'; diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index 0b4d405883d..779543a421e 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -24,10 +24,8 @@ import 'base/terminal.dart'; import 'base/utils.dart'; import 'build_info.dart'; import 'build_system/build_system.dart'; -import 'build_system/targets/dart_plugin_registrant.dart'; -import 'build_system/targets/localizations.dart'; -import 'build_system/targets/scene_importer.dart'; -import 'build_system/targets/shader_compiler.dart'; +import 'build_system/tools/scene_importer.dart'; +import 'build_system/tools/shader_compiler.dart'; import 'bundle.dart'; import 'cache.dart'; import 'compile.dart'; @@ -1260,8 +1258,8 @@ abstract class ResidentRunner extends ResidentHandlers { ); final CompositeTarget compositeTarget = CompositeTarget([ - const GenerateLocalizationsTarget(), - const DartPluginRegistrantTarget(), + globals.buildTargets.generateLocalizationsTarget, + globals.buildTargets.dartPluginRegistrantTarget, ]); _lastBuild = await globals.buildSystem.buildIncremental( diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 6859b741b93..706737695eb 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -1707,6 +1707,7 @@ Run 'flutter -h' (or 'flutter -h') for available flutter commands and await generateLocalizationsSyntheticPackage( environment: environment, buildSystem: globals.buildSystem, + buildTargets: globals.buildTargets, ); await pub.get( diff --git a/packages/flutter_tools/lib/src/web/compile.dart b/packages/flutter_tools/lib/src/web/compile.dart index c16b0419b55..dd92d49d625 100644 --- a/packages/flutter_tools/lib/src/web/compile.dart +++ b/packages/flutter_tools/lib/src/web/compile.dart @@ -13,7 +13,6 @@ import '../base/project_migrator.dart'; import '../base/utils.dart'; import '../build_info.dart'; import '../build_system/build_system.dart'; -import '../build_system/targets/web.dart'; import '../cache.dart'; import '../flutter_plugins.dart'; import '../globals.dart' as globals; @@ -28,6 +27,15 @@ import 'migrations/scrub_generated_plugin_registrant.dart'; export 'compiler_config.dart'; +/// Whether the application has web plugins. +const String kHasWebPlugins = 'HasWebPlugins'; + +/// Base href to set in index.html in flutter build command +const String kBaseHref = 'baseHref'; + +/// The caching strategy to use for service worker generation. +const String kServiceWorkerStrategy = 'ServiceWorkerStrategy'; + class WebBuilder { WebBuilder({ required Logger logger, @@ -81,7 +89,7 @@ class WebBuilder { final Stopwatch sw = Stopwatch()..start(); try { final BuildResult result = await _buildSystem.build( - WebServiceWorker(_fileSystem, compilerConfigs), + globals.buildTargets.webServiceWorker(_fileSystem, compilerConfigs), Environment( projectDir: _fileSystem.currentDirectory, outputDir: outputDirectory, diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart index a1b6cec3564..c9abc4187d8 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/shader_compiler_test.dart @@ -9,7 +9,7 @@ import 'package:file_testing/file_testing.dart'; import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/devfs.dart'; import '../../../src/common.dart'; diff --git a/packages/flutter_tools/test/general.shard/cold_test.dart b/packages/flutter_tools/test/general.shard/cold_test.dart index 7b819057f70..e16015ee4cb 100644 --- a/packages/flutter_tools/test/general.shard/cold_test.dart +++ b/packages/flutter_tools/test/general.shard/cold_test.dart @@ -7,7 +7,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; diff --git a/packages/flutter_tools/test/general.shard/dart/generate_synthetic_packages_test.dart b/packages/flutter_tools/test/general.shard/dart/generate_synthetic_packages_test.dart index 2ec44bb43de..fe65d0f2655 100644 --- a/packages/flutter_tools/test/general.shard/dart/generate_synthetic_packages_test.dart +++ b/packages/flutter_tools/test/general.shard/dart/generate_synthetic_packages_test.dart @@ -9,8 +9,10 @@ import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/build_system/build_system.dart'; +import 'package:flutter_tools/src/build_system/build_targets.dart'; import 'package:flutter_tools/src/build_system/targets/localizations.dart'; import 'package:flutter_tools/src/dart/generate_synthetic_packages.dart'; +import 'package:flutter_tools/src/isolated/build_targets.dart'; import '../../src/common.dart'; import '../../src/fake_process_manager.dart'; @@ -55,6 +57,7 @@ void main() { () => generateLocalizationsSyntheticPackage( environment: environment, buildSystem: buildSystem, + buildTargets: const BuildTargetsImpl(), ), throwsToolExit(message: 'Generating synthetic localizations package failed with 1 error:' @@ -104,6 +107,7 @@ void main() { () => generateLocalizationsSyntheticPackage( environment: environment, buildSystem: buildSystem, + buildTargets: const BuildTargetsImpl(), ), throwsToolExit(message: 'Generating synthetic localizations package failed with 1 error:' @@ -151,6 +155,7 @@ void main() { () => generateLocalizationsSyntheticPackage( environment: environment, buildSystem: buildSystem, + buildTargets: const BuildTargetsImpl(), ), throwsToolExit(message: 'Generating synthetic localizations package failed with 1 error:' @@ -187,6 +192,7 @@ void main() { await generateLocalizationsSyntheticPackage( environment: environment, buildSystem: buildSystem, + buildTargets: const NoOpBuildTargets(), ); }); @@ -220,6 +226,7 @@ void main() { () => generateLocalizationsSyntheticPackage( environment: environment, buildSystem: buildSystem, + buildTargets: const NoOpBuildTargets(), ), throwsToolExit(message: 'to contain a map, instead was helloWorld'), ); @@ -255,6 +262,7 @@ void main() { () => generateLocalizationsSyntheticPackage( environment: environment, buildSystem: buildSystem, + buildTargets: const NoOpBuildTargets(), ), throwsToolExit(message: 'to have a bool value, instead was "nonBoolValue"'), ); diff --git a/packages/flutter_tools/test/general.shard/devfs_test.dart b/packages/flutter_tools/test/general.shard/devfs_test.dart index 63473bd25b0..e4078c0f296 100644 --- a/packages/flutter_tools/test/general.shard/devfs_test.dart +++ b/packages/flutter_tools/test/general.shard/devfs_test.dart @@ -17,7 +17,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/vmservice.dart'; diff --git a/packages/flutter_tools/test/general.shard/hot_test.dart b/packages/flutter_tools/test/general.shard/hot_test.dart index df9becfea3b..4668402c68a 100644 --- a/packages/flutter_tools/test/general.shard/hot_test.dart +++ b/packages/flutter_tools/test/general.shard/hot_test.dart @@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart index 5e6834ca032..547c9b7e9c0 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart @@ -19,8 +19,8 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/build_system/build_system.dart'; -import 'package:flutter_tools/src/build_system/targets/scene_importer.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/scene_importer.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/devfs.dart'; diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart index 00c0bbbe5a5..43b9f0931bc 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart @@ -16,8 +16,8 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/time.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/scene_importer.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/scene_importer.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; diff --git a/packages/flutter_tools/test/general.shard/terminal_handler_test.dart b/packages/flutter_tools/test/general.shard/terminal_handler_test.dart index cdc19c22da1..a3a06840f5a 100644 --- a/packages/flutter_tools/test/general.shard/terminal_handler_test.dart +++ b/packages/flutter_tools/test/general.shard/terminal_handler_test.dart @@ -12,7 +12,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/signals.dart'; import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/devfs.dart'; diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart index 0a52ef00d0f..143282e76a2 100644 --- a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart +++ b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart @@ -12,7 +12,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/devfs.dart'; diff --git a/packages/flutter_tools/test/integration.shard/shader_compiler_test.dart b/packages/flutter_tools/test/integration.shard/shader_compiler_test.dart index b0da068b836..54757a9ce92 100644 --- a/packages/flutter_tools/test/integration.shard/shader_compiler_test.dart +++ b/packages/flutter_tools/test/integration.shard/shader_compiler_test.dart @@ -5,7 +5,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; +import 'package:flutter_tools/src/build_system/tools/shader_compiler.dart'; import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index f917d28a046..fd715864ede 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -18,6 +18,7 @@ import 'package:flutter_tools/src/base/template.dart'; import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/base/time.dart'; import 'package:flutter_tools/src/base/version.dart'; +import 'package:flutter_tools/src/build_system/build_targets.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/context_runner.dart'; import 'package:flutter_tools/src/dart/pub.dart'; @@ -28,6 +29,7 @@ import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:flutter_tools/src/ios/simulators.dart'; import 'package:flutter_tools/src/ios/xcodeproj.dart'; +import 'package:flutter_tools/src/isolated/build_targets.dart'; import 'package:flutter_tools/src/isolated/mustache_template.dart'; import 'package:flutter_tools/src/persistent_tool_state.dart'; import 'package:flutter_tools/src/project.dart'; @@ -122,6 +124,7 @@ void testUsingContext( Pub: () => ThrowingPub(), // prevent accidentally using pub. CrashReporter: () => const NoopCrashReporter(), TemplateRenderer: () => const MustacheTemplateRenderer(), + BuildTargets: () => const BuildTargetsImpl(), Analytics: () => NoOpAnalytics(), }, body: () {