Skip to content

Commit 61c8018

Browse files
committed
[tool] Require explicit dependency injection for FlutterDevice and FlutterDevice.create
1 parent 9ead586 commit 61c8018

13 files changed

Lines changed: 280 additions & 74 deletions

‎packages/flutter_tools/lib/src/commands/attach.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,15 @@ known, it can be explicitly provided to attach via the command-line, e.g.
353353

354354
final FlutterDevice flutterDevice = await FlutterDevice.create(
355355
device,
356+
artifacts: toolContext!.artifacts,
357+
buildInfo: buildInfo,
358+
fileSystem: _fileSystem,
359+
logger: _logger,
360+
platform: _platform,
361+
processManager: toolContext!.processManager,
356362
target: targetFile,
357363
targetModelOverride: TargetModel(stringArg('target-model')!),
358-
buildInfo: buildInfo,
359364
userIdentifier: userIdentifier,
360-
platform: _platform,
361365
);
362366
flutterDevice.vmServiceUri = vmServiceUri;
363367
final flutterDevices = <FlutterDevice>[flutterDevice];

‎packages/flutter_tools/lib/src/commands/daemon.dart‎

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,20 @@ import '../android/android_sdk.dart';
1414
import '../android/android_workflow.dart';
1515
import '../android/java.dart';
1616
import '../application_package.dart';
17+
import '../artifacts.dart';
1718
import '../base/common.dart';
1819
import '../base/file_system.dart';
1920
import '../base/io.dart';
2021
import '../base/logger.dart';
22+
import '../base/os.dart';
2123
import '../base/platform.dart';
2224
import '../base/process.dart';
2325
import '../base/signals.dart';
2426
import '../base/terminal.dart';
2527
import '../base/time.dart';
2628
import '../base/utils.dart';
2729
import '../build_info.dart';
30+
import '../cache.dart';
2831
import '../context/android_context.dart';
2932
import '../context/tool_context.dart';
3033
import '../convert.dart';
@@ -117,6 +120,7 @@ class DaemonCommand extends FlutterCommand {
117120
analytics: analytics,
118121
androidSdk: _androidSdk,
119122
androidWorkflow: _androidWorkflow,
123+
artifacts: toolContext.artifacts,
120124
deviceManager: _deviceManager,
121125
featureFlags: featureFlags,
122126
fileSystem: fs,
@@ -138,6 +142,7 @@ class DaemonCommand extends FlutterCommand {
138142
),
139143
analytics: analytics,
140144
androidSdk: _androidSdk,
145+
artifacts: toolContext.artifacts,
141146
androidWorkflow: _androidWorkflow,
142147
deviceManager: _deviceManager,
143148
featureFlags: featureFlags,
@@ -168,6 +173,7 @@ class DaemonServer {
168173
this.analytics,
169174
this.androidSdk,
170175
this.androidWorkflow,
176+
this.artifacts,
171177
@visibleForTesting this._bind = ServerSocket.bind,
172178
this.deviceManager,
173179
required this.featureFlags,
@@ -191,6 +197,7 @@ class DaemonServer {
191197
// Logger that sends the message to the other end of daemon connection.
192198
final NotifyingLogger? notifyingLogger;
193199

200+
final Artifacts? artifacts;
194201
final FileSystem? fileSystem;
195202
final Platform? platform;
196203
final ProcessManager? processManager;
@@ -238,6 +245,7 @@ class DaemonServer {
238245
logger: logger,
239246
),
240247
notifyingLogger: notifyingLogger,
248+
artifacts: artifacts,
241249
fileSystem: fileSystem,
242250
platform: platform,
243251
processManager: processManager,
@@ -275,6 +283,7 @@ class Daemon {
275283
Analytics? analytics,
276284
AndroidSdk? androidSdk,
277285
AndroidWorkflow? androidWorkflow,
286+
Artifacts? artifacts,
278287
DeviceManager? deviceManager,
279288
required FeatureFlags featureFlags,
280289
FileSystem? fileSystem,
@@ -293,7 +302,8 @@ class Daemon {
293302
_logger = logger ?? BufferLogger.test(),
294303
_fs =
295304
fileSystem ??
296-
LocalFileSystem(LocalSignals.instance, Signals.defaultExitSignals, ShutdownHooks()) {
305+
LocalFileSystem(LocalSignals.instance, Signals.defaultExitSignals, ShutdownHooks()),
306+
_artifacts = artifacts {
297307
final Platform p = platform ?? const LocalPlatform();
298308
final ProcessManager pm = processManager ?? const LocalProcessManager();
299309
final AnsiTerminal term = terminal ?? AnsiTerminal(stdio: stdio ?? Stdio(), platform: p);
@@ -317,10 +327,12 @@ class Daemon {
317327
appDomain = AppDomain(
318328
this,
319329
analytics: an,
330+
artifacts: artifacts,
320331
fileSystem: _fs,
321332
logger: _logger,
322333
outputPreferences: prefs,
323334
platform: p,
335+
processManager: pm,
324336
systemClock: clock,
325337
terminal: term,
326338
),
@@ -357,13 +369,14 @@ class Daemon {
357369
}
358370

359371
factory Daemon.createMachineDaemon({
372+
required FeatureFlags featureFlags,
360373
required Logger logger,
361374
required Stdio stdio,
362375
Analytics? analytics,
363376
AndroidSdk? androidSdk,
364377
AndroidWorkflow? androidWorkflow,
378+
Artifacts? artifacts,
365379
DeviceManager? deviceManager,
366-
required FeatureFlags featureFlags,
367380
FileSystem? fileSystem,
368381
Java? java,
369382
OutputPreferences? outputPreferences,
@@ -383,6 +396,7 @@ class Daemon {
383396
logToStdout: true,
384397
stdio: stdio,
385398
logger: logger,
399+
artifacts: artifacts,
386400
fileSystem: fileSystem,
387401
platform: platform,
388402
processManager: processManager,
@@ -403,6 +417,7 @@ class Daemon {
403417
final Stdio? _stdio;
404418
final Logger _logger;
405419
final FileSystem _fs;
420+
final Artifacts? _artifacts;
406421

407422
late DaemonDomain daemonDomain;
408423
late AppDomain appDomain;
@@ -858,13 +873,17 @@ class AppDomain extends Domain {
858873
AppDomain(
859874
Daemon daemon, {
860875
Analytics? analytics,
876+
Artifacts? artifacts,
861877
FileSystem? fileSystem,
862878
Logger? logger,
863879
OutputPreferences? outputPreferences,
864880
Platform? platform,
881+
ProcessManager? processManager,
865882
SystemClock? systemClock,
866883
AnsiTerminal? terminal,
867-
}) : _fs = fileSystem ?? daemon._fs,
884+
}) : _artifacts = artifacts ?? daemon._artifacts,
885+
_processManager = processManager ?? const LocalProcessManager(),
886+
_fs = fileSystem ?? daemon._fs,
868887
_platform = platform ?? const LocalPlatform(),
869888
_analytics = analytics ?? const NoOpAnalytics(),
870889
_systemClock = systemClock ?? const SystemClock(),
@@ -883,6 +902,8 @@ class AppDomain extends Domain {
883902
registerHandler('detach', detach);
884903
}
885904

905+
final Artifacts? _artifacts;
906+
final ProcessManager _processManager;
886907
final FileSystem _fs;
887908
final Platform _platform;
888909
final Analytics _analytics;
@@ -930,9 +951,35 @@ class AppDomain extends Domain {
930951

931952
final FlutterDevice flutterDevice = await FlutterDevice.create(
932953
device,
933-
target: target,
954+
artifacts:
955+
_artifacts ??
956+
CachedArtifacts(
957+
fileSystem: _fs,
958+
platform: _platform,
959+
cache: Cache(
960+
logger: _logger,
961+
fileSystem: _fs,
962+
platform: _platform,
963+
osUtils: OperatingSystemUtils(
964+
fileSystem: _fs,
965+
logger: _logger,
966+
platform: _platform,
967+
processManager: _processManager,
968+
),
969+
),
970+
operatingSystemUtils: OperatingSystemUtils(
971+
fileSystem: _fs,
972+
logger: _logger,
973+
platform: _platform,
974+
processManager: _processManager,
975+
),
976+
),
934977
buildInfo: options.buildInfo,
978+
fileSystem: _fs,
979+
logger: _logger,
935980
platform: _platform,
981+
processManager: _processManager,
982+
target: target,
936983
userIdentifier: userIdentifier,
937984
);
938985

‎packages/flutter_tools/lib/src/commands/run.dart‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,10 +762,14 @@ class RunCommand extends RunCommandBase {
762762
for (final Device device in devices!)
763763
await FlutterDevice.create(
764764
device,
765-
target: targetFile,
765+
artifacts: globals.artifacts!,
766766
buildInfo: buildInfo,
767-
userIdentifier: userIdentifier,
767+
fileSystem: globals.fs,
768+
logger: globals.logger,
768769
platform: globals.platform,
770+
processManager: globals.processManager,
771+
target: targetFile,
772+
userIdentifier: userIdentifier,
769773
),
770774
];
771775

‎packages/flutter_tools/lib/src/commands/widget_preview.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,13 @@ final class WidgetPreviewStartCommand extends WidgetPreviewSubCommandBase with C
574574
final String target = bundle.defaultMainPath;
575575
final FlutterDevice flutterDevice = await FlutterDevice.create(
576576
device,
577-
target: target,
577+
artifacts: artifacts,
578578
buildInfo: debuggingOptions.buildInfo,
579+
fileSystem: fs,
580+
logger: logger,
579581
platform: platform,
582+
processManager: processManager,
583+
target: target,
580584
);
581585

582586
if (boolArg(kLaunchPreviewer)) {

‎packages/flutter_tools/lib/src/drive/web_driver_service.dart‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,13 @@ class WebDriverService extends DriverService {
7272
}) async {
7373
final FlutterDevice flutterDevice = await FlutterDevice.create(
7474
device,
75-
target: mainPath,
75+
artifacts: globals.artifacts!,
7676
buildInfo: buildInfo,
77+
fileSystem: globals.fs,
78+
logger: _logger,
7779
platform: _platform,
80+
processManager: globals.processManager,
81+
target: mainPath,
7882
);
7983
_residentRunner = webRunnerFactory!.createWebRunner(
8084
flutterDevice,

0 commit comments

Comments
 (0)