Remove all now inert references to "synthetic" packages. (flutter#169943)

Towards flutter#102983.

Author: matanlurey

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

@@ -4,7 +4,6 @@
 
 import '../../base/file_system.dart';
 import '../../convert.dart';
-import '../../features.dart';
 import '../../localizations/gen_l10n.dart';
 import '../../localizations/localizations_utils.dart';
 import '../build_system.dart';
@@ -60,7 +59,6 @@ class GenerateLocalizationsTarget extends Target {
       logger: environment.logger,
       fileSystem: environment.fileSystem,
       defaultArbDir: defaultArbDir,
-      defaultSyntheticPackage: !featureFlags.isExplicitPackageDependenciesEnabled,
     );
     await generateLocalizations(
       logger: environment.logger,

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

@@ -262,7 +262,6 @@ class GenerateLocalizationsCommand extends FlutterCommand {
         logger: _logger,
         fileSystem: _fileSystem,
         defaultArbDir: defaultArbDir,
-        defaultSyntheticPackage: !featureFlags.isExplicitPackageDependenciesEnabled,
       );
       _logger.printStatus(
         'Because l10n.yaml exists, the options defined there will be used '

packages/flutter_tools/lib/src/flutter_manifest.dart

@@ -421,16 +421,6 @@ class FlutterManifest {
   }
 
   /// Whether localization Dart files should be generated.
-  ///
-  /// **NOTE**: This method was previously called `generateSyntheticPackage`,
-  /// which was incorrect; the presence of `generate: true` in `pubspec.yaml`
-  /// does _not_ imply a synthetic package (and never did); additional
-  /// introspection is required to determine whether a synthetic package is
-  /// required.
-  ///
-  /// See also:
-  ///
-  ///   * [Deprecate and remove synthethic `package:flutter_gen`](https://github.com/flutter/flutter/issues/102983)
   late final bool generateLocalizations = _flutterDescriptor['generate'] == true;
 
   String? get defaultFlavor => _flutterDescriptor['default-flavor'] as String?;

packages/flutter_tools/lib/src/localizations/gen_l10n.dart

@@ -66,7 +66,6 @@ Future<LocalizationsGenerator> generateLocalizations({
             headerString: options.header,
             headerFile: options.headerFile,
             useDeferredLoading: options.useDeferredLoading,
-            useSyntheticPackage: options.syntheticPackage,
             areResourceAttributesRequired: options.requiredResourceAttributes,
             untranslatedMessagesFile: options.untranslatedMessagesFile,
             usesNullableGetter: options.nullableGetter,
@@ -105,18 +104,6 @@ stderr:\n${result.stderr}''', result.exitCode);
   return generator;
 }
 
-/// The path for the synthetic package.
-String _defaultSyntheticPackagePath(FileSystem fileSystem) =>
-    fileSystem.path.join('.dart_tool', 'flutter_gen');
-
-/// The default path used when the `_useSyntheticPackage` setting is set to true
-/// in [LocalizationsGenerator].
-///
-/// See [LocalizationsGenerator.new] for where and how it is used by the
-/// localizations tool.
-String _syntheticL10nPackagePath(FileSystem fileSystem) =>
-    fileSystem.path.join(_defaultSyntheticPackagePath(fileSystem), 'gen_l10n');
-
 // Generate method parameters and also infer the correct types from the usage of the placeholders
 // For example, if placeholders are used for plurals and no type was specified, then the type will
 // automatically set to 'num'. Similarly, if such placeholders are used for selects, then the type
@@ -545,7 +532,6 @@ class LocalizationsGenerator {
     String? headerFile,
     bool useDeferredLoading = false,
     String? inputsAndOutputsListPath,
-    bool useSyntheticPackage = false,
     String? projectPathString,
     bool areResourceAttributesRequired = false,
     String? untranslatedMessagesFile,
@@ -562,15 +548,13 @@ class LocalizationsGenerator {
       inputPathString,
       projectDirectory,
     );
-    final Directory outputDirectory = outputDirectoryFromPath(
+    final Directory outputDirectory = _outputDirectoryFromPath(
       fileSystem,
       outputPathString ?? inputPathString,
-      useSyntheticPackage,
       projectDirectory,
     );
     return LocalizationsGenerator._(
       fileSystem,
-      useSyntheticPackage: useSyntheticPackage,
       usesNullableGetter: usesNullableGetter,
       className: classNameFromString(classNameString),
       projectDirectory: projectDirectory,
@@ -612,7 +596,6 @@ class LocalizationsGenerator {
     this.header = '',
     this.useDeferredLoading = false,
     required this.inputsAndOutputsListFile,
-    this.useSyntheticPackage = true,
     this.projectDirectory,
     this.areResourceAttributesRequired = false,
     this.untranslatedMessagesFile,
@@ -636,9 +619,6 @@ class LocalizationsGenerator {
   );
   late final LocaleInfo _templateArbLocale = _templateBundle.locale;
 
-  @visibleForTesting
-  final bool useSyntheticPackage;
-
   // Used to decide if the generated code is nullable or not
   // (whether AppLocalizations? or AppLocalizations is returned from
   // `static {name}Localizations{?} of (BuildContext context))`
@@ -835,28 +815,16 @@ class LocalizationsGenerator {
   }
 
   /// Sets the reference [Directory] for [outputDirectory].
-  @visibleForTesting
-  static Directory outputDirectoryFromPath(
+  static Directory _outputDirectoryFromPath(
     FileSystem fileSystem,
     String outputPathString,
-    bool useSyntheticPackage,
     Directory? projectDirectory,
   ) {
-    Directory outputDirectory;
-    if (useSyntheticPackage) {
-      outputDirectory = fileSystem.directory(
-        projectDirectory != null
-            ? _getAbsoluteProjectPath(_syntheticL10nPackagePath(fileSystem), projectDirectory)
-            : _syntheticL10nPackagePath(fileSystem),
-      );
-    } else {
-      outputDirectory = fileSystem.directory(
-        projectDirectory != null
-            ? _getAbsoluteProjectPath(outputPathString, projectDirectory)
-            : outputPathString,
-      );
-    }
-    return outputDirectory;
+    return fileSystem.directory(
+      projectDirectory != null
+          ? _getAbsoluteProjectPath(outputPathString, projectDirectory)
+          : outputPathString,
+    );
   }
 
   /// Sets the reference [File] for [templateArbFile].
@@ -1469,22 +1437,6 @@ The plural cases must be one of "=0", "=1", "=2", "zero", "one", "two", "few", "
       throw L10nException('Found syntax errors.');
     }
 
-    // A pubspec.yaml file is required when using a synthetic package. If it does not
-    // exist, create a blank one.
-    if (useSyntheticPackage) {
-      final Directory syntheticPackageDirectory =
-          projectDirectory != null
-              ? projectDirectory!.childDirectory(_defaultSyntheticPackagePath(_fs))
-              : _fs.directory(_defaultSyntheticPackagePath(_fs));
-      syntheticPackageDirectory.createSync(recursive: true);
-      final File flutterGenPubspec = syntheticPackageDirectory.childFile('pubspec.yaml');
-      if (!flutterGenPubspec.existsSync()) {
-        flutterGenPubspec.writeAsStringSync(
-          useCRLF ? emptyPubspecTemplate.replaceAll('\n', '\r\n') : emptyPubspecTemplate,
-        );
-      }
-    }
-
     // Since all validity checks have passed up to this point,
     // write the contents into the directory.
     outputDirectory.createSync(recursive: true);

packages/flutter_tools/lib/src/localizations/localizations_utils.dart

@@ -8,7 +8,6 @@ import 'package:yaml/yaml.dart';
 import '../base/common.dart';
 import '../base/file_system.dart';
 import '../base/logger.dart';
-import '../features.dart';
 import '../runner/flutter_command.dart';
 import 'gen_l10n_types.dart';
 import 'language_subtag_registry.dart';
@@ -340,7 +339,6 @@ class LocalizationOptions {
     this.headerFile,
     bool? useDeferredLoading,
     this.genInputsAndOutputsList,
-    bool? syntheticPackage,
     this.projectDir,
     bool? requiredResourceAttributes,
     bool? nullableGetter,
@@ -353,7 +351,6 @@ class LocalizationOptions {
        outputLocalizationFile = outputLocalizationFile ?? 'app_localizations.dart',
        outputClass = outputClass ?? 'AppLocalizations',
        useDeferredLoading = useDeferredLoading ?? false,
-       syntheticPackage = syntheticPackage ?? !featureFlags.isExplicitPackageDependenciesEnabled,
        requiredResourceAttributes = requiredResourceAttributes ?? false,
        nullableGetter = nullableGetter ?? true,
        format = format ?? true,
@@ -415,12 +412,6 @@ class LocalizationOptions {
   /// This path is relative to [arbDir].
   final String? genInputsAndOutputsList;
 
-  /// The `--synthetic-package` argument.
-  ///
-  /// Whether to generate the Dart localization files in a synthetic package
-  /// or in a custom directory.
-  final bool syntheticPackage;
-
   /// The `--project-dir` argument.
   ///
   /// This path is relative to [arbDir].
@@ -481,7 +472,6 @@ LocalizationOptions parseLocalizationsOptionsFromYAML({
   required Logger logger,
   required FileSystem fileSystem,
   required String defaultArbDir,
-  required bool defaultSyntheticPackage,
 }) {
   final String contents = file.readAsStringSync();
   if (contents.trim().isEmpty) {
@@ -518,8 +508,6 @@ LocalizationOptions parseLocalizationsOptionsFromYAML({
     headerFile: _tryReadFilePath(yamlNode, 'header-file', logger, fileSystem),
     useDeferredLoading: _tryReadBool(yamlNode, 'use-deferred-loading', logger),
     preferredSupportedLocales: _tryReadStringList(yamlNode, 'preferred-supported-locales', logger),
-    syntheticPackage:
-        _tryReadBool(yamlNode, 'synthetic-package', logger) ?? defaultSyntheticPackage,
     requiredResourceAttributes: _tryReadBool(yamlNode, 'required-resource-attributes', logger),
     nullableGetter: _tryReadBool(yamlNode, 'nullable-getter', logger),
     format: _tryReadBool(yamlNode, 'format', logger),
@@ -535,15 +523,6 @@ LocalizationOptions parseLocalizationsOptionsFromCommand({
   required FlutterCommand command,
   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 reverse of flutter config --explicit-package-dependencies.
-    syntheticPackage = !featureFlags.isExplicitPackageDependenciesEnabled;
-  }
   return LocalizationOptions(
     arbDir: command.stringArg('arb-dir') ?? defaultArbDir,
     outputDir: command.stringArg('output-dir'),
@@ -555,7 +534,6 @@ LocalizationOptions parseLocalizationsOptionsFromCommand({
     headerFile: command.stringArg('header-file'),
     useDeferredLoading: command.boolArg('use-deferred-loading'),
     genInputsAndOutputsList: command.stringArg('gen-inputs-and-outputs-list'),
-    syntheticPackage: syntheticPackage,
     projectDir: command.stringArg('project-dir'),
     requiredResourceAttributes: command.boolArg('required-resource-attributes'),
     nullableGetter: command.boolArg('nullable-getter'),

packages/flutter_tools/test/commands.shard/hermetic/create_usage_test.dart

@@ -33,8 +33,6 @@ class FakePub extends Fake implements Pub {
     required FlutterProject project,
     bool upgrade = false,
     bool offline = false,
-    bool generateSyntheticPackage = false,
-    bool generateSyntheticPackageForExample = false,
     String? flutterRootOverride,
     bool checkUpToDate = false,
     bool shouldSkipThirdPartyGenerator = true,

packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart

@@ -928,7 +928,6 @@ class FakePub extends Fake implements Pub {
     required FlutterProject project,
     bool upgrade = false,
     bool offline = false,
-    bool generateSyntheticPackage = false,
     String? flutterRootOverride,
     bool checkUpToDate = false,
     bool shouldSkipThirdPartyGenerator = true,

packages/flutter_tools/test/commands.shard/hermetic/pub_test.dart

@@ -11,14 +11,11 @@ import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/packages.dart';
 import 'package:flutter_tools/src/dart/pub.dart';
-import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/project.dart';
-import 'package:flutter_tools/src/runner/flutter_command.dart';
 import 'package:test/fake.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 
 import '../../src/context.dart';
-import '../../src/fakes.dart';
 import '../../src/package_config.dart';
 import '../../src/test_flutter_command_runner.dart';
 
@@ -38,15 +35,6 @@ void main() {
   late FakePub pub;
   late BufferLogger logger;
 
-  // TODO(matanlurey): Remove after `flutter_gen` is removed.
-  // See https://github.com/flutter/flutter/issues/102983 for details.
-  FeatureFlags disableExplicitPackageDependencies() {
-    return TestFeatureFlags(
-      // ignore: avoid_redundant_argument_values
-      isExplicitPackageDependenciesEnabled: false,
-    );
-  }
-
   setUp(() {
     Cache.disableLocking();
     fileSystem = MemoryFileSystem.test();
@@ -292,53 +280,6 @@ void main() {
       FileSystem: () => fileSystem,
     },
   );
-
-  testUsingContext(
-    'pub get triggers localizations generation when generate: true',
-    () async {
-      final File pubspecFile = fileSystem.currentDirectory.childFile('pubspec.yaml')..createSync();
-      pubspecFile.writeAsStringSync('''
-name: my_app
-flutter:
-  generate: true
-''');
-      fileSystem.currentDirectory.childFile('l10n.yaml')
-        ..createSync()
-        ..writeAsStringSync('''
-        arb-dir: lib/l10n
-        ''');
-      final File arbFile = fileSystem.file(fileSystem.path.join('lib', 'l10n', 'app_en.arb'))
-        ..createSync(recursive: true);
-      arbFile.writeAsStringSync('''
-      {
-        "helloWorld": "Hello, World!",
-        "@helloWorld": {
-          "description": "Sample description"
-        }
-      }
-      ''');
-
-      final PackagesGetCommand command = PackagesGetCommand('get', '', PubContext.pubGet);
-      final CommandRunner<void> commandRunner = createTestCommandRunner(command);
-
-      await commandRunner.run(<String>['get']);
-      final FlutterCommandResult result = await command.runCommand();
-
-      expect(result.exitStatus, ExitStatus.success);
-      final Directory outputDirectory = fileSystem.directory(
-        fileSystem.path.join('.dart_tool', 'flutter_gen', 'gen_l10n'),
-      );
-      expect(outputDirectory.existsSync(), true);
-      expect(outputDirectory.childFile('app_localizations_en.dart').existsSync(), true);
-      expect(outputDirectory.childFile('app_localizations.dart').existsSync(), true);
-    },
-    overrides: <Type, Generator>{
-      Pub: () => pub,
-      ProcessManager: () => FakeProcessManager.any(),
-      FileSystem: () => fileSystem,
-      FeatureFlags: disableExplicitPackageDependencies,
-    },
-  );
 }
 
 class FakePub extends Fake implements Pub {
@@ -353,7 +294,6 @@ class FakePub extends Fake implements Pub {
     required PubContext context,
     required String command,
     bool touchesPackageConfig = false,
-    bool generateSyntheticPackage = false,
     PubOutputMode outputMode = PubOutputMode.all,
   }) async {
     if (project != null) {

packages/flutter_tools/test/commands.shard/hermetic/update_packages_test.dart

@@ -382,7 +382,6 @@ class _FakePub extends Fake implements Pub {
     required PubContext context,
     required String command,
     bool touchesPackageConfig = false,
-    bool generateSyntheticPackage = false,
     PubOutputMode outputMode = PubOutputMode.all,
   }) async {
     if (project == null) {
@@ -406,8 +405,6 @@ class _FakePub extends Fake implements Pub {
     required FlutterProject project,
     bool upgrade = false,
     bool offline = false,
-    bool generateSyntheticPackage = false,
-    bool generateSyntheticPackageForExample = false,
     String? flutterRootOverride,
     bool checkUpToDate = false,
     bool shouldSkipThirdPartyGenerator = true,

packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart

@@ -577,7 +577,6 @@ class FakePub extends Fake implements Pub {
     required FlutterProject project,
     bool upgrade = false,
     bool offline = false,
-    bool generateSyntheticPackage = false,
     String? flutterRootOverride,
     bool checkUpToDate = false,
     bool shouldSkipThirdPartyGenerator = true,