Skip to content

Commit 5f105a6

Browse files
[flutter_releases] Flutter stable 2.10.0 Framework Cherrypicks (flutter#97553)
* [flutter_tools] remove dummy implementation from abstract class .isEnabled() (flutter#96888) * 'Update Engine revision to 776efd2 for stable release 2.10.0' Co-authored-by: Christopher Fujino <[email protected]>
1 parent fdd0af7 commit 5f105a6

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5ac30ef0c70b76c5d5b5465b0ad4f08d5433684f
1+
776efd2034d50af73e2876d703213601df384e88

packages/flutter_tools/lib/src/features.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ abstract class FeatureFlags {
5353
/// Whether a particular feature is enabled for the current channel.
5454
///
5555
/// Prefer using one of the specific getters above instead of this API.
56-
bool isEnabled(Feature feature) => false;
56+
bool isEnabled(Feature feature);
5757
}
5858

5959
/// All current Flutter feature flags.
@@ -138,18 +138,21 @@ const Feature flutterWindowsDesktopFeature = Feature(
138138
name: 'beta-quality support for desktop on Windows',
139139
configSetting: 'enable-windows-desktop',
140140
environmentOverride: 'FLUTTER_WINDOWS',
141-
extraHelpText: 'Newer beta versions are available on the beta channel.',
142141
master: FeatureChannelSetting(
143142
available: true,
143+
enabledByDefault: true,
144144
),
145145
dev: FeatureChannelSetting(
146146
available: true,
147+
enabledByDefault: true,
147148
),
148149
beta: FeatureChannelSetting(
149150
available: true,
151+
enabledByDefault: true,
150152
),
151153
stable: FeatureChannelSetting(
152154
available: true,
155+
enabledByDefault: true,
153156
),
154157
);
155158

packages/flutter_tools/test/general.shard/features_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ void main() {
107107
testWithoutContext('Flutter Windows desktop help string', () {
108108
expect(flutterWindowsDesktopFeature.generateHelpMessage(),
109109
'Enable or disable beta-quality support for desktop on Windows. '
110-
'This setting will take effect on the master, dev, beta, and stable channels. '
111-
'Newer beta versions are available on the beta channel.');
110+
'This setting will take effect on the master, dev, beta, and stable channels.');
112111
});
113112

114113
testWithoutContext('help string on multiple channels', () {

0 commit comments

Comments
 (0)