[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Rename filterPluginsByPlatform, cleanup Platform Strings #141780

Merged
merged 4 commits into from
Jan 22, 2024
Merged

refactor: Rename filterPluginsByPlatform, cleanup Platform Strings #141780

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d4fa4d
refactor: Rename _filterPluginsByPlatform to _createPluginMapOfPlatfo…
Gustl22 Jan 18, 2024
82c5fa8
format
Gustl22 Jan 18, 2024
5975f8b
Merge branch 'master' into 80374-refactor-1
Gustl22 Jan 18, 2024
a3c57d9
Merge branch 'master' into 80374-refactor-1
Gustl22 Jan 22, 2024
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
Prev Previous commit
Next Next commit
format
  • Loading branch information
@Gustl22
Gustl22 committed Jan 18, 2024
commit 82c5fa819d17b1811732c18e0fe0f76ee4040c33
22 changes: 6 additions & 16 deletions packages/flutter_tools/lib/src/flutter_plugins.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,7 @@ const String _kFlutterPluginsSharedDarwinSource = 'shared_darwin_source';
///
///
/// Finally, returns [true] if the plugins list has changed, otherwise returns [false].
bool _writeFlutterPluginsList(
FlutterProject project,
List<Plugin> plugins,
) {
bool _writeFlutterPluginsList(FlutterProject project, List<Plugin> plugins) {
final File pluginsFile = project.flutterPluginsDependenciesFile;
if (plugins.isEmpty) {
return ErrorHandlingFileSystem.deleteIfExists(pluginsFile);
Expand Down Expand Up @@ -216,26 +213,19 @@ List<Map<String, Object>> _createPluginMapOfPlatform(
return p.platforms.containsKey(platformKey);
});

final Set<String> pluginNames =
resolvedPlatformPlugins.map((Plugin plugin) => plugin.name).toSet();
final Set<String> pluginNames = resolvedPlatformPlugins.map((Plugin plugin) => plugin.name).toSet();
final List<Map<String, Object>> pluginInfo = <Map<String, Object>>[];
for (final Plugin plugin in resolvedPlatformPlugins) {
// This is guaranteed to be non-null due to the `where` filter above.
final PluginPlatform platformPlugin = plugin.platforms[platformKey]!;
pluginInfo.add(<String, Object>{
_kFlutterPluginsNameKey: plugin.name,
_kFlutterPluginsPathKey: globals.fsUtils.escapePath(plugin.path),
if (platformPlugin is DarwinPlugin &&
(platformPlugin as DarwinPlugin).sharedDarwinSource)
_kFlutterPluginsSharedDarwinSource:
(platformPlugin as DarwinPlugin).sharedDarwinSource,
if (platformPlugin is DarwinPlugin && (platformPlugin as DarwinPlugin).sharedDarwinSource)
_kFlutterPluginsSharedDarwinSource: (platformPlugin as DarwinPlugin).sharedDarwinSource,
if (platformPlugin is NativeOrDartPlugin)
_kFlutterPluginsHasNativeBuildKey:
(platformPlugin as NativeOrDartPlugin).hasMethodChannel() ||
(platformPlugin as NativeOrDartPlugin).hasFfi(),
_kFlutterPluginsDependenciesKey: <String>[
...plugin.dependencies.where(pluginNames.contains)
],
_kFlutterPluginsHasNativeBuildKey: (platformPlugin as NativeOrDartPlugin).hasMethodChannel() || (platformPlugin as NativeOrDartPlugin).hasFfi(),
_kFlutterPluginsDependenciesKey: <String>[...plugin.dependencies.where(pluginNames.contains)],
});
}
return pluginInfo;
Expand Down