Revert "Add and plumb useImplicitPubspecResolution across flutter_tools." (#158076)

Reverts flutter/flutter#157879 to unblock flutter roll.

Prerequisite reverts:
https://github.com/flutter/flutter/pull/157934

Reason: b/377107864
This commit is contained in:
Polina Cherkasova 2024-11-03 09:29:24 -08:00 committed by GitHub
parent f7b24fa525
commit 0505176f1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
57 changed files with 40 additions and 409 deletions

View File

@ -34,7 +34,7 @@ const List<String> _kRequiredOptions = <String>[
Future<void> main(List<String> args) { Future<void> main(List<String> args) {
return runInContext<void>(() => run(args), overrides: <Type, Generator>{ return runInContext<void>(() => run(args), overrides: <Type, Generator>{
Usage: () => DisabledUsage(), Usage: () => DisabledUsage(),
}, useImplicitPubspecResolution: true); });
} }
Future<void> writeAssetFile(libfs.File outputFile, AssetBundleEntry asset) async { Future<void> writeAssetFile(libfs.File outputFile, AssetBundleEntry asset) async {

View File

@ -43,7 +43,7 @@ const String _kOptionCoveragePath = 'coverage-path';
void main(List<String> args) { void main(List<String> args) {
runInContext<void>(() => run(args), overrides: <Type, Generator>{ runInContext<void>(() => run(args), overrides: <Type, Generator>{
Usage: () => DisabledUsage(), Usage: () => DisabledUsage(),
}, useImplicitPubspecResolution: true); });
} }
Future<void> run(List<String> args) async { Future<void> run(List<String> args) async {

View File

@ -347,7 +347,6 @@ class Environment {
required Analytics analytics, required Analytics analytics,
String? engineVersion, String? engineVersion,
required bool generateDartPluginRegistry, required bool generateDartPluginRegistry,
required bool useImplicitPubspecResolution,
Directory? buildDir, Directory? buildDir,
Map<String, String> defines = const <String, String>{}, Map<String, String> defines = const <String, String>{},
Map<String, String> inputs = const <String, String>{}, Map<String, String> inputs = const <String, String>{},
@ -392,7 +391,6 @@ class Environment {
engineVersion: engineVersion, engineVersion: engineVersion,
inputs: inputs, inputs: inputs,
generateDartPluginRegistry: generateDartPluginRegistry, generateDartPluginRegistry: generateDartPluginRegistry,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }
@ -414,7 +412,6 @@ class Environment {
Usage? usage, Usage? usage,
Analytics? analytics, Analytics? analytics,
bool generateDartPluginRegistry = false, bool generateDartPluginRegistry = false,
bool useImplicitPubspecResolution = true,
required FileSystem fileSystem, required FileSystem fileSystem,
required Logger logger, required Logger logger,
required Artifacts artifacts, required Artifacts artifacts,
@ -438,7 +435,6 @@ class Environment {
analytics: analytics ?? const NoOpAnalytics(), analytics: analytics ?? const NoOpAnalytics(),
engineVersion: engineVersion, engineVersion: engineVersion,
generateDartPluginRegistry: generateDartPluginRegistry, generateDartPluginRegistry: generateDartPluginRegistry,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }
@ -461,7 +457,6 @@ class Environment {
this.engineVersion, this.engineVersion,
required this.inputs, required this.inputs,
required this.generateDartPluginRegistry, required this.generateDartPluginRegistry,
required this.useImplicitPubspecResolution,
}); });
/// The [Source] value which is substituted with the path to [projectDir]. /// The [Source] value which is substituted with the path to [projectDir].
@ -562,10 +557,6 @@ class Environment {
/// the new entrypoint. /// the new entrypoint.
final bool generateDartPluginRegistry; final bool generateDartPluginRegistry;
/// Whether to generate a `.flutter-plugins` file and for Flutter i10n source
/// generation to default to `synthetic-package: true`.
final bool useImplicitPubspecResolution;
late final DepfileService depFileService = DepfileService( late final DepfileService depFileService = DepfileService(
logger: logger, logger: logger,
fileSystem: fileSystem, fileSystem: fileSystem,

View File

@ -56,7 +56,6 @@ class GenerateLocalizationsTarget extends Target {
file: configFile, file: configFile,
logger: environment.logger, logger: environment.logger,
defaultArbDir: defaultArbDir, defaultArbDir: defaultArbDir,
defaultSyntheticPackage: environment.useImplicitPubspecResolution,
); );
await generateLocalizations( await generateLocalizations(
logger: environment.logger, logger: environment.logger,

View File

@ -37,7 +37,6 @@ class BundleBuilder {
Future<void> build({ Future<void> build({
required TargetPlatform platform, required TargetPlatform platform,
required BuildInfo buildInfo, required BuildInfo buildInfo,
required bool useImplicitPubspecResolution,
FlutterProject? project, FlutterProject? project,
String? mainPath, String? mainPath,
String manifestPath = defaultManifestPath, String manifestPath = defaultManifestPath,
@ -80,7 +79,6 @@ class BundleBuilder {
analytics: globals.analytics, analytics: globals.analytics,
platform: globals.platform, platform: globals.platform,
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
final Target target = buildInfo.mode == BuildMode.debug final Target target = buildInfo.mode == BuildMode.debug
? globals.buildTargets.copyFlutterBundle ? globals.buildTargets.copyFlutterBundle

View File

@ -26,7 +26,6 @@ import '../globals.dart' as globals;
import '../project.dart'; import '../project.dart';
import '../reporting/reporting.dart'; import '../reporting/reporting.dart';
import '../runner/flutter_command.dart'; import '../runner/flutter_command.dart';
import '../runner/flutter_command_runner.dart';
/// All currently implemented targets. /// All currently implemented targets.
List<Target> _kDefaultTargets = <Target>[ List<Target> _kDefaultTargets = <Target>[
@ -253,7 +252,6 @@ class AssembleCommand extends FlutterCommand {
? null ? null
: globals.flutterVersion.engineRevision, : globals.flutterVersion.engineRevision,
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
return result; return result;
} }

View File

@ -280,7 +280,6 @@ known, it can be explicitly provided to attach via the command-line, e.g.
? _logger ? _logger
: NotifyingLogger(verbose: _logger.isVerbose, parent: _logger), : NotifyingLogger(verbose: _logger.isVerbose, parent: _logger),
logToStdout: true, logToStdout: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
) )
: null; : null;
@ -467,7 +466,6 @@ known, it can be explicitly provided to attach via the command-line, e.g.
printDtd: boolArg(FlutterGlobalOptions.kPrintDtd, global: true), printDtd: boolArg(FlutterGlobalOptions.kPrintDtd, global: true),
); );
final bool useImplicitPubspecResolution = globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution);
return buildInfo.isDebug return buildInfo.isDebug
? _hotRunnerFactory.build( ? _hotRunnerFactory.build(
flutterDevices, flutterDevices,
@ -480,13 +478,11 @@ known, it can be explicitly provided to attach via the command-line, e.g.
nativeAssetsYamlFile: stringArg(FlutterOptions.kNativeAssetsYamlFile), nativeAssetsYamlFile: stringArg(FlutterOptions.kNativeAssetsYamlFile),
nativeAssetsBuilder: _nativeAssetsBuilder, nativeAssetsBuilder: _nativeAssetsBuilder,
analytics: analytics, analytics: analytics,
useImplicitPubspecResolution: useImplicitPubspecResolution,
) )
: ColdRunner( : ColdRunner(
flutterDevices, flutterDevices,
target: targetFile, target: targetFile,
debuggingOptions: debuggingOptions, debuggingOptions: debuggingOptions,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }
@ -513,7 +509,6 @@ class HotRunnerFactory {
FlutterProject? flutterProject, FlutterProject? flutterProject,
String? nativeAssetsYamlFile, String? nativeAssetsYamlFile,
required HotRunnerNativeAssetsBuilder? nativeAssetsBuilder, required HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
required bool useImplicitPubspecResolution,
required Analytics analytics, required Analytics analytics,
}) => HotRunner( }) => HotRunner(
devices, devices,
@ -528,6 +523,5 @@ class HotRunnerFactory {
nativeAssetsYamlFile: nativeAssetsYamlFile, nativeAssetsYamlFile: nativeAssetsYamlFile,
nativeAssetsBuilder: nativeAssetsBuilder, nativeAssetsBuilder: nativeAssetsBuilder,
analytics: analytics, analytics: analytics,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }

View File

@ -13,7 +13,6 @@ import '../globals.dart' as globals;
import '../project.dart'; import '../project.dart';
import '../reporting/reporting.dart'; import '../reporting/reporting.dart';
import '../runner/flutter_command.dart'; import '../runner/flutter_command.dart';
import '../runner/flutter_command_runner.dart';
import 'build.dart'; import 'build.dart';
class BuildBundleCommand extends BuildSubCommand { class BuildBundleCommand extends BuildSubCommand {
@ -150,7 +149,6 @@ class BuildBundleCommand extends BuildSubCommand {
depfilePath: stringArg('depfile'), depfilePath: stringArg('depfile'),
assetDirPath: stringArg('asset-dir'), assetDirPath: stringArg('asset-dir'),
buildNativeAssets: false, buildNativeAssets: false,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
return FlutterCommandResult.success(); return FlutterCommandResult.success();
} }

View File

@ -21,7 +21,6 @@ import '../flutter_plugins.dart';
import '../globals.dart' as globals; import '../globals.dart' as globals;
import '../macos/cocoapod_utils.dart'; import '../macos/cocoapod_utils.dart';
import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult; import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult;
import '../runner/flutter_command_runner.dart';
import '../version.dart'; import '../version.dart';
import 'build.dart'; import 'build.dart';
@ -461,7 +460,6 @@ end
? null ? null
: globals.flutterVersion.engineRevision, : globals.flutterVersion.engineRevision,
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
Target target; Target target;
// Always build debug for simulator. // Always build debug for simulator.

View File

@ -19,7 +19,6 @@ import '../flutter_plugins.dart';
import '../globals.dart' as globals; import '../globals.dart' as globals;
import '../macos/cocoapod_utils.dart'; import '../macos/cocoapod_utils.dart';
import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult; import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult;
import '../runner/flutter_command_runner.dart';
import '../version.dart'; import '../version.dart';
import 'build_ios_framework.dart'; import 'build_ios_framework.dart';
@ -240,7 +239,6 @@ end
analytics: globals.analytics, analytics: globals.analytics,
engineVersion: globals.artifacts!.usesLocalArtifacts ? null : globals.flutterVersion.engineRevision, engineVersion: globals.artifacts!.usesLocalArtifacts ? null : globals.flutterVersion.engineRevision,
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
Target target; Target target;
// Always build debug for simulator. // Always build debug for simulator.

View File

@ -10,7 +10,6 @@ import '../features.dart';
import '../globals.dart' as globals; import '../globals.dart' as globals;
import '../runner/flutter_command.dart' import '../runner/flutter_command.dart'
show DevelopmentArtifact, FlutterCommandResult, FlutterOptions; show DevelopmentArtifact, FlutterCommandResult, FlutterOptions;
import '../runner/flutter_command_runner.dart';
import '../web/compile.dart'; import '../web/compile.dart';
import '../web/file_generators/flutter_service_worker_js.dart'; import '../web/file_generators/flutter_service_worker_js.dart';
import '../web/web_constants.dart'; import '../web/web_constants.dart';
@ -227,7 +226,6 @@ class BuildWebCommand extends BuildSubCommand {
flutterVersion: globals.flutterVersion, flutterVersion: globals.flutterVersion,
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
await webBuilder.buildWeb( await webBuilder.buildWeb(
project, project,

View File

@ -21,7 +21,6 @@ import '../flutter_project_metadata.dart';
import '../globals.dart' as globals; import '../globals.dart' as globals;
import '../project.dart'; import '../project.dart';
import '../runner/flutter_command.dart'; import '../runner/flutter_command.dart';
import '../runner/flutter_command_runner.dart';
import '../template.dart'; import '../template.dart';
const List<String> _kAvailablePlatforms = <String>[ const List<String> _kAvailablePlatforms = <String>[
@ -575,7 +574,6 @@ abstract class CreateBase extends FlutterCommand {
projectDir: project.directory, projectDir: project.directory,
packageConfigPath: packageConfigPath(), packageConfigPath: packageConfigPath(),
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
// Generate the l10n synthetic package that will be injected into the // Generate the l10n synthetic package that will be injected into the

View File

@ -377,8 +377,7 @@ class CustomDevicesAddCommand extends CustomDevicesCommandBase {
final CustomDevice device = CustomDevice( final CustomDevice device = CustomDevice(
config: config, config: config,
logger: logger, logger: logger,
processManager: _processManager, processManager: _processManager
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
bool result = true; bool result = true;

View File

@ -32,7 +32,6 @@ import '../resident_runner.dart';
import '../run_cold.dart'; import '../run_cold.dart';
import '../run_hot.dart'; import '../run_hot.dart';
import '../runner/flutter_command.dart'; import '../runner/flutter_command.dart';
import '../runner/flutter_command_runner.dart';
import '../vmservice.dart'; import '../vmservice.dart';
import '../web/web_runner.dart'; import '../web/web_runner.dart';
@ -67,7 +66,6 @@ class DaemonCommand extends FlutterCommand {
@override @override
Future<FlutterCommandResult> runCommand() async { Future<FlutterCommandResult> runCommand() async {
final bool useImplicitPubspecResolution = globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution);
if (argResults!['listen-on-tcp-port'] != null) { if (argResults!['listen-on-tcp-port'] != null) {
int? port; int? port;
try { try {
@ -84,7 +82,6 @@ class DaemonCommand extends FlutterCommand {
outputPreferences: globals.outputPreferences, outputPreferences: globals.outputPreferences,
), ),
notifyingLogger: asLogger<NotifyingLogger>(globals.logger), notifyingLogger: asLogger<NotifyingLogger>(globals.logger),
useImplicitPubspecResolution: useImplicitPubspecResolution,
).run(); ).run();
return FlutterCommandResult.success(); return FlutterCommandResult.success();
} }
@ -95,7 +92,6 @@ class DaemonCommand extends FlutterCommand {
logger: globals.logger, logger: globals.logger,
), ),
notifyingLogger: asLogger<NotifyingLogger>(globals.logger), notifyingLogger: asLogger<NotifyingLogger>(globals.logger),
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
final int code = await daemon.onExit; final int code = await daemon.onExit;
if (code != 0) { if (code != 0) {
@ -109,11 +105,10 @@ class DaemonCommand extends FlutterCommand {
class DaemonServer { class DaemonServer {
DaemonServer({ DaemonServer({
this.port, this.port,
required bool useImplicitPubspecResolution,
required this.logger, required this.logger,
this.notifyingLogger, this.notifyingLogger,
@visibleForTesting Future<ServerSocket> Function(InternetAddress address, int port) bind = ServerSocket.bind, @visibleForTesting Future<ServerSocket> Function(InternetAddress address, int port) bind = ServerSocket.bind,
}) : _bind = bind, _useImplicitPubspecResolution = useImplicitPubspecResolution; }) : _bind = bind;
final int? port; final int? port;
@ -122,7 +117,6 @@ class DaemonServer {
// Logger that sends the message to the other end of daemon connection. // Logger that sends the message to the other end of daemon connection.
final NotifyingLogger? notifyingLogger; final NotifyingLogger? notifyingLogger;
final bool _useImplicitPubspecResolution;
final Future<ServerSocket> Function(InternetAddress address, int port) _bind; final Future<ServerSocket> Function(InternetAddress address, int port) _bind;
@ -157,7 +151,6 @@ class DaemonServer {
logger: logger, logger: logger,
), ),
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
await daemon.onExit; await daemon.onExit;
await socketDone; await socketDone;
@ -176,14 +169,13 @@ typedef CommandHandlerWithBinary = Future<Object?> Function(Map<String, Object?>
class Daemon { class Daemon {
Daemon( Daemon(
this.connection, { this.connection, {
required bool useImplicitPubspecResolution,
this.notifyingLogger, this.notifyingLogger,
this.logToStdout = false, this.logToStdout = false,
FileTransfer fileTransfer = const FileTransfer(), FileTransfer fileTransfer = const FileTransfer(),
}) { }) {
// Set up domains. // Set up domains.
registerDomain(daemonDomain = DaemonDomain(this)); registerDomain(daemonDomain = DaemonDomain(this));
registerDomain(appDomain = AppDomain(this, useImplicitPubspecResolution: useImplicitPubspecResolution)); registerDomain(appDomain = AppDomain(this));
registerDomain(deviceDomain = DeviceDomain(this)); registerDomain(deviceDomain = DeviceDomain(this));
registerDomain(emulatorDomain = EmulatorDomain(this)); registerDomain(emulatorDomain = EmulatorDomain(this));
registerDomain(devToolsDomain = DevToolsDomain(this)); registerDomain(devToolsDomain = DevToolsDomain(this));
@ -645,10 +637,7 @@ typedef RunOrAttach = Future<void> Function({
/// ///
/// It fires events for application start, stop, and stdout and stderr. /// It fires events for application start, stop, and stdout and stderr.
class AppDomain extends Domain { class AppDomain extends Domain {
AppDomain(Daemon daemon, { AppDomain(Daemon daemon) : super(daemon, 'app') {
required bool useImplicitPubspecResolution,
}) : _useImplicitPubspecResolution = useImplicitPubspecResolution,
super(daemon, 'app') {
registerHandler('restart', restart); registerHandler('restart', restart);
registerHandler('callServiceExtension', callServiceExtension); registerHandler('callServiceExtension', callServiceExtension);
registerHandler('stop', stop); registerHandler('stop', stop);
@ -660,7 +649,6 @@ class AppDomain extends Domain {
static String _getNewAppId() => _uuidGenerator.v4(); static String _getNewAppId() => _uuidGenerator.v4();
final List<AppInstance> _apps = <AppInstance>[]; final List<AppInstance> _apps = <AppInstance>[];
final bool _useImplicitPubspecResolution;
final DebounceOperationQueue<OperationResult, OperationType> operationQueue = DebounceOperationQueue<OperationResult, OperationType>(); final DebounceOperationQueue<OperationResult, OperationType> operationQueue = DebounceOperationQueue<OperationResult, OperationType>();
@ -717,7 +705,6 @@ class AppDomain extends Domain {
systemClock: globals.systemClock, systemClock: globals.systemClock,
logger: globals.logger, logger: globals.logger,
fileSystem: globals.fs, fileSystem: globals.fs,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
} else if (enableHotReload) { } else if (enableHotReload) {
runner = HotRunner( runner = HotRunner(
@ -731,7 +718,6 @@ class AppDomain extends Domain {
machine: machine, machine: machine,
analytics: globals.analytics, analytics: globals.analytics,
nativeAssetsBuilder: nativeAssetsBuilder, nativeAssetsBuilder: nativeAssetsBuilder,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
} else { } else {
runner = ColdRunner( runner = ColdRunner(
@ -740,7 +726,6 @@ class AppDomain extends Domain {
debuggingOptions: options, debuggingOptions: options,
applicationBinary: applicationBinary, applicationBinary: applicationBinary,
machine: machine, machine: machine,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
} }

View File

@ -28,7 +28,6 @@ import '../ios/devices.dart';
import '../macos/macos_ipad_device.dart'; import '../macos/macos_ipad_device.dart';
import '../resident_runner.dart'; import '../resident_runner.dart';
import '../runner/flutter_command.dart' show FlutterCommandCategory, FlutterCommandResult, FlutterOptions; import '../runner/flutter_command.dart' show FlutterCommandCategory, FlutterCommandResult, FlutterOptions;
import '../runner/flutter_command_runner.dart';
import '../web/web_device.dart'; import '../web/web_device.dart';
import 'run.dart'; import 'run.dart';
@ -261,7 +260,6 @@ class DriveCommand extends RunCommandBase {
processUtils: globals.processUtils, processUtils: globals.processUtils,
dartSdkPath: globals.artifacts!.getArtifactPath(Artifact.engineDartBinary), dartSdkPath: globals.artifacts!.getArtifactPath(Artifact.engineDartBinary),
devtoolsLauncher: DevtoolsLauncher.instance!, devtoolsLauncher: DevtoolsLauncher.instance!,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
final File packageConfigFile = findPackageConfigFileOrDefault(_fileSystem.currentDirectory); final File packageConfigFile = findPackageConfigFileOrDefault(_fileSystem.currentDirectory);

View File

@ -11,7 +11,6 @@ import '../base/logger.dart';
import '../localizations/gen_l10n.dart'; import '../localizations/gen_l10n.dart';
import '../localizations/localizations_utils.dart'; import '../localizations/localizations_utils.dart';
import '../runner/flutter_command.dart'; import '../runner/flutter_command.dart';
import '../runner/flutter_command_runner.dart';
/// A command to generate localizations source files for a Flutter project. /// A command to generate localizations source files for a Flutter project.
/// ///
@ -247,7 +246,6 @@ class GenerateLocalizationsCommand extends FlutterCommand {
file: _fileSystem.file('l10n.yaml'), file: _fileSystem.file('l10n.yaml'),
logger: _logger, logger: _logger,
defaultArbDir: defaultArbDir, defaultArbDir: defaultArbDir,
defaultSyntheticPackage: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
_logger.printStatus( _logger.printStatus(
'Because l10n.yaml exists, the options defined there will be used ' 'Because l10n.yaml exists, the options defined there will be used '

View File

@ -305,7 +305,6 @@ class PackagesGetCommand extends FlutterCommand {
projectDir: rootProject.directory, projectDir: rootProject.directory,
packageConfigPath: packageConfigPath(), packageConfigPath: packageConfigPath(),
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
await generateLocalizationsSyntheticPackage( await generateLocalizationsSyntheticPackage(
@ -329,7 +328,6 @@ class PackagesGetCommand extends FlutterCommand {
projectDir: rootProject.directory, projectDir: rootProject.directory,
packageConfigPath: packageConfigPath(), packageConfigPath: packageConfigPath(),
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
final BuildResult result = await globals.buildSystem.build( final BuildResult result = await globals.buildSystem.build(
const GenerateLocalizationsTarget(), const GenerateLocalizationsTarget(),

View File

@ -682,7 +682,6 @@ class RunCommand extends RunCommandBase {
required String? applicationBinaryPath, required String? applicationBinaryPath,
required FlutterProject flutterProject, required FlutterProject flutterProject,
}) async { }) async {
final bool useImplicitPubspecResolution = globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution);
if (hotMode && !webMode) { if (hotMode && !webMode) {
return HotRunner( return HotRunner(
flutterDevices, flutterDevices,
@ -698,7 +697,6 @@ class RunCommand extends RunCommandBase {
analytics: globals.analytics, analytics: globals.analytics,
nativeAssetsYamlFile: stringArg(FlutterOptions.kNativeAssetsYamlFile), nativeAssetsYamlFile: stringArg(FlutterOptions.kNativeAssetsYamlFile),
nativeAssetsBuilder: _nativeAssetsBuilder, nativeAssetsBuilder: _nativeAssetsBuilder,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} else if (webMode) { } else if (webMode) {
return webRunnerFactory!.createWebRunner( return webRunnerFactory!.createWebRunner(
@ -712,7 +710,6 @@ class RunCommand extends RunCommandBase {
analytics: globals.analytics, analytics: globals.analytics,
logger: globals.logger, logger: globals.logger,
systemClock: globals.systemClock, systemClock: globals.systemClock,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }
return ColdRunner( return ColdRunner(
@ -725,13 +722,11 @@ class RunCommand extends RunCommandBase {
? null ? null
: globals.fs.file(applicationBinaryPath), : globals.fs.file(applicationBinaryPath),
stayResident: stayResident, stayResident: stayResident,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }
@visibleForTesting @visibleForTesting
Daemon createMachineDaemon() { Daemon createMachineDaemon() {
final bool useImplicitPubspecResolution = globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution);
final Daemon daemon = Daemon( final Daemon daemon = Daemon(
DaemonConnection( DaemonConnection(
daemonStreams: DaemonStreams.fromStdio(globals.stdio, logger: globals.logger), daemonStreams: DaemonStreams.fromStdio(globals.stdio, logger: globals.logger),
@ -741,7 +736,6 @@ class RunCommand extends RunCommandBase {
? globals.logger as NotifyingLogger ? globals.logger as NotifyingLogger
: NotifyingLogger(verbose: globals.logger.isVerbose, parent: globals.logger), : NotifyingLogger(verbose: globals.logger.isVerbose, parent: globals.logger),
logToStdout: true, logToStdout: true,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
return daemon; return daemon;
} }

View File

@ -68,7 +68,6 @@ import 'windows/windows_workflow.dart';
Future<T> runInContext<T>( Future<T> runInContext<T>(
FutureOr<T> Function() runner, { FutureOr<T> Function() runner, {
bool useImplicitPubspecResolution = true,
Map<Type, Generator>? overrides, Map<Type, Generator>? overrides,
}) async { }) async {
@ -211,7 +210,6 @@ Future<T> runInContext<T>(
operatingSystemUtils: globals.os, operatingSystemUtils: globals.os,
customDevicesConfig: globals.customDevicesConfig, customDevicesConfig: globals.customDevicesConfig,
nativeAssetsBuilder: globals.nativeAssetsBuilder, nativeAssetsBuilder: globals.nativeAssetsBuilder,
useImplicitPubspecResolution: useImplicitPubspecResolution,
), ),
DevtoolsLauncher: () => DevtoolsServerLauncher( DevtoolsLauncher: () => DevtoolsServerLauncher(
processManager: globals.processManager, processManager: globals.processManager,

View File

@ -440,10 +440,8 @@ class CustomDevice extends Device {
required CustomDeviceConfig config, required CustomDeviceConfig config,
required super.logger, required super.logger,
required ProcessManager processManager, required ProcessManager processManager,
required bool useImplicitPubspecResolution,
}) : _config = config, }) : _config = config,
_logger = logger, _logger = logger,
_useImplicitPubspecResolution = useImplicitPubspecResolution,
_processManager = processManager, _processManager = processManager,
_processUtils = ProcessUtils( _processUtils = ProcessUtils(
processManager: processManager, processManager: processManager,
@ -471,7 +469,6 @@ class CustomDevice extends Device {
final ProcessUtils _processUtils; final ProcessUtils _processUtils;
final Map<ApplicationPackage, CustomDeviceAppSession> _sessions = <ApplicationPackage, CustomDeviceAppSession>{}; final Map<ApplicationPackage, CustomDeviceAppSession> _sessions = <ApplicationPackage, CustomDeviceAppSession>{};
final CustomDeviceLogReader _globalLogReader; final CustomDeviceLogReader _globalLogReader;
final bool _useImplicitPubspecResolution;
@override @override
final DevicePortForwarder portForwarder; final DevicePortForwarder portForwarder;
@ -765,7 +762,6 @@ class CustomDevice extends Device {
mainPath: mainPath, mainPath: mainPath,
depfilePath: defaultDepfilePath, depfilePath: defaultDepfilePath,
assetDirPath: assetBundleDir, assetDirPath: assetBundleDir,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
// if we have a post build step (needed for some embedders), execute it // if we have a post build step (needed for some embedders), execute it
@ -826,18 +822,15 @@ class CustomDevices extends PollingDeviceDiscovery {
required FeatureFlags featureFlags, required FeatureFlags featureFlags,
required ProcessManager processManager, required ProcessManager processManager,
required Logger logger, required Logger logger,
required CustomDevicesConfig config, required CustomDevicesConfig config
required bool useImplicitPubspecResolution,
}) : _customDeviceWorkflow = CustomDeviceWorkflow( }) : _customDeviceWorkflow = CustomDeviceWorkflow(
featureFlags: featureFlags, featureFlags: featureFlags,
), ),
_useImplicitPubspecResolution = useImplicitPubspecResolution,
_logger = logger, _logger = logger,
_processManager = processManager, _processManager = processManager,
_config = config, _config = config,
super('custom devices'); super('custom devices');
final bool _useImplicitPubspecResolution;
final CustomDeviceWorkflow _customDeviceWorkflow; final CustomDeviceWorkflow _customDeviceWorkflow;
final ProcessManager _processManager; final ProcessManager _processManager;
final Logger _logger; final Logger _logger;
@ -858,8 +851,7 @@ class CustomDevices extends PollingDeviceDiscovery {
(CustomDeviceConfig config) => CustomDevice( (CustomDeviceConfig config) => CustomDevice(
config: config, config: config,
logger: _logger, logger: _logger,
processManager: _processManager, processManager: _processManager
useImplicitPubspecResolution: _useImplicitPubspecResolution,
) )
).toList(); ).toList();
} }

View File

@ -28,20 +28,17 @@ class FlutterDriverFactory {
required ProcessUtils processUtils, required ProcessUtils processUtils,
required String dartSdkPath, required String dartSdkPath,
required DevtoolsLauncher devtoolsLauncher, required DevtoolsLauncher devtoolsLauncher,
required bool useImplicitPubspecResolution,
}) : _applicationPackageFactory = applicationPackageFactory, }) : _applicationPackageFactory = applicationPackageFactory,
_logger = logger, _logger = logger,
_processUtils = processUtils, _processUtils = processUtils,
_dartSdkPath = dartSdkPath, _dartSdkPath = dartSdkPath,
_devtoolsLauncher = devtoolsLauncher, _devtoolsLauncher = devtoolsLauncher;
_useImplicitPubspecResolution = useImplicitPubspecResolution;
final ApplicationPackageFactory _applicationPackageFactory; final ApplicationPackageFactory _applicationPackageFactory;
final Logger _logger; final Logger _logger;
final ProcessUtils _processUtils; final ProcessUtils _processUtils;
final String _dartSdkPath; final String _dartSdkPath;
final DevtoolsLauncher _devtoolsLauncher; final DevtoolsLauncher _devtoolsLauncher;
final bool _useImplicitPubspecResolution;
/// Create a driver service for running `flutter drive`. /// Create a driver service for running `flutter drive`.
DriverService createDriverService(bool web) { DriverService createDriverService(bool web) {
@ -50,7 +47,6 @@ class FlutterDriverFactory {
logger: _logger, logger: _logger,
processUtils: _processUtils, processUtils: _processUtils,
dartSdkPath: _dartSdkPath, dartSdkPath: _dartSdkPath,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
} }
return FlutterDriverService( return FlutterDriverService(

View File

@ -30,16 +30,13 @@ class WebDriverService extends DriverService {
required ProcessUtils processUtils, required ProcessUtils processUtils,
required String dartSdkPath, required String dartSdkPath,
required Logger logger, required Logger logger,
required bool useImplicitPubspecResolution,
}) : _processUtils = processUtils, }) : _processUtils = processUtils,
_dartSdkPath = dartSdkPath, _dartSdkPath = dartSdkPath,
_logger = logger, _logger = logger;
_useImplicitPubspecResolution = useImplicitPubspecResolution;
final ProcessUtils _processUtils; final ProcessUtils _processUtils;
final String _dartSdkPath; final String _dartSdkPath;
final Logger _logger; final Logger _logger;
final bool _useImplicitPubspecResolution;
late ResidentRunner _residentRunner; late ResidentRunner _residentRunner;
Uri? _webUri; Uri? _webUri;
@ -97,7 +94,6 @@ class WebDriverService extends DriverService {
analytics: globals.analytics, analytics: globals.analytics,
logger: _logger, logger: _logger,
systemClock: globals.systemClock, systemClock: globals.systemClock,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
final Completer<void> appStartedCompleter = Completer<void>.sync(); final Completer<void> appStartedCompleter = Completer<void>.sync();
final Future<int?> runFuture = _residentRunner.run( final Future<int?> runFuture = _residentRunner.run(

View File

@ -53,7 +53,6 @@ class FlutterDeviceManager extends DeviceManager {
required WindowsWorkflow windowsWorkflow, required WindowsWorkflow windowsWorkflow,
required CustomDevicesConfig customDevicesConfig, required CustomDevicesConfig customDevicesConfig,
required TestCompilerNativeAssetsBuilder? nativeAssetsBuilder, required TestCompilerNativeAssetsBuilder? nativeAssetsBuilder,
required bool useImplicitPubspecResolution,
}) : deviceDiscoverers = <DeviceDiscovery>[ }) : deviceDiscoverers = <DeviceDiscovery>[
AndroidDevices( AndroidDevices(
logger: logger, logger: logger,
@ -80,7 +79,6 @@ class FlutterDeviceManager extends DeviceManager {
logger: logger, logger: logger,
artifacts: artifacts, artifacts: artifacts,
nativeAssetsBuilder: nativeAssetsBuilder, nativeAssetsBuilder: nativeAssetsBuilder,
useImplicitPubspecResolution: useImplicitPubspecResolution,
), ),
MacOSDevices( MacOSDevices(
processManager: processManager, processManager: processManager,
@ -105,7 +103,6 @@ class FlutterDeviceManager extends DeviceManager {
logger: logger, logger: logger,
processManager: processManager, processManager: processManager,
featureFlags: featureFlags, featureFlags: featureFlags,
useImplicitPubspecResolution: useImplicitPubspecResolution,
), ),
LinuxDevices( LinuxDevices(
platform: platform, platform: platform,
@ -133,8 +130,7 @@ class FlutterDeviceManager extends DeviceManager {
featureFlags: featureFlags, featureFlags: featureFlags,
processManager: processManager, processManager: processManager,
logger: logger, logger: logger,
config: customDevicesConfig, config: customDevicesConfig
useImplicitPubspecResolution: useImplicitPubspecResolution,
), ),
]; ];

View File

@ -57,7 +57,6 @@ class DwdsWebRunnerFactory extends WebRunnerFactory {
required SystemClock systemClock, required SystemClock systemClock,
required Usage usage, required Usage usage,
required Analytics analytics, required Analytics analytics,
required bool useImplicitPubspecResolution,
bool machine = false, bool machine = false,
}) { }) {
return ResidentWebRunner( return ResidentWebRunner(
@ -73,7 +72,6 @@ class DwdsWebRunnerFactory extends WebRunnerFactory {
systemClock: systemClock, systemClock: systemClock,
fileSystem: fileSystem, fileSystem: fileSystem,
logger: logger, logger: logger,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
} }
} }
@ -89,7 +87,6 @@ class ResidentWebRunner extends ResidentRunner {
bool stayResident = true, bool stayResident = true,
bool machine = false, bool machine = false,
required this.flutterProject, required this.flutterProject,
required bool useImplicitPubspecResolution,
required DebuggingOptions debuggingOptions, required DebuggingOptions debuggingOptions,
required FileSystem fileSystem, required FileSystem fileSystem,
required Logger logger, required Logger logger,
@ -105,7 +102,6 @@ class ResidentWebRunner extends ResidentRunner {
_usage = usage, _usage = usage,
_analytics = analytics, _analytics = analytics,
_urlTunneller = urlTunneller, _urlTunneller = urlTunneller,
_useImplicitPubspecResolution = useImplicitPubspecResolution,
super( super(
<FlutterDevice>[device], <FlutterDevice>[device],
target: target ?? fileSystem.path.join('lib', 'main.dart'), target: target ?? fileSystem.path.join('lib', 'main.dart'),
@ -113,7 +109,6 @@ class ResidentWebRunner extends ResidentRunner {
stayResident: stayResident, stayResident: stayResident,
machine: machine, machine: machine,
devtoolsHandler: devtoolsHandler, devtoolsHandler: devtoolsHandler,
useImplicitPubspecResolution: useImplicitPubspecResolution,
); );
final FileSystem _fileSystem; final FileSystem _fileSystem;
@ -122,7 +117,6 @@ class ResidentWebRunner extends ResidentRunner {
final Usage _usage; final Usage _usage;
final Analytics _analytics; final Analytics _analytics;
final UrlTunneller? _urlTunneller; final UrlTunneller? _urlTunneller;
final bool _useImplicitPubspecResolution;
@override @override
Logger get logger => _logger; Logger get logger => _logger;
@ -351,7 +345,6 @@ Please provide a valid TCP port (an integer between 0 and 65535, inclusive).
flutterVersion: globals.flutterVersion, flutterVersion: globals.flutterVersion,
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
await webBuilder.buildWeb( await webBuilder.buildWeb(
flutterProject, flutterProject,
@ -448,7 +441,6 @@ Please provide a valid TCP port (an integer between 0 and 65535, inclusive).
flutterVersion: globals.flutterVersion, flutterVersion: globals.flutterVersion,
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
await webBuilder.buildWeb( await webBuilder.buildWeb(
flutterProject, flutterProject,

View File

@ -9,7 +9,6 @@ import '../base/common.dart';
import '../base/file_system.dart'; import '../base/file_system.dart';
import '../base/logger.dart'; import '../base/logger.dart';
import '../runner/flutter_command.dart'; import '../runner/flutter_command.dart';
import '../runner/flutter_command_runner.dart';
import 'gen_l10n_types.dart'; import 'gen_l10n_types.dart';
import 'language_subtag_registry.dart'; import 'language_subtag_registry.dart';
@ -472,7 +471,6 @@ LocalizationOptions parseLocalizationsOptionsFromYAML({
required File file, required File file,
required Logger logger, required Logger logger,
required String defaultArbDir, required String defaultArbDir,
required bool defaultSyntheticPackage,
}) { }) {
final String contents = file.readAsStringSync(); final String contents = file.readAsStringSync();
if (contents.trim().isEmpty) { if (contents.trim().isEmpty) {
@ -499,7 +497,7 @@ LocalizationOptions parseLocalizationsOptionsFromYAML({
headerFile: _tryReadUri(yamlNode, 'header-file', logger)?.path, headerFile: _tryReadUri(yamlNode, 'header-file', logger)?.path,
useDeferredLoading: _tryReadBool(yamlNode, 'use-deferred-loading', logger), useDeferredLoading: _tryReadBool(yamlNode, 'use-deferred-loading', logger),
preferredSupportedLocales: _tryReadStringList(yamlNode, 'preferred-supported-locales', logger), preferredSupportedLocales: _tryReadStringList(yamlNode, 'preferred-supported-locales', logger),
syntheticPackage: _tryReadBool(yamlNode, 'synthetic-package', logger) ?? defaultSyntheticPackage, syntheticPackage: _tryReadBool(yamlNode, 'synthetic-package', logger),
requiredResourceAttributes: _tryReadBool(yamlNode, 'required-resource-attributes', logger), requiredResourceAttributes: _tryReadBool(yamlNode, 'required-resource-attributes', logger),
nullableGetter: _tryReadBool(yamlNode, 'nullable-getter', logger), nullableGetter: _tryReadBool(yamlNode, 'nullable-getter', logger),
format: _tryReadBool(yamlNode, 'format', logger), format: _tryReadBool(yamlNode, 'format', logger),
@ -515,15 +513,6 @@ LocalizationOptions parseLocalizationsOptionsFromCommand({
required FlutterCommand command, required FlutterCommand command,
required String defaultArbDir, required String defaultArbDir,
}) { }) {
// TODO(matanlurey): Remove as part of https://github.com/flutter/flutter/issues/102983.
final bool syntheticPackage;
if (command.argResults!.wasParsed('synthetic-package')) {
// If provided explicitly, use the explicit value.
syntheticPackage = command.boolArg('synthetic-package');
} else {
// Otherwise, inherit from whatever the default of --implicit-pubspec-resolution is.
syntheticPackage = command.globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution);
}
return LocalizationOptions( return LocalizationOptions(
arbDir: command.stringArg('arb-dir') ?? defaultArbDir, arbDir: command.stringArg('arb-dir') ?? defaultArbDir,
outputDir: command.stringArg('output-dir'), outputDir: command.stringArg('output-dir'),
@ -535,7 +524,7 @@ LocalizationOptions parseLocalizationsOptionsFromCommand({
headerFile: command.stringArg('header-file'), headerFile: command.stringArg('header-file'),
useDeferredLoading: command.boolArg('use-deferred-loading'), useDeferredLoading: command.boolArg('use-deferred-loading'),
genInputsAndOutputsList: command.stringArg('gen-inputs-and-outputs-list'), genInputsAndOutputsList: command.stringArg('gen-inputs-and-outputs-list'),
syntheticPackage: syntheticPackage, syntheticPackage: command.boolArg('synthetic-package'),
projectDir: command.stringArg('project-dir'), projectDir: command.stringArg('project-dir'),
requiredResourceAttributes: command.boolArg('required-resource-attributes'), requiredResourceAttributes: command.boolArg('required-resource-attributes'),
nullableGetter: command.boolArg('nullable-getter'), nullableGetter: command.boolArg('nullable-getter'),

View File

@ -37,14 +37,12 @@ class PreviewDeviceDiscovery extends PollingDeviceDiscovery {
required Logger logger, required Logger logger,
required ProcessManager processManager, required ProcessManager processManager,
required FeatureFlags featureFlags, required FeatureFlags featureFlags,
required bool useImplicitPubspecResolution,
}) : _artifacts = artifacts, }) : _artifacts = artifacts,
_logger = logger, _logger = logger,
_processManager = processManager, _processManager = processManager,
_fileSystem = fileSystem, _fileSystem = fileSystem,
_platform = platform, _platform = platform,
_features = featureFlags, _features = featureFlags,
_useImplicitPubspecResolution = useImplicitPubspecResolution,
super('Flutter preview device'); super('Flutter preview device');
final Platform _platform; final Platform _platform;
@ -53,7 +51,6 @@ class PreviewDeviceDiscovery extends PollingDeviceDiscovery {
final ProcessManager _processManager; final ProcessManager _processManager;
final FileSystem _fileSystem; final FileSystem _fileSystem;
final FeatureFlags _features; final FeatureFlags _features;
final bool _useImplicitPubspecResolution;
@override @override
bool get canListAnything => _platform.isWindows; bool get canListAnything => _platform.isWindows;
@ -78,7 +75,6 @@ class PreviewDeviceDiscovery extends PollingDeviceDiscovery {
logger: _logger, logger: _logger,
processManager: _processManager, processManager: _processManager,
previewBinary: previewBinary, previewBinary: previewBinary,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
return <Device>[ return <Device>[
if (_features.isPreviewDeviceEnabled) if (_features.isPreviewDeviceEnabled)
@ -103,7 +99,6 @@ class PreviewDevice extends Device {
required FileSystem fileSystem, required FileSystem fileSystem,
required Artifacts artifacts, required Artifacts artifacts,
required File previewBinary, required File previewBinary,
required bool useImplicitPubspecResolution,
@visibleForTesting BundleBuilderFactory builderFactory = _defaultBundleBuilder, @visibleForTesting BundleBuilderFactory builderFactory = _defaultBundleBuilder,
}) : _previewBinary = previewBinary, }) : _previewBinary = previewBinary,
_processManager = processManager, _processManager = processManager,
@ -111,7 +106,6 @@ class PreviewDevice extends Device {
_fileSystem = fileSystem, _fileSystem = fileSystem,
_bundleBuilderFactory = builderFactory, _bundleBuilderFactory = builderFactory,
_artifacts = artifacts, _artifacts = artifacts,
_useImplicitPubspecResolution = useImplicitPubspecResolution,
super('preview', ephemeral: false, category: Category.desktop, platformType: PlatformType.windowsPreview); super('preview', ephemeral: false, category: Category.desktop, platformType: PlatformType.windowsPreview);
final ProcessManager _processManager; final ProcessManager _processManager;
@ -120,7 +114,6 @@ class PreviewDevice extends Device {
final BundleBuilderFactory _bundleBuilderFactory; final BundleBuilderFactory _bundleBuilderFactory;
final Artifacts _artifacts; final Artifacts _artifacts;
final File _previewBinary; final File _previewBinary;
final bool _useImplicitPubspecResolution;
/// The set of plugins that are allowed to be used by Preview users. /// The set of plugins that are allowed to be used by Preview users.
/// ///
@ -191,7 +184,6 @@ class PreviewDevice extends Device {
mainPath: mainPath, mainPath: mainPath,
platform: TargetPlatform.windows_x64, platform: TargetPlatform.windows_x64,
assetDirPath: getAssetBuildDirectory(), assetDirPath: getAssetBuildDirectory(),
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
copyDirectory(_fileSystem.directory( copyDirectory(_fileSystem.directory(
getAssetBuildDirectory()), getAssetBuildDirectory()),

View File

@ -1053,7 +1053,6 @@ abstract class ResidentRunner extends ResidentHandlers {
this.flutterDevices, { this.flutterDevices, {
required this.target, required this.target,
required this.debuggingOptions, required this.debuggingOptions,
required bool useImplicitPubspecResolution,
String? projectRootPath, String? projectRootPath,
this.stayResident = true, this.stayResident = true,
this.hotMode = true, this.hotMode = true,
@ -1064,7 +1063,6 @@ abstract class ResidentRunner extends ResidentHandlers {
packagesFilePath = debuggingOptions.buildInfo.packageConfigPath, packagesFilePath = debuggingOptions.buildInfo.packageConfigPath,
projectRootPath = projectRootPath ?? globals.fs.currentDirectory.path, projectRootPath = projectRootPath ?? globals.fs.currentDirectory.path,
_dillOutputPath = dillOutputPath, _dillOutputPath = dillOutputPath,
_useImplicitPubspecResolution = useImplicitPubspecResolution,
artifactDirectory = dillOutputPath == null artifactDirectory = dillOutputPath == null
? globals.fs.systemTempDirectory.createTempSync('flutter_tool.') ? globals.fs.systemTempDirectory.createTempSync('flutter_tool.')
: globals.fs.file(dillOutputPath).parent, : globals.fs.file(dillOutputPath).parent,
@ -1097,7 +1095,6 @@ abstract class ResidentRunner extends ResidentHandlers {
@override @override
final bool stayResident; final bool stayResident;
final String? _dillOutputPath; final String? _dillOutputPath;
final bool _useImplicitPubspecResolution;
/// The parent location of the incremental artifacts. /// The parent location of the incremental artifacts.
final Directory artifactDirectory; final Directory artifactDirectory;
final String packagesFilePath; final String packagesFilePath;
@ -1224,7 +1221,6 @@ abstract class ResidentRunner extends ResidentHandlers {
// Needed for Dart plugin registry generation. // Needed for Dart plugin registry generation.
kTargetFile: mainPath, kTargetFile: mainPath,
}, },
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
final CompositeTarget compositeTarget = CompositeTarget(<Target>[ final CompositeTarget compositeTarget = CompositeTarget(<Target>[

View File

@ -18,7 +18,6 @@ class ColdRunner extends ResidentRunner {
super.flutterDevices, { super.flutterDevices, {
required super.target, required super.target,
required super.debuggingOptions, required super.debuggingOptions,
required super.useImplicitPubspecResolution,
this.traceStartup = false, this.traceStartup = false,
this.awaitFirstFrameWhenTracing = true, this.awaitFirstFrameWhenTracing = true,
this.applicationBinary, this.applicationBinary,

View File

@ -79,7 +79,6 @@ class HotRunner extends ResidentRunner {
super.flutterDevices, { super.flutterDevices, {
required super.target, required super.target,
required super.debuggingOptions, required super.debuggingOptions,
required super.useImplicitPubspecResolution,
this.benchmarkMode = false, this.benchmarkMode = false,
this.applicationBinary, this.applicationBinary,
this.hostIsIde = false, this.hostIsIde = false,

View File

@ -1770,7 +1770,6 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
projectDir: project.directory, projectDir: project.directory,
packageConfigPath: packageConfigPath(), packageConfigPath: packageConfigPath(),
generateDartPluginRegistry: true, generateDartPluginRegistry: true,
useImplicitPubspecResolution: globalResults!.flag(FlutterGlobalOptions.kImplicitPubspecResolution),
); );
await pub.get( await pub.get(

View File

@ -51,7 +51,6 @@ class FlutterTesterDevice extends Device {
required super.logger, required super.logger,
required FileSystem fileSystem, required FileSystem fileSystem,
required Artifacts artifacts, required Artifacts artifacts,
required bool useImplicitPubspecResolution,
TestCompilerNativeAssetsBuilder? nativeAssetsBuilder, TestCompilerNativeAssetsBuilder? nativeAssetsBuilder,
}) : _processManager = processManager, }) : _processManager = processManager,
_flutterVersion = flutterVersion, _flutterVersion = flutterVersion,
@ -59,7 +58,6 @@ class FlutterTesterDevice extends Device {
_fileSystem = fileSystem, _fileSystem = fileSystem,
_artifacts = artifacts, _artifacts = artifacts,
_nativeAssetsBuilder = nativeAssetsBuilder, _nativeAssetsBuilder = nativeAssetsBuilder,
_useImplicitPubspecResolution = useImplicitPubspecResolution,
super( super(
platformType: null, platformType: null,
category: null, category: null,
@ -72,7 +70,6 @@ class FlutterTesterDevice extends Device {
final FileSystem _fileSystem; final FileSystem _fileSystem;
final Artifacts _artifacts; final Artifacts _artifacts;
final TestCompilerNativeAssetsBuilder? _nativeAssetsBuilder; final TestCompilerNativeAssetsBuilder? _nativeAssetsBuilder;
final bool _useImplicitPubspecResolution;
Process? _process; Process? _process;
final DevicePortForwarder _portForwarder = const NoOpDevicePortForwarder(); final DevicePortForwarder _portForwarder = const NoOpDevicePortForwarder();
@ -167,7 +164,6 @@ class FlutterTesterDevice extends Device {
applicationKernelFilePath: applicationKernelFilePath, applicationKernelFilePath: applicationKernelFilePath,
platform: TargetPlatform.tester, platform: TargetPlatform.tester,
assetDirPath: assetDirectory.path, assetDirPath: assetDirectory.path,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
); );
final List<String> command = <String>[ final List<String> command = <String>[
@ -269,7 +265,6 @@ class FlutterTesterDevices extends PollingDeviceDiscovery {
required ProcessManager processManager, required ProcessManager processManager,
required Logger logger, required Logger logger,
required FlutterVersion flutterVersion, required FlutterVersion flutterVersion,
required bool useImplicitPubspecResolution,
TestCompilerNativeAssetsBuilder? nativeAssetsBuilder, TestCompilerNativeAssetsBuilder? nativeAssetsBuilder,
}) : _testerDevice = FlutterTesterDevice( }) : _testerDevice = FlutterTesterDevice(
kTesterDeviceId, kTesterDeviceId,
@ -279,7 +274,6 @@ class FlutterTesterDevices extends PollingDeviceDiscovery {
logger: logger, logger: logger,
flutterVersion: flutterVersion, flutterVersion: flutterVersion,
nativeAssetsBuilder: nativeAssetsBuilder, nativeAssetsBuilder: nativeAssetsBuilder,
useImplicitPubspecResolution: useImplicitPubspecResolution,
), ),
super('Flutter tester'); super('Flutter tester');

View File

@ -46,15 +46,13 @@ class WebBuilder {
required Analytics analytics, required Analytics analytics,
required FlutterVersion flutterVersion, required FlutterVersion flutterVersion,
required FileSystem fileSystem, required FileSystem fileSystem,
required bool useImplicitPubspecResolution,
}) : _logger = logger, }) : _logger = logger,
_processManager = processManager, _processManager = processManager,
_buildSystem = buildSystem, _buildSystem = buildSystem,
_flutterUsage = usage, _flutterUsage = usage,
_analytics = analytics, _analytics = analytics,
_flutterVersion = flutterVersion, _flutterVersion = flutterVersion,
_fileSystem = fileSystem, _fileSystem = fileSystem;
_useImplicitPubspecResolution = useImplicitPubspecResolution;
final Logger _logger; final Logger _logger;
final ProcessManager _processManager; final ProcessManager _processManager;
@ -63,7 +61,6 @@ class WebBuilder {
final Analytics _analytics; final Analytics _analytics;
final FlutterVersion _flutterVersion; final FlutterVersion _flutterVersion;
final FileSystem _fileSystem; final FileSystem _fileSystem;
final bool _useImplicitPubspecResolution;
Future<void> buildWeb( Future<void> buildWeb(
FlutterProject flutterProject, FlutterProject flutterProject,
@ -119,7 +116,6 @@ class WebBuilder {
// Web uses a different Dart plugin registry. // Web uses a different Dart plugin registry.
// https://github.com/flutter/flutter/issues/80406 // https://github.com/flutter/flutter/issues/80406
generateDartPluginRegistry: false, generateDartPluginRegistry: false,
useImplicitPubspecResolution: _useImplicitPubspecResolution,
)); ));
if (!result.success) { if (!result.success) {
for (final ExceptionMeasurement measurement in result.exceptions.values) { for (final ExceptionMeasurement measurement in result.exceptions.values) {

View File

@ -33,7 +33,6 @@ abstract class WebRunnerFactory {
required SystemClock systemClock, required SystemClock systemClock,
required Usage usage, required Usage usage,
required Analytics analytics, required Analytics analytics,
required bool useImplicitPubspecResolution,
bool machine = false, bool machine = false,
}); });
} }

View File

@ -1260,7 +1260,6 @@ class FakeHotRunnerFactory extends Fake implements HotRunnerFactory {
Analytics? analytics, Analytics? analytics,
String? nativeAssetsYamlFile, String? nativeAssetsYamlFile,
HotRunnerNativeAssetsBuilder? nativeAssetsBuilder, HotRunnerNativeAssetsBuilder? nativeAssetsBuilder,
required bool useImplicitPubspecResolution,
}) { }) {
if (_artifactTester != null) { if (_artifactTester != null) {
for (final FlutterDevice device in devices) { for (final FlutterDevice device in devices) {

View File

@ -99,7 +99,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'daemon.version'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'daemon.version'}));
final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent); final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent);
@ -112,7 +111,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
// Use the flutter_gallery project which has a known set of supported platforms. // Use the flutter_gallery project which has a known set of supported platforms.
final String projectPath = globals.fs.path.join(getFlutterRoot(), 'dev', 'integration_tests', 'flutter_gallery'); final String projectPath = globals.fs.path.join(getFlutterRoot(), 'dev', 'integration_tests', 'flutter_gallery');
@ -217,7 +215,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
globals.printError('daemon.logMessage test'); globals.printError('daemon.logMessage test');
final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere((DaemonMessage message) { final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere((DaemonMessage message) {
@ -236,7 +233,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
globals.printWarning('daemon.logMessage test'); globals.printWarning('daemon.logMessage test');
final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere((DaemonMessage message) { final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere((DaemonMessage message) {
@ -257,7 +253,6 @@ void main() {
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
logToStdout: true, logToStdout: true,
useImplicitPubspecResolution: true,
); );
globals.printStatus('daemon.logMessage test'); globals.printStatus('daemon.logMessage test');
return Future<void>.value(); return Future<void>.value();
@ -274,7 +269,6 @@ void main() {
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
logToStdout: true, logToStdout: true,
useImplicitPubspecResolution: true,
); );
globals.printBox('This is the box message', title: 'Sample title'); globals.printBox('This is the box message', title: 'Sample title');
return Future<void>.value(); return Future<void>.value();
@ -289,7 +283,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
notifyingLogger.notifyVerbose = false; notifyingLogger.notifyVerbose = false;
globals.printTrace('daemon.logMessage test 1'); globals.printTrace('daemon.logMessage test 1');
@ -311,7 +304,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
expect(notifyingLogger.notifyVerbose, false); expect(notifyingLogger.notifyVerbose, false);
@ -330,7 +322,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
notifyingLogger.notifyVerbose = false; notifyingLogger.notifyVerbose = false;
@ -349,7 +340,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'daemon.shutdown'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'daemon.shutdown'}));
return daemon.onExit.then<void>((int code) async { return daemon.onExit.then<void>((int code) async {
@ -362,7 +352,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'app.restart'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'app.restart'}));
@ -375,7 +364,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{ daemonStreams.inputs.add(DaemonMessage(<String, Object?>{
@ -394,7 +382,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'app.stop'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'app.stop'}));
@ -407,7 +394,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'device.getDevices'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'device.getDevices'}));
final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent); final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent);
@ -419,7 +405,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer); daemon.deviceDomain.addDeviceDiscoverer(discoverer);
@ -436,7 +421,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
@ -450,7 +434,6 @@ void main() {
previewBinary: fs.file(r'preview_device.exe'), previewBinary: fs.file(r'preview_device.exe'),
artifacts: Artifacts.test(fileSystem: fs), artifacts: Artifacts.test(fileSystem: fs),
builderFactory: () => throw UnimplementedError('TODO implement builder factory'), builderFactory: () => throw UnimplementedError('TODO implement builder factory'),
useImplicitPubspecResolution: true,
)); ));
final List<Map<String, Object?>> names = <Map<String, Object?>>[]; final List<Map<String, Object?>> names = <Map<String, Object?>>[];
@ -521,7 +504,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'device.discoverDevices'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'device.discoverDevices'}));
final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent); final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent);
@ -533,7 +515,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer); daemon.deviceDomain.addDeviceDiscoverer(discoverer);
@ -551,7 +532,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer); daemon.deviceDomain.addDeviceDiscoverer(discoverer);
@ -576,7 +556,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer); daemon.deviceDomain.addDeviceDiscoverer(discoverer);
@ -628,7 +607,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer); daemon.deviceDomain.addDeviceDiscoverer(discoverer);
@ -695,7 +673,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer); daemon.deviceDomain.addDeviceDiscoverer(discoverer);
@ -755,7 +732,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final FakePollingDeviceDiscovery discoverer1 = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer1 = FakePollingDeviceDiscovery();
discoverer1.diagnostics = <String>['fake diagnostic 1', 'fake diagnostic 2']; discoverer1.diagnostics = <String>['fake diagnostic 1', 'fake diagnostic 2'];
@ -781,7 +757,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'emulator.launch'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'emulator.launch'}));
@ -794,7 +769,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
final Map<String, Object?> params = <String, Object?>{'emulatorId': 'device', 'coldBoot': 1}; final Map<String, Object?> params = <String, Object?>{'emulatorId': 'device', 'coldBoot': 1};
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'emulator.launch', 'params': params})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'emulator.launch', 'params': params}));
@ -807,7 +781,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'emulator.getEmulators'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'emulator.getEmulators'}));
final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent); final DaemonMessage response = await daemonStreams.outputs.stream.firstWhere(_notEvent);
@ -822,7 +795,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
// Respond to any requests from the daemon to expose a URL. // Respond to any requests from the daemon to expose a URL.
@ -842,7 +814,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'devtools.serve'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'devtools.serve'}));
@ -859,7 +830,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'devtools.serve'})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'devtools.serve'}));
@ -890,7 +860,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'proxy.connect', 'params': <String, Object?>{'port': 123}})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'proxy.connect', 'params': <String, Object?>{'port': 123}}));
@ -951,7 +920,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'proxy.connect', 'params': <String, Object?>{'port': 123}})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'proxy.connect', 'params': <String, Object?>{'port': 123}}));
@ -972,7 +940,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
daemonConnection, daemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'proxy.connect', 'params': <String, Object?>{'port': 123}})); daemonStreams.inputs.add(DaemonMessage(<String, Object?>{'id': 0, 'method': 'proxy.connect', 'params': <String, Object?>{'port': 123}}));

View File

@ -64,7 +64,7 @@ void main() {
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
}); });
testUsingContext('not using synthetic packages (explicitly)', () async { testUsingContext('not using synthetic packages', () async {
final Directory l10nDirectory = fileSystem.directory( final Directory l10nDirectory = fileSystem.directory(
fileSystem.path.join('lib', 'l10n'), fileSystem.path.join('lib', 'l10n'),
); );
@ -104,46 +104,6 @@ flutter:
ProcessManager: () => FakeProcessManager.any(), ProcessManager: () => FakeProcessManager.any(),
}); });
testUsingContext('not using synthetic packages (due to --no-implicit-pubspec-resolution)', () async {
final Directory l10nDirectory = fileSystem.directory(
fileSystem.path.join('lib', 'l10n'),
);
final File arbFile = l10nDirectory.childFile(
'app_en.arb',
)..createSync(recursive: true);
arbFile.writeAsStringSync('''
{
"helloWorld": "Hello, World!",
"@helloWorld": {
"description": "Sample description"
}
}''');
fileSystem.file('pubspec.yaml').writeAsStringSync('''
flutter:
generate: true''');
final GenerateLocalizationsCommand command = GenerateLocalizationsCommand(
fileSystem: fileSystem,
logger: logger,
artifacts: artifacts,
processManager: processManager,
);
await createTestCommandRunner(command).run(<String>[
'--no-implicit-pubspec-resolution',
'gen-l10n',
]);
expect(l10nDirectory.existsSync(), true);
expect(l10nDirectory.childFile('app_localizations_en.dart').existsSync(),
true);
expect(
l10nDirectory.childFile('app_localizations.dart').existsSync(), true);
}, overrides: <Type, Generator>{
FileSystem: () => fileSystem,
ProcessManager: () => FakeProcessManager.any(),
});
testUsingContext('throws error when arguments are invalid', () async { testUsingContext('throws error when arguments are invalid', () async {
final File arbFile = fileSystem.file(fileSystem.path.join('lib', 'l10n', 'app_en.arb')) final File arbFile = fileSystem.file(fileSystem.path.join('lib', 'l10n', 'app_en.arb'))
..createSync(recursive: true); ..createSync(recursive: true);

View File

@ -71,7 +71,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
serverDaemonConnection, serverDaemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
fakeDevice = FakeAndroidDevice(); fakeDevice = FakeAndroidDevice();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
@ -93,7 +92,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
serverDaemonConnection, serverDaemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
fakeDevice = FakeAndroidDevice(); fakeDevice = FakeAndroidDevice();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
@ -116,7 +114,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
serverDaemonConnection, serverDaemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
fakeDevice = FakeAndroidDevice(); fakeDevice = FakeAndroidDevice();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
@ -147,7 +144,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
serverDaemonConnection, serverDaemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
fakeDevice = FakeAndroidDevice(); fakeDevice = FakeAndroidDevice();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
@ -201,7 +197,6 @@ void main() {
daemon = Daemon( daemon = Daemon(
serverDaemonConnection, serverDaemonConnection,
notifyingLogger: notifyingLogger, notifyingLogger: notifyingLogger,
useImplicitPubspecResolution: true,
); );
fakeDevice = FakeAndroidDevice(); fakeDevice = FakeAndroidDevice();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery(); final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();

View File

@ -1584,14 +1584,14 @@ class DaemonCapturingRunCommand extends RunCommand {
@override @override
Daemon createMachineDaemon() { Daemon createMachineDaemon() {
daemon = super.createMachineDaemon(); daemon = super.createMachineDaemon();
appDomain = daemon.appDomain = CapturingAppDomain(daemon, useImplicitPubspecResolution: true); appDomain = daemon.appDomain = CapturingAppDomain(daemon);
daemon.registerDomain(appDomain); daemon.registerDomain(appDomain);
return daemon; return daemon;
} }
} }
class CapturingAppDomain extends AppDomain { class CapturingAppDomain extends AppDomain {
CapturingAppDomain(super.daemon, {required super.useImplicitPubspecResolution}); CapturingAppDomain(super.daemon);
String? userIdentifier; String? userIdentifier;
bool? enableDevTools; bool? enableDevTools;

View File

@ -544,6 +544,5 @@ class FakeBundleBuilder extends Fake implements BundleBuilder {
String? assetDirPath, String? assetDirPath,
bool buildNativeAssets = true, bool buildNativeAssets = true,
@visibleForTesting BuildSystem? buildSystem, @visibleForTesting BuildSystem? buildSystem,
required bool useImplicitPubspecResolution,
}) async {} }) async {}
} }

View File

@ -53,7 +53,6 @@ nullable-getter: false
file: configFile, file: configFile,
logger: BufferLogger.test(), logger: BufferLogger.test(),
defaultArbDir: fileSystem.path.join('lib', 'l10n'), defaultArbDir: fileSystem.path.join('lib', 'l10n'),
defaultSyntheticPackage: true,
); );
expect(options.arbDir, Uri.parse('arb').path); expect(options.arbDir, Uri.parse('arb').path);
@ -70,65 +69,6 @@ nullable-getter: false
expect(options.nullableGetter, false); expect(options.nullableGetter, false);
}); });
testWithoutContext(
'parseLocalizationsOptions uses defaultSyntheticPackage = true', () async {
final FileSystem fileSystem = MemoryFileSystem.test();
final File configFile = fileSystem.file('l10n.yaml')..writeAsStringSync('''
arb-dir: arb
template-arb-file: example.arb
output-localization-file: bar
untranslated-messages-file: untranslated
output-class: Foo
header-file: header
header: HEADER
use-deferred-loading: true
preferred-supported-locales: en_US
# Intentionally omitted
# synthetic-package: ...
required-resource-attributes: false
nullable-getter: false
''');
final LocalizationOptions options = parseLocalizationsOptionsFromYAML(
file: configFile,
logger: BufferLogger.test(),
defaultArbDir: fileSystem.path.join('lib', 'l10n'),
defaultSyntheticPackage: true,
);
expect(options.syntheticPackage, true);
});
testWithoutContext(
'parseLocalizationsOptions uses defaultSyntheticPackage = false',
() async {
final FileSystem fileSystem = MemoryFileSystem.test();
final File configFile = fileSystem.file('l10n.yaml')..writeAsStringSync('''
arb-dir: arb
template-arb-file: example.arb
output-localization-file: bar
untranslated-messages-file: untranslated
output-class: Foo
header-file: header
header: HEADER
use-deferred-loading: true
preferred-supported-locales: en_US
# Intentionally omitted
# synthetic-package: ...
required-resource-attributes: false
nullable-getter: false
''');
final LocalizationOptions options = parseLocalizationsOptionsFromYAML(
file: configFile,
logger: BufferLogger.test(),
defaultArbDir: fileSystem.path.join('lib', 'l10n'),
defaultSyntheticPackage: false,
);
expect(options.syntheticPackage, false);
});
testWithoutContext('parseLocalizationsOptions handles preferredSupportedLocales as list', () async { testWithoutContext('parseLocalizationsOptions handles preferredSupportedLocales as list', () async {
final FileSystem fileSystem = MemoryFileSystem.test(); final FileSystem fileSystem = MemoryFileSystem.test();
final File configFile = fileSystem.file('l10n.yaml')..writeAsStringSync(''' final File configFile = fileSystem.file('l10n.yaml')..writeAsStringSync('''
@ -139,7 +79,6 @@ preferred-supported-locales: ['en_US', 'de']
file: configFile, file: configFile,
logger: BufferLogger.test(), logger: BufferLogger.test(),
defaultArbDir: fileSystem.path.join('lib', 'l10n'), defaultArbDir: fileSystem.path.join('lib', 'l10n'),
defaultSyntheticPackage: true,
); );
expect(options.preferredSupportedLocales, <String>['en_US', 'de']); expect(options.preferredSupportedLocales, <String>['en_US', 'de']);
@ -158,7 +97,6 @@ use-deferred-loading: string
file: configFile, file: configFile,
logger: BufferLogger.test(), logger: BufferLogger.test(),
defaultArbDir: fileSystem.path.join('lib', 'l10n'), defaultArbDir: fileSystem.path.join('lib', 'l10n'),
defaultSyntheticPackage: true,
), ),
throwsException, throwsException,
); );
@ -175,7 +113,6 @@ template-arb-file: {name}_en.arb
file: configFile, file: configFile,
logger: BufferLogger.test(), logger: BufferLogger.test(),
defaultArbDir: fileSystem.path.join('lib', 'l10n'), defaultArbDir: fileSystem.path.join('lib', 'l10n'),
defaultSyntheticPackage: true,
), ),
throwsToolExit(), throwsToolExit(),
); );

View File

@ -47,8 +47,7 @@ void main() {
mainPath: globals.fs.path.join('lib', 'main.dart'), mainPath: globals.fs.path.join('lib', 'main.dart'),
assetDirPath: 'example', assetDirPath: 'example',
depfilePath: 'example.d', depfilePath: 'example.d',
buildSystem: buildSystem, buildSystem: buildSystem
useImplicitPubspecResolution: true,
); );
expect(globals.fs.file(globals.fs.path.join('example', 'kernel_blob.bin')).existsSync(), true); expect(globals.fs.file(globals.fs.path.join('example', 'kernel_blob.bin')).existsSync(), true);
expect(globals.fs.file(globals.fs.path.join('example', 'LICENSE')).existsSync(), true); expect(globals.fs.file(globals.fs.path.join('example', 'LICENSE')).existsSync(), true);
@ -137,8 +136,7 @@ void main() {
mainPath: 'lib/main.dart', mainPath: 'lib/main.dart',
assetDirPath: 'example', assetDirPath: 'example',
depfilePath: 'example.d', depfilePath: 'example.d',
buildSystem: TestBuildSystem.all(BuildResult(success: false)), buildSystem: TestBuildSystem.all(BuildResult(success: false))
useImplicitPubspecResolution: true,
), ),
throwsToolExit() throwsToolExit()
); );
@ -183,8 +181,7 @@ void main() {
mainPath: mainPath, mainPath: mainPath,
assetDirPath: assetDirPath, assetDirPath: assetDirPath,
depfilePath: depfilePath, depfilePath: depfilePath,
buildSystem: buildSystem, buildSystem: buildSystem
useImplicitPubspecResolution: true,
); );
expect(env, isNotNull); expect(env, isNotNull);

View File

@ -42,7 +42,6 @@ void main() {
final int exitCode = await ColdRunner(devices, final int exitCode = await ColdRunner(devices,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
useImplicitPubspecResolution: true,
).attach(); ).attach();
expect(exitCode, 2); expect(exitCode, 2);
}); });
@ -59,7 +58,6 @@ void main() {
await ColdRunner(devices, await ColdRunner(devices,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
useImplicitPubspecResolution: true,
).cleanupAtFinish(); ).cleanupAtFinish();
expect(flutterDevice1.stopEchoingDeviceLogCount, 1); expect(flutterDevice1.stopEchoingDeviceLogCount, 1);
@ -89,7 +87,6 @@ void main() {
applicationBinary: applicationBinary, applicationBinary: applicationBinary,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
useImplicitPubspecResolution: true,
).run(); ).run();
expect(result, 1); expect(result, 1);
@ -106,7 +103,6 @@ void main() {
debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
traceStartup: true, traceStartup: true,
useImplicitPubspecResolution: true,
).run(); ).run();
expect(result, 0); expect(result, 0);
@ -130,7 +126,6 @@ void main() {
debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
traceStartup: true, traceStartup: true,
useImplicitPubspecResolution: true,
).run(); ).run();
expect(result, 0); expect(result, 0);

View File

@ -29,7 +29,6 @@ void main() {
bindPorts.add(port); bindPorts.add(port);
return socket; return socket;
}, },
useImplicitPubspecResolution: true,
); );
await server.run(); await server.run();
expect(bindCalledTimes, 1); expect(bindCalledTimes, 1);
@ -57,7 +56,6 @@ void main() {
} }
return socket; return socket;
}, },
useImplicitPubspecResolution: true,
); );
await server.run(); await server.run();
expect(bindCalledTimes, 2); expect(bindCalledTimes, 2);

View File

@ -122,8 +122,7 @@ void main() {
final CustomDevice device = CustomDevice( final CustomDevice device = CustomDevice(
config: testConfig, config: testConfig,
processManager: FakeProcessManager.any(), processManager: FakeProcessManager.any(),
logger: BufferLogger.test(), logger: BufferLogger.test()
useImplicitPubspecResolution: true,
); );
final PrebuiltLinuxApp linuxApp = PrebuiltLinuxApp(executable: 'foo'); final PrebuiltLinuxApp linuxApp = PrebuiltLinuxApp(executable: 'foo');
@ -166,8 +165,7 @@ void main() {
fileSystem: fs, fileSystem: fs,
directory: dir, directory: dir,
logger: BufferLogger.test() logger: BufferLogger.test()
), )
useImplicitPubspecResolution: true,
).devices(), <Device>[]); ).devices(), <Device>[]);
}); });
@ -185,8 +183,7 @@ void main() {
fileSystem: fs, fileSystem: fs,
directory: dir, directory: dir,
logger: BufferLogger.test() logger: BufferLogger.test()
), )
useImplicitPubspecResolution: true,
).devices(), <Device>[]); ).devices(), <Device>[]);
}); });
@ -210,8 +207,7 @@ void main() {
fileSystem: fs, fileSystem: fs,
directory: dir, directory: dir,
logger: BufferLogger.test() logger: BufferLogger.test()
), )
useImplicitPubspecResolution: true,
).devices(), ).devices(),
hasLength(1) hasLength(1)
); );
@ -240,7 +236,6 @@ void main() {
directory: dir, directory: dir,
logger: BufferLogger.test(), logger: BufferLogger.test(),
), ),
useImplicitPubspecResolution: true,
); );
final List<Device> discoveredDevices = await discovery.discoverDevices(); final List<Device> discoveredDevices = await discovery.discoverDevices();
@ -270,7 +265,6 @@ void main() {
directory: dir, directory: dir,
logger: BufferLogger.test(), logger: BufferLogger.test(),
), ),
useImplicitPubspecResolution: true,
); );
expect(await discovery.discoverDevices(), hasLength(0)); expect(await discovery.discoverDevices(), hasLength(0));
@ -295,7 +289,6 @@ void main() {
directory: dir, directory: dir,
logger: BufferLogger.test(), logger: BufferLogger.test(),
), ),
useImplicitPubspecResolution: true,
); );
expect(await discovery.discoverDevices(), hasLength(0)); expect(await discovery.discoverDevices(), hasLength(0));
@ -315,7 +308,6 @@ void main() {
config: testConfig, config: testConfig,
logger: BufferLogger.test(), logger: BufferLogger.test(),
processManager: FakeProcessManager.any(), processManager: FakeProcessManager.any(),
useImplicitPubspecResolution: true,
).isSupportedForProject(flutterProject), true); ).isSupportedForProject(flutterProject), true);
}); });
@ -330,8 +322,7 @@ void main() {
processManager: FakeProcessManager.list(<FakeCommand>[ processManager: FakeProcessManager.list(<FakeCommand>[
FakeCommand(command: testConfig.uninstallCommand), FakeCommand(command: testConfig.uninstallCommand),
FakeCommand(command: testConfig.installCommand, onRun: (_) => bothCommandsWereExecuted = true), FakeCommand(command: testConfig.installCommand, onRun: (_) => bothCommandsWereExecuted = true),
]), ])
useImplicitPubspecResolution: true,
); );
expect(await device.installApp(PrebuiltLinuxApp(executable: 'exe')), true); expect(await device.installApp(PrebuiltLinuxApp(executable: 'exe')), true);
@ -393,8 +384,7 @@ void main() {
device: CustomDevice( device: CustomDevice(
config: testConfig, config: testConfig,
logger: BufferLogger.test(), logger: BufferLogger.test(),
processManager: processManager, processManager: processManager
useImplicitPubspecResolution: true,
), ),
appPackage: PrebuiltLinuxApp(executable: 'testexecutable'), appPackage: PrebuiltLinuxApp(executable: 'testexecutable'),
logger: BufferLogger.test(), logger: BufferLogger.test(),
@ -431,8 +421,7 @@ void main() {
device: CustomDevice( device: CustomDevice(
config: testConfigNonForwarding, config: testConfigNonForwarding,
logger: BufferLogger.test(), logger: BufferLogger.test(),
processManager: processManager, processManager: processManager
useImplicitPubspecResolution: true,
), ),
appPackage: PrebuiltLinuxApp(executable: 'testexecutable'), appPackage: PrebuiltLinuxApp(executable: 'testexecutable'),
logger: BufferLogger.test(), logger: BufferLogger.test(),
@ -497,8 +486,7 @@ void main() {
fileSystem: fs, fileSystem: fs,
directory: configFileDir, directory: configFileDir,
logger: BufferLogger.test() logger: BufferLogger.test()
), )
useImplicitPubspecResolution: true,
); );
final List<Device> devices = await customDevices.discoverDevices(); final List<Device> devices = await customDevices.discoverDevices();
@ -547,8 +535,7 @@ void main() {
final CustomDevice device = CustomDevice( final CustomDevice device = CustomDevice(
config: testConfig, config: testConfig,
logger: BufferLogger.test(), logger: BufferLogger.test(),
processManager: processManager, processManager: processManager
useImplicitPubspecResolution: true,
); );
expect(device.supportsScreenshot, true); expect(device.supportsScreenshot, true);
@ -576,8 +563,7 @@ void main() {
explicitScreenshotCommand: true explicitScreenshotCommand: true
), ),
logger: BufferLogger.test(), logger: BufferLogger.test(),
processManager: processManager, processManager: processManager
useImplicitPubspecResolution: true,
); );
expect(device.supportsScreenshot, false); expect(device.supportsScreenshot, false);
@ -595,8 +581,7 @@ void main() {
platform: TargetPlatform.linux_x64 platform: TargetPlatform.linux_x64
), ),
logger: BufferLogger.test(), logger: BufferLogger.test(),
processManager: FakeProcessManager.empty(), processManager: FakeProcessManager.empty()
useImplicitPubspecResolution: true,
); );
expect(await device.targetPlatform, TargetPlatform.linux_x64); expect(await device.targetPlatform, TargetPlatform.linux_x64);
@ -664,7 +649,6 @@ class FakeBundleBuilder extends Fake implements BundleBuilder {
String? assetDirPath, String? assetDirPath,
Uri? nativeAssets, Uri? nativeAssets,
bool buildNativeAssets = true, bool buildNativeAssets = true,
required bool useImplicitPubspecResolution,
@visibleForTesting BuildSystem? buildSystem @visibleForTesting BuildSystem? buildSystem
}) async {} }) async {}
} }

