From e5af60c83ec9ea05d6ecab91ff07a087e04f54bf Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Tue, 5 Nov 2019 12:28:03 -0800 Subject: [PATCH] Remove flutter.yaml migration code (#44146) --- .../flutter_tools/lib/src/base/user_messages.dart | 14 -------------- .../lib/src/runner/flutter_command.dart | 4 ---- 2 files changed, 18 deletions(-) diff --git a/packages/flutter_tools/lib/src/base/user_messages.dart b/packages/flutter_tools/lib/src/base/user_messages.dart index a071f01d00..18f75b8ba1 100644 --- a/packages/flutter_tools/lib/src/base/user_messages.dart +++ b/packages/flutter_tools/lib/src/base/user_messages.dart @@ -224,20 +224,6 @@ class UserMessages { 'Error: No pubspec.yaml file found.\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.'; - 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 get flutterBasePatchFlagsExclusive => 'Error: Only one of --baseline, --patch is allowed.'; String get flutterBaselineRequiresTraceFile => 'Error: --baseline requires --compilation-trace-file to be specified.'; diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart index 09e89abfa0..cdbad2d968 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart @@ -631,10 +631,6 @@ abstract class FlutterCommand extends Command { 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. if (parent?.name != 'pub' && !(_usesPubOption && argResults['pub'])) { final String error = PackageMap(PackageMap.globalPackagesPath).checkValid();