firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] Add violating plugin name to validation errors (#46601)

Browse Source
This commit is contained in:
Alek Åström 2019-12-17 23:08:03 +01:00 committed by Flutter GitHub Bot
parent 56f4eaf58c
commit 853c8c569f
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -48,3 +48,4 @@ Rody Davis Jr <rody.davis.jr@gmail.com>
Robin Jespersen <info@unitedpartners.de> Robin Jespersen <info@unitedpartners.de>
Jefferson Quesado <jeff.quesado@gmail.com> Jefferson Quesado <jeff.quesado@gmail.com>
Mark Diener <rpzrpzrpz@gmail.com> Mark Diener <rpzrpzrpz@gmail.com>
Alek Åström <alek.astrom@gmail.com>

6
packages/flutter_tools/lib/src/plugins.dart
View File

@ -74,7 +74,7 @@ class Plugin {
) { ) {
final List<String> errors = validatePluginYaml(pluginYaml); final List<String> errors = validatePluginYaml(pluginYaml);
if (errors.isNotEmpty) { if (errors.isNotEmpty) {
throwToolExit('Invalid plugin specification.\n${errors.join('\n')}'); throwToolExit('Invalid plugin specification $name.\n${errors.join('\n')}');
} }
if (pluginYaml != null && pluginYaml['platforms'] != null) { if (pluginYaml != null && pluginYaml['platforms'] != null) {
return Plugin._fromMultiPlatformYaml(name, path, pluginYaml, dependencies); return Plugin._fromMultiPlatformYaml(name, path, pluginYaml, dependencies);
@ -89,11 +89,11 @@ class Plugin {
List<String> dependencies, List<String> dependencies,
) { ) {
assert (pluginYaml != null && pluginYaml['platforms'] != null, assert (pluginYaml != null && pluginYaml['platforms'] != null,
'Invalid multi-platform plugin specification.'); 'Invalid multi-platform plugin specification $name.');
final YamlMap platformsYaml = pluginYaml['platforms'] as YamlMap; final YamlMap platformsYaml = pluginYaml['platforms'] as YamlMap;
assert (_validateMultiPlatformYaml(platformsYaml).isEmpty, assert (_validateMultiPlatformYaml(platformsYaml).isEmpty,
'Invalid multi-platform plugin specification.'); 'Invalid multi-platform plugin specification $name.');
final Map<String, PluginPlatform> platforms = <String, PluginPlatform>{}; final Map<String, PluginPlatform> platforms = <String, PluginPlatform>{};

13
packages/flutter_tools/test/general.shard/plugin_parsing_test.dart
View File

@ -122,6 +122,19 @@ void main() {
expect(windowsPlugin.pluginClass, 'WinSamplePlugin'); expect(windowsPlugin.pluginClass, 'WinSamplePlugin');
}); });
test('Legacy Format and Multi-Platform Format together is not allowed and error message contains plugin name', () {
const String pluginYamlRaw = 'androidPackage: com.flutter.dev\n'
'platforms:\n'
' android:\n'
' package: com.flutter.dev\n';
final YamlMap pluginYaml = loadYaml(pluginYamlRaw) as YamlMap;
expect(
() => Plugin.fromYaml(_kTestPluginName, _kTestPluginPath, pluginYaml, const <String>[]),
throwsToolExit(message: _kTestPluginName),
);
});
test('A default_package field is allowed', () { test('A default_package field is allowed', () {
const String pluginYamlRaw = const String pluginYamlRaw =
'platforms:\n' 'platforms:\n'