View File

@ -318,7 +318,6 @@ class FakeWebRunnerFactory implements WebRunnerFactory {
Usage? usage, Usage? usage,
Analytics? analytics, Analytics? analytics,
bool machine = false, bool machine = false,
required bool useImplicitPubspecResolution,
}) { }) {
expect(stayResident, isTrue); expect(stayResident, isTrue);
return FakeResidentRunner( return FakeResidentRunner(
@ -382,7 +381,6 @@ WebDriverService setUpDriverService() {
processManager: FakeProcessManager.any(), processManager: FakeProcessManager.any(),
), ),
dartSdkPath: 'dart', dartSdkPath: 'dart',
useImplicitPubspecResolution: true,
); );
} }

View File

@ -149,7 +149,6 @@ void main() {
debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
analytics: fakeAnalytics, analytics: fakeAnalytics,
).restart(fullRestart: true); ).restart(fullRestart: true);
expect(result.isOk, false); expect(result.isOk, false);
@ -182,7 +181,6 @@ void main() {
debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
reassembleHelper: ( reassembleHelper: (
List<FlutterDevice?> flutterDevices, List<FlutterDevice?> flutterDevices,
Map<FlutterDevice?, List<FlutterView>> viewCache, Map<FlutterDevice?, List<FlutterView>> viewCache,
@ -232,7 +230,6 @@ void main() {
debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
).cleanupAfterSignal(); ).cleanupAfterSignal();
expect(shutdownTestingConfig.shutdownHookCalled, true); expect(shutdownTestingConfig.shutdownHookCalled, true);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
@ -261,7 +258,6 @@ void main() {
debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.disabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
).preExit(); ).preExit();
expect(shutdownTestingConfig.shutdownHookCalled, true); expect(shutdownTestingConfig.shutdownHookCalled, true);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
@ -312,7 +308,6 @@ void main() {
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
stopwatchFactory: fakeStopwatchFactory, stopwatchFactory: fakeStopwatchFactory,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
).restart(fullRestart: true); ).restart(fullRestart: true);
expect(result.isOk, true); expect(result.isOk, true);
@ -400,7 +395,6 @@ void main() {
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
stopwatchFactory: fakeStopwatchFactory, stopwatchFactory: fakeStopwatchFactory,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
reloadSourcesHelper: ( reloadSourcesHelper: (
HotRunner hotRunner, HotRunner hotRunner,
List<FlutterDevice?> flutterDevices, List<FlutterDevice?> flutterDevices,
@ -507,7 +501,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await expectLater(runner.restart(fullRestart: true), throwsA(isA<Exception>().having((Exception e) => e.toString(), 'message', 'Exception: updateDevFS failed'))); await expectLater(runner.restart(fullRestart: true), throwsA(isA<Exception>().having((Exception e) => e.toString(), 'message', 'Exception: updateDevFS failed')));
@ -543,7 +536,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await expectLater(runner.restart(), throwsA(isA<Exception>().having((Exception e) => e.toString(), 'message', 'Exception: updateDevFS failed'))); await expectLater(runner.restart(), throwsA(isA<Exception>().having((Exception e) => e.toString(), 'message', 'Exception: updateDevFS failed')));
@ -597,7 +589,6 @@ void main() {
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
).attach(needsFullRestart: false); ).attach(needsFullRestart: false);
expect(exitCode, 2); expect(exitCode, 2);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
@ -636,7 +627,6 @@ void main() {
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
target: 'main.dart', target: 'main.dart',
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
).cleanupAtFinish(); ).cleanupAtFinish();
expect(device1.disposed, true); expect(device1.disposed, true);

View File

@ -89,7 +89,6 @@ void main() {
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner), nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner),
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
final OperationResult result = await hotRunner.restart(fullRestart: true); final OperationResult result = await hotRunner.restart(fullRestart: true);
expect(result.isOk, true); expect(result.isOk, true);
@ -158,7 +157,6 @@ void main() {
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner), nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner),
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
expect( expect(
() => hotRunner.run(), () => hotRunner.run(),

View File

@ -74,7 +74,6 @@ void main() {
nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner), nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner),
analytics: FakeAnalytics(), analytics: FakeAnalytics(),
nativeAssetsYamlFile: 'foo.yaml', nativeAssetsYamlFile: 'foo.yaml',
useImplicitPubspecResolution: true,
); );
final int result = await residentRunner.run(); final int result = await residentRunner.run();

