Unverified Commit e5af60c8 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

Remove flutter.yaml migration code (#44146)

parent 372fe290
...@@ -224,20 +224,6 @@ class UserMessages { ...@@ -224,20 +224,6 @@ class UserMessages {
'Error: No pubspec.yaml file found.\n' 'Error: No pubspec.yaml file found.\n'
'This command should be run from the root of your Flutter project.\n' 'This command should be run from the root of your Flutter project.\n'
'Do not run this command from the root of your git clone of Flutter.'; 'Do not run this command from the root of your git clone of Flutter.';
String get flutterMergeYamlFiles =>
'Please merge your flutter.yaml into your pubspec.yaml.\n\n'
'We have changed from having separate flutter.yaml and pubspec.yaml\n'
'files to having just one pubspec.yaml file. Transitioning is simple:\n'
'add a line that just says "flutter:" to your pubspec.yaml file, and\n'
'move everything from your current flutter.yaml file into the\n'
'pubspec.yaml file, below that line, with everything indented by two\n'
'extra spaces compared to how it was in the flutter.yaml file. Then, if\n'
'you had a "name:" line, move that to the top of your "pubspec.yaml"\n'
'file (you may already have one there), so that there is only one\n'
'"name:" line. Finally, delete the flutter.yaml file.\n\n'
'For an example of what a new-style pubspec.yaml file might look like,\n'
'check out the Flutter Gallery pubspec.yaml:\n'
'https://github.com/flutter/flutter/blob/master/examples/flutter_gallery/pubspec.yaml\n';
String flutterTargetFileMissing(String path) => 'Target file "$path" not found.'; String flutterTargetFileMissing(String path) => 'Target file "$path" not found.';
String get flutterBasePatchFlagsExclusive => 'Error: Only one of --baseline, --patch is allowed.'; String get flutterBasePatchFlagsExclusive => 'Error: Only one of --baseline, --patch is allowed.';
String get flutterBaselineRequiresTraceFile => 'Error: --baseline requires --compilation-trace-file to be specified.'; String get flutterBaselineRequiresTraceFile => 'Error: --baseline requires --compilation-trace-file to be specified.';
......
...@@ -631,10 +631,6 @@ abstract class FlutterCommand extends Command<void> { ...@@ -631,10 +631,6 @@ abstract class FlutterCommand extends Command<void> {
throw ToolExit(userMessages.flutterNoPubspec); throw ToolExit(userMessages.flutterNoPubspec);
} }
if (fs.isFileSync('flutter.yaml')) {
throw ToolExit(userMessages.flutterMergeYamlFiles);
}
// Validate the current package map only if we will not be running "pub get" later. // Validate the current package map only if we will not be running "pub get" later.
if (parent?.name != 'pub' && !(_usesPubOption && argResults['pub'])) { if (parent?.name != 'pub' && !(_usesPubOption && argResults['pub'])) {
final String error = PackageMap(PackageMap.globalPackagesPath).checkValid(); final String error = PackageMap(PackageMap.globalPackagesPath).checkValid();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment