From e4ad46c830c02720e89dc55093cf61dcf6626e58 Mon Sep 17 00:00:00 2001
From: Jenn Magder <magder@google.com>
Date: Wed, 7 Apr 2021 22:20:42 -0700
Subject: [PATCH] Remove flutterNext (#79989)

---
 packages/flutter_tools/lib/src/features.dart | 31 ++++++++------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart
index 304e7f77801..079e8e44838 100644
--- a/packages/flutter_tools/lib/src/features.dart
+++ b/packages/flutter_tools/lib/src/features.dart
@@ -85,15 +85,15 @@ const Feature flutterWebFeature = Feature(
   ),
   dev: FeatureChannelSetting(
     available: true,
-    enabledByDefault: flutterNext,
+    enabledByDefault: true,
   ),
   beta: FeatureChannelSetting(
     available: true,
-    enabledByDefault: flutterNext,
+    enabledByDefault: true,
   ),
   stable: FeatureChannelSetting(
-    available: flutterNext,
-    enabledByDefault: flutterNext,
+    available: true,
+    enabledByDefault: true,
   ),
 );
 
@@ -102,8 +102,7 @@ const Feature flutterMacOSDesktopFeature = Feature(
   name: 'beta-quality support for desktop on macOS',
   configSetting: 'enable-macos-desktop',
   environmentOverride: 'FLUTTER_MACOS',
-  extraHelpText: flutterNext ?
-      'Newer beta versions are available on the beta channel.' : null,
+  extraHelpText: 'Newer beta versions are available on the beta channel.',
   master: FeatureChannelSetting(
     available: true,
     enabledByDefault: false,
@@ -113,11 +112,11 @@ const Feature flutterMacOSDesktopFeature = Feature(
     enabledByDefault: false,
   ),
   beta: FeatureChannelSetting(
-    available: flutterNext,
+    available: true,
     enabledByDefault: false,
   ),
   stable: FeatureChannelSetting(
-    available: flutterNext,
+    available: true,
     enabledByDefault: false,
   ),
 );
@@ -127,8 +126,7 @@ const Feature flutterLinuxDesktopFeature = Feature(
   name: 'beta-quality support for desktop on Linux',
   configSetting: 'enable-linux-desktop',
   environmentOverride: 'FLUTTER_LINUX',
-  extraHelpText: flutterNext ?
-      'Newer beta versions are available on the beta channel.' : null,
+  extraHelpText: 'Newer beta versions are available on the beta channel.',
   master: FeatureChannelSetting(
     available: true,
     enabledByDefault: false,
@@ -138,11 +136,11 @@ const Feature flutterLinuxDesktopFeature = Feature(
     enabledByDefault: false,
   ),
   beta: FeatureChannelSetting(
-    available: flutterNext,
+    available: true,
     enabledByDefault: false,
   ),
   stable: FeatureChannelSetting(
-    available: flutterNext,
+    available: true,
     enabledByDefault: false,
   ),
 );
@@ -152,8 +150,7 @@ const Feature flutterWindowsDesktopFeature = Feature(
   name: 'beta-quality support for desktop on Windows',
   configSetting: 'enable-windows-desktop',
   environmentOverride: 'FLUTTER_WINDOWS',
-  extraHelpText: flutterNext ?
-      'Newer beta versions are available on the beta channel.' : null,
+  extraHelpText: 'Newer beta versions are available on the beta channel.',
   master: FeatureChannelSetting(
     available: true,
     enabledByDefault: false,
@@ -163,11 +160,11 @@ const Feature flutterWindowsDesktopFeature = Feature(
     enabledByDefault: false,
   ),
   beta: FeatureChannelSetting(
-    available: flutterNext,
+    available: true,
     enabledByDefault: false,
   ),
   stable: FeatureChannelSetting(
-    available: flutterNext,
+    available: true,
     enabledByDefault: false,
   ),
 );
@@ -423,5 +420,3 @@ class FeatureChannelSetting {
   /// If not provided, defaults to `false`.
   final bool enabledByDefault;
 }
-
-const bool flutterNext = true;