View File

@ -49,7 +49,6 @@ void main() {
processManager: FakeProcessManager.any(), processManager: FakeProcessManager.any(),
previewBinary: previewBinary, previewBinary: previewBinary,
logger: BufferLogger.test(), logger: BufferLogger.test(),
useImplicitPubspecResolution: true,
); );
expect(await device.isLocalEmulator, false); expect(await device.isLocalEmulator, false);
@ -85,7 +84,6 @@ void main() {
]), ]),
logger: logger, logger: logger,
builderFactory: () => FakeBundleBuilder(fs), builderFactory: () => FakeBundleBuilder(fs),
useImplicitPubspecResolution: true,
); );
final Directory previewDeviceCacheDir = fs final Directory previewDeviceCacheDir = fs
.directory('Artifact.windowsDesktopPath.TargetPlatform.windows_x64.debug') .directory('Artifact.windowsDesktopPath.TargetPlatform.windows_x64.debug')
@ -123,7 +121,6 @@ void main() {
processManager: processManager, processManager: processManager,
platform: linuxPlatform, platform: linuxPlatform,
featureFlags: featureFlags, featureFlags: featureFlags,
useImplicitPubspecResolution: true,
); );
final List<Device> devices = await discovery.devices(); final List<Device> devices = await discovery.devices();
@ -139,7 +136,6 @@ void main() {
processManager: processManager, processManager: processManager,
platform: macPlatform, platform: macPlatform,
featureFlags: featureFlags, featureFlags: featureFlags,
useImplicitPubspecResolution: true,
); );
final List<Device> devices = await discovery.devices(); final List<Device> devices = await discovery.devices();
@ -157,7 +153,6 @@ void main() {
processManager: processManager, processManager: processManager,
platform: windowsPlatform, platform: windowsPlatform,
featureFlags: featureFlags, featureFlags: featureFlags,
useImplicitPubspecResolution: true,
); );
final List<Device> devices = await discovery.devices(); final List<Device> devices = await discovery.devices();
@ -175,7 +170,6 @@ void main() {
processManager: processManager, processManager: processManager,
platform: windowsPlatform, platform: windowsPlatform,
featureFlags: featureFlags, featureFlags: featureFlags,
useImplicitPubspecResolution: true,
); );
final List<Device> devices = await discovery.devices(); final List<Device> devices = await discovery.devices();
@ -203,8 +197,7 @@ class FakeBundleBuilder extends Fake implements BundleBuilder {
String? depfilePath, String? depfilePath,
String? assetDirPath, String? assetDirPath,
bool buildNativeAssets = true, bool buildNativeAssets = true,
@visibleForTesting BuildSystem? buildSystem, @visibleForTesting BuildSystem? buildSystem
required bool useImplicitPubspecResolution,
}) async { }) async {
final Directory assetDirectory = fileSystem final Directory assetDirectory = fileSystem
.directory(assetDirPath) .directory(assetDirPath)

View File

@ -63,7 +63,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
analytics: fakeAnalytics, analytics: fakeAnalytics,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
Analytics: () => FakeAnalytics(), Analytics: () => FakeAnalytics(),
@ -115,7 +114,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: true,
); );
flutterDevice.generator = residentCompiler; flutterDevice.generator = residentCompiler;
@ -140,7 +138,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: true,
); );
flutterDevice.generator = residentCompiler; flutterDevice.generator = residentCompiler;
@ -162,7 +159,6 @@ void main() {
debuggingOptions: DebuggingOptions.enabled(BuildInfo.release), debuggingOptions: DebuggingOptions.enabled(BuildInfo.release),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
flutterDevice.runColdCode = 1; flutterDevice.runColdCode = 1;
@ -184,7 +180,6 @@ void main() {
debuggingOptions: DebuggingOptions.enabled(BuildInfo.release), debuggingOptions: DebuggingOptions.enabled(BuildInfo.release),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
flutterDevice.runColdError = Exception('BAD STUFF'); flutterDevice.runColdError = Exception('BAD STUFF');
@ -213,7 +208,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: true,
); );
flutterDevice.generator = residentCompiler; flutterDevice.generator = residentCompiler;
@ -274,7 +268,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: globals.analytics, analytics: globals.analytics,
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync(); final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync();
final Completer<void> futureAppStart = Completer<void>.sync(); final Completer<void> futureAppStart = Completer<void>.sync();
@ -416,7 +409,6 @@ void main() {
enableDevTools: false, enableDevTools: false,
), ),
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync(); final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync();
final Completer<void> futureAppStart = Completer<void>.sync(); final Completer<void> futureAppStart = Completer<void>.sync();
@ -481,7 +473,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync(); final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync();
final Completer<void> futureAppStart = Completer<void>.sync(); final Completer<void> futureAppStart = Completer<void>.sync();
@ -746,7 +737,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
devFS.nextUpdateReport = UpdateFSReport( devFS.nextUpdateReport = UpdateFSReport(
success: true, success: true,
@ -1091,7 +1081,6 @@ void main() {
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
expect(otherRunner.artifactDirectory.path, contains('foobar')); expect(otherRunner.artifactDirectory.path, contains('foobar'));
})); }));
@ -1205,7 +1194,6 @@ flutter:
target: 'custom_main.dart', target: 'custom_main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await residentRunner.runSourceGenerators(); await residentRunner.runSourceGenerators();
@ -1266,7 +1254,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
flutterDevice.generator = residentCompiler; flutterDevice.generator = residentCompiler;
@ -1367,7 +1354,6 @@ flutter:
debuggingOptions: DebuggingOptions.disabled(BuildInfo.release), debuggingOptions: DebuggingOptions.disabled(BuildInfo.release),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
residentRunner.printHelp(details: true); residentRunner.printHelp(details: true);
@ -1403,7 +1389,6 @@ flutter:
debuggingOptions: DebuggingOptions.disabled(BuildInfo.release), debuggingOptions: DebuggingOptions.disabled(BuildInfo.release),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
residentRunner.printHelp(details: false); residentRunner.printHelp(details: false);
@ -1493,7 +1478,6 @@ flutter:
debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile, vmserviceOutFile: 'foo', enableDevTools: false), debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile, vmserviceOutFile: 'foo', enableDevTools: false),
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
final Future<int?> result = residentRunner.attach(); final Future<int?> result = residentRunner.attach();
@ -1539,7 +1523,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await residentRunner.run(); await residentRunner.run();
@ -1570,7 +1553,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC'); residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
@ -1602,7 +1584,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC'); residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
@ -1635,7 +1616,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC'); residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
@ -1660,7 +1640,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC'); residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
@ -1686,7 +1665,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC'); residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
@ -1716,7 +1694,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC'); residentRunner.artifactDirectory.childFile('app.dill').writeAsStringSync('ABC');
@ -1740,7 +1717,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await residentRunner.run(); await residentRunner.run();
@ -1762,7 +1738,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await residentRunner.run(); await residentRunner.run();
@ -1786,7 +1761,6 @@ flutter:
debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile, vmserviceOutFile: 'foo'), debuggingOptions: DebuggingOptions.enabled(BuildInfo.profile, vmserviceOutFile: 'foo'),
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
target: 'main.dart', target: 'main.dart',
useImplicitPubspecResolution: true,
); );
await residentRunner.run(); await residentRunner.run();
@ -2168,7 +2142,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await residentRunner.cleanupAtFinish(); await residentRunner.cleanupAtFinish();
@ -2190,7 +2163,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
(flutterDevice.devFS! as FakeDevFS).assetPathsToEvict = <String>{'asset'}; (flutterDevice.devFS! as FakeDevFS).assetPathsToEvict = <String>{'asset'};
@ -2216,7 +2188,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
(flutterDevice.devFS! as FakeDevFS).shaderPathsToEvict = <String>{'foo.frag'}; (flutterDevice.devFS! as FakeDevFS).shaderPathsToEvict = <String>{'foo.frag'};
@ -2239,7 +2210,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
expect(flutterDevice.devFS!.hasSetAssetDirectory, false); expect(flutterDevice.devFS!.hasSetAssetDirectory, false);
@ -2262,7 +2232,6 @@ flutter:
target: 'main.dart', target: 'main.dart',
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
(flutterDevice.devFS! as FakeDevFS).assetPathsToEvict = <String>{'asset'}; (flutterDevice.devFS! as FakeDevFS).assetPathsToEvict = <String>{'asset'};
@ -2312,7 +2281,6 @@ flutter:
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
analytics: globals.analytics, analytics: globals.analytics,
nativeAssetsYamlFile: 'foo.yaml', nativeAssetsYamlFile: 'foo.yaml',
useImplicitPubspecResolution: true,
); );
final int? result = await residentRunner.run(); final int? result = await residentRunner.run();

