Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/flutter_tools/lib/src/commands/clean.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 3 additions & 5 deletions packages/flutter_tools/lib/src/project.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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;

Expand Down
3 changes: 0 additions & 3 deletions packages/flutter_tools/test/general.shard/ios/mac_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
Expand Down Expand Up @@ -452,9 +451,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
@override
late Directory directory;

@override
late File flutterPluginsFile;

@override
late File flutterPluginsDependenciesFile;

Expand Down
30 changes: 1 addition & 29 deletions packages/flutter_tools/test/general.shard/plugins_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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',
);
Expand Down Expand Up @@ -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);

Expand All @@ -458,7 +457,6 @@ dependencies:

await refreshPluginsList(flutterProject);

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

final String pluginsFileContents =
Expand All @@ -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 {
Expand Down Expand Up @@ -2752,7 +2728,6 @@ flutter:

flutterProject
..manifest = flutterManifest
..flutterPluginsFile = flutterProject.directory.childFile('.flutter-plugins')
..flutterPluginsDependenciesFile = flutterProject.directory.childFile(
'.flutter-plugins-dependencies',
)
Expand Down Expand Up @@ -2830,9 +2805,6 @@ class FakeFlutterProject extends Fake implements FlutterProject {
@override
late Directory directory;

@override
late File flutterPluginsFile;

@override
late File flutterPluginsDependenciesFile;

Expand Down