github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove FlutterProject.flutterPluginsFile. (#169897)

Browse Source 
Towards https://github.com/flutter/flutter/issues/48918.
This commit is contained in:
Matan Lurey 2025-06-02 16:16:58 -07:00 committed by GitHub
parent 7e32a77210
commit a844dd2d2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/flutter_tools/lib/src/commands/clean.dart
View File

@ -68,7 +68,6 @@ class CleanCommand extends FlutterCommand {
deleteFile(flutterProject.macos.ephemeralDirectory);
deleteFile(flutterProject.windows.ephemeralDirectory);
deleteFile(flutterProject.flutterPluginsDependenciesFile);
deleteFile(flutterProject.flutterPluginsFile);
return const FlutterCommandResult(ExitStatus.success);
}

8
packages/flutter_tools/lib/src/project.dart
View File

@ -222,11 +222,9 @@ class FlutterProject {
/// The `.metadata` file of this project.
File get metadataFile => directory.childFile('.metadata');
/// The `.flutter-plugins` file of this project.
File get flutterPluginsFile => directory.childFile('.flutter-plugins');
/// The `.flutter-plugins-dependencies` file of this project,
/// which contains the dependencies each plugin depends on.
/// The `.flutter-plugins-dependencies` file of this project.
///
/// Contains the dependencies each plugin depends on.
File get flutterPluginsDependenciesFile => directory.childFile('.flutter-plugins-dependencies');
/// The `.gitignore` file of this project.

2
packages/flutter_tools/test/commands.shard/hermetic/clean_test.dart
View File

@ -76,7 +76,6 @@ void main() {
expect(projectUnderTest.macos.flutterPluginSwiftPackageDirectory, isNot(exists));
expect(projectUnderTest.windows.ephemeralDirectory, isNot(exists));
expect(projectUnderTest.flutterPluginsFile, isNot(exists));
expect(projectUnderTest.flutterPluginsDependenciesFile, isNot(exists));
expect(
projectUnderTest.directory
@ -291,7 +290,6 @@ FlutterProject setupProjectUnderTest(Directory currentDirectory, bool setupXcode
projectUnderTest.macos.ephemeralDirectory.createSync(recursive: true);
projectUnderTest.macos.flutterPluginSwiftPackageDirectory.createSync(recursive: true);
projectUnderTest.windows.ephemeralDirectory.createSync(recursive: true);
projectUnderTest.flutterPluginsFile.createSync(recursive: true);
projectUnderTest.flutterPluginsDependenciesFile.createSync(recursive: true);
return projectUnderTest;

4
packages/flutter_tools/test/general.shard/dart_plugin_test.dart
View File

@ -35,7 +35,6 @@ void main() {
FakeFlutterProject()
..manifest = flutterManifest
..directory = directory
..flutterPluginsFile = directory.childFile('.flutter-plugins')
..flutterPluginsDependenciesFile = directory.childFile('.flutter-plugins-dependencies')
..dartPluginRegistrant = directory.childFile('dart_plugin_registrant.dart');
writePackageConfigFiles(directory: flutterProject.directory, mainLibName: 'my_app');
@ -1485,9 +1484,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
@override
File get packageConfig => directory.childDirectory('.dart_tool').childFile('package_config.json');
@override
late File flutterPluginsFile;
@override
late File flutterPluginsDependenciesFile;

3
packages/flutter_tools/test/general.shard/ios/mac_test.dart
View File

@ -834,9 +834,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
@override
late FlutterManifest manifest;
@override
File get flutterPluginsFile => directory.childFile('.flutter-plugins');
@override
File get flutterPluginsDependenciesFile => directory.childFile('.flutter-plugins-dependencies');

4
packages/flutter_tools/test/general.shard/macos/cocoapod_utils_test.dart
View File

@ -35,7 +35,6 @@ void main() {
flutterProject
..manifest = FakeFlutterManifest()
..directory = fileSystem.systemTempDirectory.childDirectory('app')
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
'.flutter-plugins-dependencies',
)
@ -452,9 +451,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
@override
late Directory directory;
@override
late File flutterPluginsFile;
@override
late File flutterPluginsDependenciesFile;

30
packages/flutter_tools/test/general.shard/plugins_test.dart
View File

@ -107,7 +107,6 @@ void main() {
flutterProject
..manifest = flutterManifest
..directory = fileSystem.systemTempDirectory.childDirectory('app')
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
'.flutter-plugins-dependencies',
);
@ -431,7 +430,7 @@ dependencies:
testUsingContext(
'Refreshing the plugin list deletes the plugin file when there were plugins but no longer are',
() async {
flutterProject.flutterPluginsFile.createSync();
flutterProject.flutterPluginsDependenciesFile.createSync();
await refreshPluginsList(flutterProject);
@ -458,7 +457,6 @@ dependencies:
await refreshPluginsList(flutterProject);
expect(flutterProject.flutterPluginsFile, isNot(exists), reason: 'No longer emitted');
expect(flutterProject.flutterPluginsDependenciesFile, exists);
final String pluginsFileContents =
@ -483,28 +481,6 @@ dependencies:
},
);
testUsingContext(
'Opting in to explicit-package-dependencies omits .flutter-plugins',
() async {
createFakePlugins(fs, <String>[
'plugin_d',
'plugin_a',
'/local_plugins/plugin_c',
'/local_plugins/plugin_b',
]);
await refreshPluginsList(flutterProject);
expect(flutterProject.flutterPluginsFile, isNot(exists));
expect(flutterProject.flutterPluginsDependenciesFile, exists);
},
overrides: <Type, Generator>{
FileSystem: () => fs,
ProcessManager: FakeProcessManager.empty,
Pub: ThrowingPub.new,
},
);
testUsingContext(
'Refreshing the plugin list updates .flutter-plugins-dependencies if the plugins changed',
() async {
@ -2752,7 +2728,6 @@ flutter:
flutterProject
..manifest = flutterManifest
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
'.flutter-plugins-dependencies',
)
@ -2830,9 +2805,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
@override
late Directory directory;
@override
late File flutterPluginsFile;
@override
late File flutterPluginsDependenciesFile;