View File

@ -61,7 +61,6 @@ void main() {
fs: fileSystem, fs: fileSystem,
fakeFlutterVersion: FakeFlutterVersion(), fakeFlutterVersion: FakeFlutterVersion(),
), ),
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>(); final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
@ -92,7 +91,6 @@ void main() {
fs: fileSystem, fs: fileSystem,
fakeFlutterVersion: FakeFlutterVersion(), fakeFlutterVersion: FakeFlutterVersion(),
), ),
useImplicitPubspecResolution: true,
); );
expect(() => residentWebRunner.run(), throwsToolExit()); expect(() => residentWebRunner.run(), throwsToolExit());
@ -118,7 +116,6 @@ void main() {
fs: fileSystem, fs: fileSystem,
fakeFlutterVersion: FakeFlutterVersion(), fakeFlutterVersion: FakeFlutterVersion(),
), ),
useImplicitPubspecResolution: true,
); );
expect(() async => residentWebRunner.run(), throwsException); expect(() async => residentWebRunner.run(), throwsException);
@ -143,7 +140,6 @@ void main() {
fs: fileSystem, fs: fileSystem,
fakeFlutterVersion: FakeFlutterVersion(), fakeFlutterVersion: FakeFlutterVersion(),
), ),
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>(); final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
unawaited(residentWebRunner.run( unawaited(residentWebRunner.run(
@ -173,7 +169,6 @@ void main() {
fs: fileSystem, fs: fileSystem,
fakeFlutterVersion: FakeFlutterVersion(), fakeFlutterVersion: FakeFlutterVersion(),
), ),
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>(); final Completer<DebugConnectionInfo> connectionInfoCompleter = Completer<DebugConnectionInfo>();
unawaited(residentWebRunner.run( unawaited(residentWebRunner.run(

View File

@ -170,7 +170,6 @@ void main() {
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
useImplicitPubspecResolution: true,
); );
expect(profileResidentWebRunner.debuggingEnabled, false); expect(profileResidentWebRunner.debuggingEnabled, false);
@ -203,7 +202,6 @@ void main() {
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
useImplicitPubspecResolution: true,
); );
expect(profileResidentWebRunner.uri, webDevFS.baseUri); expect(profileResidentWebRunner.uri, webDevFS.baseUri);
@ -223,7 +221,6 @@ void main() {
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
useImplicitPubspecResolution: true,
); );
fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]); fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[]);
flutterDevice.device = chromeDevice; flutterDevice.device = chromeDevice;
@ -237,7 +234,6 @@ void main() {
usage: globals.flutterUsage, usage: globals.flutterUsage,
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
useImplicitPubspecResolution: true,
); );
expect(profileResidentWebRunner.supportsServiceProtocol, false); expect(profileResidentWebRunner.supportsServiceProtocol, false);
@ -372,7 +368,6 @@ void main() {
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
expect(await residentWebRunner.run(), 0); expect(await residentWebRunner.run(), 0);
@ -400,7 +395,6 @@ void main() {
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
expect(await residentWebRunner.run(), 0); expect(await residentWebRunner.run(), 0);
@ -602,7 +596,6 @@ void main() {
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
fakeVmServiceHost = fakeVmServiceHost =
FakeVmServiceHost(requests: kAttachExpectations.toList()); FakeVmServiceHost(requests: kAttachExpectations.toList());
@ -1127,7 +1120,6 @@ void main() {
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> connectionInfoCompleter = final Completer<DebugConnectionInfo> connectionInfoCompleter =
@ -1177,7 +1169,6 @@ void main() {
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
final Completer<DebugConnectionInfo> connectionInfoCompleter = final Completer<DebugConnectionInfo> connectionInfoCompleter =
@ -1221,7 +1212,6 @@ void main() {
analytics: globals.analytics, analytics: globals.analytics,
systemClock: globals.systemClock, systemClock: globals.systemClock,
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
// Create necessary files. // Create necessary files.
@ -1478,7 +1468,6 @@ ResidentRunner setUpResidentRunner(
fileSystem: globals.fs, fileSystem: globals.fs,
logger: logger ?? BufferLogger.test(), logger: logger ?? BufferLogger.test(),
devtoolsHandler: createNoOpHandler, devtoolsHandler: createNoOpHandler,
useImplicitPubspecResolution: true,
); );
} }

View File

@ -98,7 +98,6 @@ void main() {
artifacts: Artifacts.test(), artifacts: Artifacts.test(),
logger: BufferLogger.test(), logger: BufferLogger.test(),
flutterVersion: FakeFlutterVersion(), flutterVersion: FakeFlutterVersion(),
useImplicitPubspecResolution: true,
); );
logLines = <String>[]; logLines = <String>[];
device.getLogReader().logLines.listen(logLines.add); device.getLogReader().logLines.listen(logLines.add);
@ -218,7 +217,6 @@ FlutterTesterDevices setUpFlutterTesterDevices() {
processManager: FakeProcessManager.any(), processManager: FakeProcessManager.any(),
fileSystem: MemoryFileSystem.test(), fileSystem: MemoryFileSystem.test(),
flutterVersion: FakeFlutterVersion(), flutterVersion: FakeFlutterVersion(),
useImplicitPubspecResolution: true,
); );
} }

