From 3b2042a02875f70d0c768cb16f72969568cd545f Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Mon, 2 Dec 2019 21:06:38 -0800
Subject: [PATCH] update macOS configuration settings (#45920)

---
 .../lib/src/commands/create.dart              | 18 +------------
 packages/flutter_tools/lib/src/features.dart  |  4 +++
 .../test/general.shard/features_test.dart     | 26 ++++++++++++-------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart
index 2922e74fdc8..d91a2f50196 100644
--- a/packages/flutter_tools/lib/src/commands/create.dart
+++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -146,22 +146,6 @@ class CreateCommand extends FlutterCommand {
       defaultsTo: true,
       help: 'Generate a project using the AndroidX support libraries',
     );
-    // Deprecated
-    argParser.addFlag(
-      'macos',
-      negatable: true,
-      defaultsTo: false,
-      hide: true,
-      help: 'Include support for building a macOS application',
-    );
-    // Deprecated
-    argParser.addFlag(
-      'web',
-      negatable: true,
-      defaultsTo: false,
-      hide: true,
-      help: 'Deprecated',
-    );
   }
 
   @override
@@ -406,7 +390,7 @@ class CreateCommand extends FlutterCommand {
       androidLanguage: stringArg('android-language'),
       iosLanguage: stringArg('ios-language'),
       web: featureFlags.isWebEnabled,
-      macos: boolArg('macos'),
+      macos: featureFlags.isMacOSEnabled,
     );
 
     final String relativeDirPath = fs.path.relative(projectDirPath);
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart
index 863c4245865..01b6a650245 100644
--- a/packages/flutter_tools/lib/src/features.dart
+++ b/packages/flutter_tools/lib/src/features.dart
@@ -106,6 +106,10 @@ const Feature flutterMacOSDesktopFeature = Feature(
     available: true,
     enabledByDefault: false,
   ),
+  dev: FeatureChannelSetting(
+    available: true,
+    enabledByDefault: false,
+  ),
 );
 
 /// The [Feature] for Linux desktop.
diff --git a/packages/flutter_tools/test/general.shard/features_test.dart b/packages/flutter_tools/test/general.shard/features_test.dart
index 0e878862ae5..f02fd3fbcc5 100644
--- a/packages/flutter_tools/test/general.shard/features_test.dart
+++ b/packages/flutter_tools/test/general.shard/features_test.dart
@@ -78,19 +78,27 @@ void main() {
     }));
 
     test('flutter web help string', () {
-      expect(flutterWebFeature.generateHelpMessage(), 'Enable or disable Flutter for web. This setting will take effect on the master, dev, and beta channels.');
+      expect(flutterWebFeature.generateHelpMessage(),
+      'Enable or disable Flutter for web. '
+      'This setting will take effect on the master, dev, and beta channels.');
     });
 
     test('flutter macOS desktop help string', () {
-      expect(flutterMacOSDesktopFeature.generateHelpMessage(), 'Enable or disable Flutter for desktop on macOS. This setting will take effect on the master channel.');
+      expect(flutterMacOSDesktopFeature.generateHelpMessage(),
+      'Enable or disable Flutter for desktop on macOS. '
+      'This setting will take effect on the master and dev channels.');
     });
 
     test('flutter Linux desktop help string', () {
-      expect(flutterLinuxDesktopFeature.generateHelpMessage(), 'Enable or disable Flutter for desktop on Linux. This setting will take effect on the master channel.');
+      expect(flutterLinuxDesktopFeature.generateHelpMessage(),
+      'Enable or disable Flutter for desktop on Linux. '
+      'This setting will take effect on the master channel.');
     });
 
     test('flutter Windows desktop help string', () {
-      expect(flutterWindowsDesktopFeature.generateHelpMessage(), 'Enable or disable Flutter for desktop on Windows. This setting will take effect on the master channel.');
+      expect(flutterWindowsDesktopFeature.generateHelpMessage(),
+      'Enable or disable Flutter for desktop on Windows. '
+      'This setting will take effect on the master channel.');
     });
 
     test('help string on multiple channels', () {
@@ -217,18 +225,18 @@ void main() {
       expect(featureFlags.isMacOSEnabled, false);
     }));
 
-    test('flutter macos desktop not enabled with config on dev', () => testbed.run(() {
+    test('flutter macos desktop enabled with config on dev', () => testbed.run(() {
       when(mockFlutterVerion.channel).thenReturn('dev');
-      when<bool>(mockFlutterConfig.getValue('flutter-desktop-macos') as bool).thenReturn(true);
+      when<bool>(mockFlutterConfig.getValue('enable-macos-desktop') as bool).thenReturn(true);
 
-      expect(featureFlags.isMacOSEnabled, false);
+      expect(featureFlags.isMacOSEnabled, true);
     }));
 
-    test('flutter macos desktop not enabled with environment variable on dev', () => testbed.run(() {
+    test('flutter macos desktop enabled with environment variable on dev', () => testbed.run(() {
       when(mockFlutterVerion.channel).thenReturn('dev');
       when(mockPlatform.environment).thenReturn(<String, String>{'FLUTTER_MACOS': 'true'});
 
-      expect(featureFlags.isMacOSEnabled, false);
+      expect(featureFlags.isMacOSEnabled, true);
     }));
 
     test('flutter macos desktop off by default on beta', () => testbed.run(() {