Skip to content

Commit 2d2070c

Browse files
authored
Stop writing legacy FLUTTER_ROOT/version file (by default?) (flutter#172793)
Towards flutter#171900. I'll make a breaking change announcement before landing this PR. We can keep the flag for a stable release (allow folks to write `flutter config --no-enable-omit-legacy-version-file` if they still need the file), or we can decide it's not worth it and just rely on the breaking change announcement.
1 parent e4663f2 commit 2d2070c

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

packages/flutter_tools/lib/src/features.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,16 +199,13 @@ const swiftPackageManager = Feature(
199199
/// Whether to continue writing the `{FLUTTER_ROOT}/version` legacy file.
200200
///
201201
/// Tracking removal: <https://github.com/flutter/flutter/issues/171900>.
202-
const omitLegacyVersionFile = Feature(
202+
const omitLegacyVersionFile = Feature.fullyEnabled(
203203
name: 'stops writing the legacy version file',
204204
configSetting: 'omit-legacy-version-file',
205205
extraHelpText:
206206
'If set, the file {FLUTTER_ROOT}/version is no longer written as part of '
207207
'the flutter tool execution; a newer file format has existed for some '
208208
'time in {FLUTTER_ROOT}/bin/cache/flutter.version.json.',
209-
master: FeatureChannelSetting(available: true),
210-
beta: FeatureChannelSetting(available: true),
211-
stable: FeatureChannelSetting(available: true),
212209
);
213210

214211
/// Whether desktop windowing is enabled.

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,6 @@ void main() {
417417

418418
// Verify the version files exist and have been repopulated after the fetch.
419419
expect(FlutterVersion.getVersionFile(fs, flutterRoot), exists); // flutter.version.json
420-
expect(fs.file(fs.path.join(flutterRoot, 'version')), exists); // legacy
421420

422421
expect(flutterVersion.channel, channel);
423422
expect(flutterVersion.repositoryUrl, flutterUpstreamUrl);
@@ -1056,7 +1055,12 @@ void main() {
10561055
expect(legacyVersionFile.existsSync(), isTrue);
10571056
expect(legacyVersionFile.readAsStringSync(), '1.2.3');
10581057
},
1059-
overrides: <Type, Generator>{ProcessManager: () => processManager, Cache: () => cache},
1058+
overrides: <Type, Generator>{
1059+
ProcessManager: () => processManager,
1060+
Cache: () => cache,
1061+
// ignore: avoid_redundant_argument_values
1062+
FeatureFlags: () => TestFeatureFlags(isOmitLegacyVersionFileEnabled: false),
1063+
},
10601064
);
10611065

10621066
testUsingContext(
@@ -1128,7 +1132,6 @@ void main() {
11281132
final Directory flutterRoot = fs.directory(fs.path.join('path', 'to', 'flutter'));
11291133
final Directory cacheDir = flutterRoot.childDirectory('bin').childDirectory('cache')
11301134
..createSync(recursive: true);
1131-
final File legacyVersionFile = flutterRoot.childFile('version');
11321135
final File versionFile = cacheDir.childFile('flutter.version.json')..writeAsStringSync('{');
11331136

11341137
processManager.addCommands(<FakeCommand>[
@@ -1202,12 +1205,10 @@ void main() {
12021205

12031206
// version file was deleted because it couldn't be parsed
12041207
expect(versionFile.existsSync(), isFalse);
1205-
expect(legacyVersionFile.existsSync(), isFalse);
12061208
// version file was written to disk
12071209
flutterVersion.ensureVersionFile();
12081210
expect(processManager, hasNoRemainingExpectations);
12091211
expect(versionFile.existsSync(), isTrue);
1210-
expect(legacyVersionFile.existsSync(), isTrue);
12111212
},
12121213
overrides: <Type, Generator>{ProcessManager: () => processManager, Cache: () => cache},
12131214
);

0 commit comments

Comments
 (0)