View File

@ -70,7 +70,6 @@ void main() {
flutterVersion: flutterVersion, flutterVersion: flutterVersion,
fileSystem: fileSystem, fileSystem: fileSystem,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await webBuilder.buildWeb( await webBuilder.buildWeb(
flutterProject, flutterProject,
@ -161,7 +160,6 @@ void main() {
flutterVersion: flutterVersion, flutterVersion: flutterVersion,
fileSystem: fileSystem, fileSystem: fileSystem,
analytics: fakeAnalytics, analytics: fakeAnalytics,
useImplicitPubspecResolution: true,
); );
await expectLater( await expectLater(
() async => webBuilder.buildWeb( () async => webBuilder.buildWeb(

View File

@ -183,7 +183,7 @@ void testUsingContext(
// can provide the AlwaysFalseBotDetector in the overrides, or its own // can provide the AlwaysFalseBotDetector in the overrides, or its own
// BotDetector implementation in the overrides. // BotDetector implementation in the overrides.
BotDetector: overrides[BotDetector] ?? () => const FakeBotDetector(true), BotDetector: overrides[BotDetector] ?? () => const FakeBotDetector(true),
}, useImplicitPubspecResolution: true); });
}, testOn: testOn, skip: skip); }, testOn: testOn, skip: skip);
// We don't support "timeout"; see ../../dart_test.yaml which // We don't support "timeout"; see ../../dart_test.yaml which
// configures all tests to have a 15 minute timeout which should // configures all tests to have a 15 minute timeout which should

