Reland1: "Revert "Add and plumb useImplicitPubspecResolution across flutter_tools."" (#158126)

Reverts flutter/flutter#158076

Author: polina-c

packages/flutter_tools/bin/fuchsia_asset_builder.dart

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

packages/flutter_tools/bin/fuchsia_tester.dart

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

packages/flutter_tools/lib/src/build_system/build_system.dart

@@ -347,6 +347,7 @@ class Environment {
     required Analytics analytics,
     String? engineVersion,
     required bool generateDartPluginRegistry,
+    required bool useImplicitPubspecResolution,
     Directory? buildDir,
     Map<String, String> defines = const <String, String>{},
     Map<String, String> inputs = const <String, String>{},
@@ -391,6 +392,7 @@ class Environment {
       engineVersion: engineVersion,
       inputs: inputs,
       generateDartPluginRegistry: generateDartPluginRegistry,
+      useImplicitPubspecResolution: useImplicitPubspecResolution,
     );
   }
 
@@ -412,6 +414,7 @@ class Environment {
     Usage? usage,
     Analytics? analytics,
     bool generateDartPluginRegistry = false,
+    bool useImplicitPubspecResolution = true,
     required FileSystem fileSystem,
     required Logger logger,
     required Artifacts artifacts,
@@ -435,6 +438,7 @@ class Environment {
       analytics: analytics ?? const NoOpAnalytics(),
       engineVersion: engineVersion,
       generateDartPluginRegistry: generateDartPluginRegistry,
+      useImplicitPubspecResolution: useImplicitPubspecResolution,
     );
   }
 
@@ -457,6 +461,7 @@ class Environment {
     this.engineVersion,
     required this.inputs,
     required this.generateDartPluginRegistry,
+    required this.useImplicitPubspecResolution,
   });
 
   /// The [Source] value which is substituted with the path to [projectDir].
@@ -557,6 +562,10 @@ class Environment {
   /// the new entrypoint.
   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(
     logger: logger,
     fileSystem: fileSystem,

packages/flutter_tools/lib/src/build_system/targets/localizations.dart

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

packages/flutter_tools/lib/src/bundle_builder.dart

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

packages/flutter_tools/lib/src/commands/assemble.dart

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

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

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

packages/flutter_tools/lib/src/commands/build_bundle.dart

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

packages/flutter_tools/lib/src/commands/build_ios_framework.dart

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

packages/flutter_tools/lib/src/commands/build_macos_framework.dart

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