Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d4f60bd

Browse files
authored
Remove generateSyntheticPackages and code that invoked it. (#169893)
Towards flutter/flutter#102983.
1 parent 34656ff commit d4f60bd

6 files changed

Lines changed: 1 addition & 767 deletions

File tree

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

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ import '../android/gradle_utils.dart' as gradle;
1212
import '../base/common.dart';
1313
import '../base/file_system.dart';
1414
import '../base/utils.dart';
15-
import '../build_info.dart';
16-
import '../build_system/build_system.dart';
1715
import '../cache.dart';
1816
import '../convert.dart';
19-
import '../dart/generate_synthetic_packages.dart';
2017
import '../flutter_project_metadata.dart';
2118
import '../globals.dart' as globals;
2219
import '../project.dart';
@@ -494,31 +491,6 @@ mixin CreateBase on FlutterCommand {
494491
final bool windowsPlatform = templateContext['windows'] as bool? ?? false;
495492
final bool webPlatform = templateContext['web'] as bool? ?? false;
496493

497-
if (shouldCallPubGet) {
498-
final Environment environment = Environment(
499-
artifacts: globals.artifacts!,
500-
logger: globals.logger,
501-
cacheDir: globals.cache.getRoot(),
502-
engineVersion: globals.flutterVersion.engineRevision,
503-
fileSystem: globals.fs,
504-
flutterRootDir: globals.fs.directory(Cache.flutterRoot),
505-
outputDir: globals.fs.directory(getBuildDirectory()),
506-
processManager: globals.processManager,
507-
platform: globals.platform,
508-
analytics: globals.analytics,
509-
projectDir: project.directory,
510-
packageConfigPath: packageConfigPath(),
511-
generateDartPluginRegistry: true,
512-
);
513-
514-
// Generate the l10n synthetic package that will be injected into the
515-
// package_config in the call to pub.get() below.
516-
await generateLocalizationsSyntheticPackage(
517-
environment: environment,
518-
buildSystem: globals.buildSystem,
519-
buildTargets: globals.buildTargets,
520-
);
521-
}
522494
final List<SupportedPlatform> platformsForMigrateConfig = <SupportedPlatform>[
523495
SupportedPlatform.root,
524496
];

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import '../build_info.dart';
1212
import '../build_system/build_system.dart';
1313
import '../build_system/targets/localizations.dart';
1414
import '../cache.dart';
15-
import '../dart/generate_synthetic_packages.dart';
1615
import '../dart/package_map.dart';
1716
import '../dart/pub.dart';
1817
import '../flutter_plugins.dart';
@@ -304,12 +303,7 @@ class PackagesGetCommand extends FlutterCommand {
304303
packageConfigPath: packageConfigPath(),
305304
generateDartPluginRegistry: true,
306305
);
307-
if (rootProject.manifest.generateLocalizations &&
308-
!await generateLocalizationsSyntheticPackage(
309-
environment: environment,
310-
buildSystem: globals.buildSystem,
311-
buildTargets: globals.buildTargets,
312-
)) {
306+
if (rootProject.manifest.generateLocalizations) {
313307
// If localizations were enabled, but we are not using synthetic packages.
314308
final BuildResult result = await globals.buildSystem.build(
315309
const GenerateLocalizationsTarget(),

packages/flutter_tools/lib/src/dart/generate_synthetic_packages.dart

Lines changed: 0 additions & 96 deletions
This file was deleted.

packages/flutter_tools/lib/src/runner/flutter_command.dart

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@ import '../base/io.dart';
1717
import '../base/os.dart';
1818
import '../base/utils.dart';
1919
import '../build_info.dart';
20-
import '../build_system/build_system.dart';
2120
import '../bundle.dart' as bundle;
2221
import '../cache.dart';
2322
import '../convert.dart';
24-
import '../dart/generate_synthetic_packages.dart';
2523
import '../dart/package_map.dart';
2624
import '../dart/pub.dart';
2725
import '../device.dart';
@@ -1837,33 +1835,11 @@ abstract class FlutterCommand extends Command<void> {
18371835
project.checkForDeprecation(deprecationBehavior: deprecationBehavior);
18381836

18391837
if (shouldRunPub) {
1840-
final Environment environment = Environment(
1841-
artifacts: globals.artifacts!,
1842-
logger: globals.logger,
1843-
cacheDir: globals.cache.getRoot(),
1844-
engineVersion: globals.flutterVersion.engineRevision,
1845-
fileSystem: globals.fs,
1846-
flutterRootDir: globals.fs.directory(Cache.flutterRoot),
1847-
outputDir: globals.fs.directory(getBuildDirectory()),
1848-
processManager: globals.processManager,
1849-
platform: globals.platform,
1850-
analytics: analytics,
1851-
projectDir: project.directory,
1852-
packageConfigPath: packageConfigPath(),
1853-
generateDartPluginRegistry: true,
1854-
);
1855-
18561838
await pub.get(
18571839
context: PubContext.getVerifyContext(name),
18581840
project: project,
18591841
checkUpToDate: cachePubGet,
18601842
);
1861-
1862-
await generateLocalizationsSyntheticPackage(
1863-
environment: environment,
1864-
buildSystem: globals.buildSystem,
1865-
buildTargets: globals.buildTargets,
1866-
);
18671843
}
18681844

18691845
if (regeneratePlatformSpecificToolingDuringVerify) {

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

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import 'package:flutter_tools/src/base/platform.dart';
1515
import 'package:flutter_tools/src/cache.dart';
1616
import 'package:flutter_tools/src/commands/packages.dart';
1717
import 'package:flutter_tools/src/dart/pub.dart';
18-
import 'package:flutter_tools/src/features.dart';
1918
import 'package:flutter_tools/src/globals.dart' as globals;
2019
import 'package:unified_analytics/unified_analytics.dart';
2120
import 'package:yaml/yaml.dart';
@@ -30,15 +29,6 @@ import '../../src/test_flutter_command_runner.dart';
3029
void main() {
3130
late FakeStdio mockStdio;
3231

33-
// TODO(matanlurey): Remove after `flutter_gen` is removed.
34-
// See https://github.com/flutter/flutter/issues/102983 for details.
35-
FeatureFlags disableExplicitPackageDependencies() {
36-
return TestFeatureFlags(
37-
// ignore: avoid_redundant_argument_values
38-
isExplicitPackageDependenciesEnabled: false,
39-
);
40-
}
41-
4232
setUp(() {
4333
mockStdio = FakeStdio()..stdout.terminalColumns = 80;
4434

@@ -320,48 +310,6 @@ void main() {
320310
},
321311
);
322312

323-
testUsingContext(
324-
'get generates synthetic package when l10n.yaml has synthetic-package: true',
325-
() async {
326-
final String projectPath = await createProject(
327-
tempDir,
328-
arguments: <String>['--no-pub', '--template=module'],
329-
);
330-
final Directory projectDir = globals.fs.directory(projectPath);
331-
projectDir.childDirectory('lib').childDirectory('l10n').childFile('app_en.arb')
332-
..createSync(recursive: true)
333-
..writeAsStringSync('{ "hello": "Hello world!" }');
334-
String pubspecFileContent = projectDir.childFile('pubspec.yaml').readAsStringSync();
335-
pubspecFileContent = pubspecFileContent.replaceFirst(RegExp(r'\nflutter\:'), '''
336-
flutter:
337-
generate: true
338-
''');
339-
projectDir.childFile('pubspec.yaml').writeAsStringSync(pubspecFileContent);
340-
projectDir.childFile('l10n.yaml').writeAsStringSync('synthetic-package: true');
341-
await runCommandIn(projectPath, 'get');
342-
expect(
343-
projectDir
344-
.childDirectory('.dart_tool')
345-
.childDirectory('flutter_gen')
346-
.childDirectory('gen_l10n')
347-
.childFile('app_localizations.dart')
348-
.existsSync(),
349-
true,
350-
);
351-
},
352-
overrides: <Type, Generator>{
353-
Pub:
354-
() => Pub(
355-
fileSystem: globals.fs,
356-
logger: globals.logger,
357-
processManager: globals.processManager,
358-
botDetector: globals.botDetector,
359-
platform: globals.platform,
360-
),
361-
FeatureFlags: disableExplicitPackageDependencies,
362-
},
363-
);
364-
365313
testUsingContext(
366314
'get fetches packages for a workspace',
367315
() async {

0 commit comments

Comments
 (0)