Skip to content

Commit a844dd2

Browse files
authored
Remove FlutterProject.flutterPluginsFile. (flutter#169897)
Towards flutter#48918.
1 parent 7e32a77 commit a844dd2

File tree

7 files changed

+4
-48
lines changed

7 files changed

+4
-48
lines changed

packages/flutter_tools/lib/src/commands/clean.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ class CleanCommand extends FlutterCommand {
6868
deleteFile(flutterProject.macos.ephemeralDirectory);
6969
deleteFile(flutterProject.windows.ephemeralDirectory);
7070
deleteFile(flutterProject.flutterPluginsDependenciesFile);
71-
deleteFile(flutterProject.flutterPluginsFile);
7271

7372
return const FlutterCommandResult(ExitStatus.success);
7473
}

packages/flutter_tools/lib/src/project.dart

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,9 @@ class FlutterProject {
222222
/// The `.metadata` file of this project.
223223
File get metadataFile => directory.childFile('.metadata');
224224

225-
/// The `.flutter-plugins` file of this project.
226-
File get flutterPluginsFile => directory.childFile('.flutter-plugins');
227-
228-
/// The `.flutter-plugins-dependencies` file of this project,
229-
/// which contains the dependencies each plugin depends on.
225+
/// The `.flutter-plugins-dependencies` file of this project.
226+
///
227+
/// Contains the dependencies each plugin depends on.
230228
File get flutterPluginsDependenciesFile => directory.childFile('.flutter-plugins-dependencies');
231229

232230
/// The `.gitignore` file of this project.

packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void main() {
7676
expect(projectUnderTest.macos.flutterPluginSwiftPackageDirectory, isNot(exists));
7777
expect(projectUnderTest.windows.ephemeralDirectory, isNot(exists));
7878

79-
expect(projectUnderTest.flutterPluginsFile, isNot(exists));
8079
expect(projectUnderTest.flutterPluginsDependenciesFile, isNot(exists));
8180
expect(
8281
projectUnderTest.directory
@@ -291,7 +290,6 @@ FlutterProject setupProjectUnderTest(Directory currentDirectory, bool setupXcode
291290
projectUnderTest.macos.ephemeralDirectory.createSync(recursive: true);
292291
projectUnderTest.macos.flutterPluginSwiftPackageDirectory.createSync(recursive: true);
293292
projectUnderTest.windows.ephemeralDirectory.createSync(recursive: true);
294-
projectUnderTest.flutterPluginsFile.createSync(recursive: true);
295293
projectUnderTest.flutterPluginsDependenciesFile.createSync(recursive: true);
296294

297295
return projectUnderTest;

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void main() {
3535
FakeFlutterProject()
3636
..manifest = flutterManifest
3737
..directory = directory
38-
..flutterPluginsFile = directory.childFile('.flutter-plugins')
3938
..flutterPluginsDependenciesFile = directory.childFile('.flutter-plugins-dependencies')
4039
..dartPluginRegistrant = directory.childFile('dart_plugin_registrant.dart');
4140
writePackageConfigFiles(directory: flutterProject.directory, mainLibName: 'my_app');
@@ -1485,9 +1484,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
14851484
@override
14861485
File get packageConfig => directory.childDirectory('.dart_tool').childFile('package_config.json');
14871486

1488-
@override
1489-
late File flutterPluginsFile;
1490-
14911487
@override
14921488
late File flutterPluginsDependenciesFile;
14931489

packages/flutter_tools/test/general.shard/ios/mac_test.dart

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -834,9 +834,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
834834
@override
835835
late FlutterManifest manifest;
836836

837-
@override
838-
File get flutterPluginsFile => directory.childFile('.flutter-plugins');
839-
840837
@override
841838
File get flutterPluginsDependenciesFile => directory.childFile('.flutter-plugins-dependencies');
842839

packages/flutter_tools/test/general.shard/macos/cocoapod_utils_test.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void main() {
3535
flutterProject
3636
..manifest = FakeFlutterManifest()
3737
..directory = fileSystem.systemTempDirectory.childDirectory('app')
38-
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
3938
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
4039
'.flutter-plugins-dependencies',
4140
)
@@ -452,9 +451,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
452451
@override
453452
late Directory directory;
454453

455-
@override
456-
late File flutterPluginsFile;
457-
458454
@override
459455
late File flutterPluginsDependenciesFile;
460456

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

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ void main() {
107107
flutterProject
108108
..manifest = flutterManifest
109109
..directory = fileSystem.systemTempDirectory.childDirectory('app')
110-
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
111110
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
112111
'.flutter-plugins-dependencies',
113112
);
@@ -431,7 +430,7 @@ dependencies:
431430
testUsingContext(
432431
'Refreshing the plugin list deletes the plugin file when there were plugins but no longer are',
433432
() async {
434-
flutterProject.flutterPluginsFile.createSync();
433+
flutterProject.flutterPluginsDependenciesFile.createSync();
435434

436435
await refreshPluginsList(flutterProject);
437436

@@ -458,7 +457,6 @@ dependencies:
458457

459458
await refreshPluginsList(flutterProject);
460459

461-
expect(flutterProject.flutterPluginsFile, isNot(exists), reason: 'No longer emitted');
462460
expect(flutterProject.flutterPluginsDependenciesFile, exists);
463461

464462
final String pluginsFileContents =
@@ -483,28 +481,6 @@ dependencies:
483481
},
484482
);
485483

486-
testUsingContext(
487-
'Opting in to explicit-package-dependencies omits .flutter-plugins',
488-
() async {
489-
createFakePlugins(fs, <String>[
490-
'plugin_d',
491-
'plugin_a',
492-
'/local_plugins/plugin_c',
493-
'/local_plugins/plugin_b',
494-
]);
495-
496-
await refreshPluginsList(flutterProject);
497-
498-
expect(flutterProject.flutterPluginsFile, isNot(exists));
499-
expect(flutterProject.flutterPluginsDependenciesFile, exists);
500-
},
501-
overrides: <Type, Generator>{
502-
FileSystem: () => fs,
503-
ProcessManager: FakeProcessManager.empty,
504-
Pub: ThrowingPub.new,
505-
},
506-
);
507-
508484
testUsingContext(
509485
'Refreshing the plugin list updates .flutter-plugins-dependencies if the plugins changed',
510486
() async {
@@ -2752,7 +2728,6 @@ flutter:
27522728

27532729
flutterProject
27542730
..manifest = flutterManifest
2755-
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
27562731
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
27572732
'.flutter-plugins-dependencies',
27582733
)
@@ -2830,9 +2805,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
28302805
@override
28312806
late Directory directory;
28322807

2833-
@override
2834-
late File flutterPluginsFile;
2835-
28362808
@override
28372809
late File flutterPluginsDependenciesFile;
28382810

0 commit comments

Comments
 (0)