View File

@ -92,7 +92,7 @@ class Testbed {
/// ///
/// `overrides` may be used to provide new context values for the single test /// `overrides` may be used to provide new context values for the single test
/// case or override any context values from the setup. /// case or override any context values from the setup.
Future<T?> run<T>(FutureOr<T> Function() test, {Map<Type, Generator>? overrides, bool useImplicitPubspecResolution = true}) { Future<T?> run<T>(FutureOr<T> Function() test, {Map<Type, Generator>? overrides}) {
final Map<Type, Generator> testOverrides = <Type, Generator>{ final Map<Type, Generator> testOverrides = <Type, Generator>{
..._testbedDefaults, ..._testbedDefaults,
// Add the initial setUp overrides // Add the initial setUp overrides
@ -139,7 +139,7 @@ class Testbed {
} }
return null; return null;
}); });
}, useImplicitPubspecResolution: useImplicitPubspecResolution); });
}, createHttpClient: (SecurityContext? c) => FakeHttpClient.any()); }, createHttpClient: (SecurityContext? c) => FakeHttpClient.any());
} }
} }

View File

@ -21,7 +21,6 @@ void main() {
processManager: FakeProcessManager.empty(), processManager: FakeProcessManager.empty(),
), ),
dartSdkPath: 'dart', dartSdkPath: 'dart',
useImplicitPubspecResolution: true,
); );
const String link = 'https://flutter.dev/to/integration-test-on-web'; const String link = 'https://flutter.dev/to/integration-test-on-web';
try { try {