From 233c100b697edb1c0c2a71fffcc7db291fe6ef2f Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Thu, 20 Dec 2018 12:34:42 -0800 Subject: [PATCH] [License] Enable always_require_non_null_named_parameters Adds dependency on package:meta. --- ci/licenses_golden/tool_signature | 2 +- tools/licenses/analysis_options.yaml | 1 + tools/licenses/lib/licenses.dart | 7 ++++++- tools/licenses/pubspec.yaml | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 399e9f9fba7..05ecdb5a557 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 0461a8d6fe3503cd19d8e0d3becfee87 +Signature: acd8a02ea76b205ea2dbea4c91961320 diff --git a/tools/licenses/analysis_options.yaml b/tools/licenses/analysis_options.yaml index aefe3c993b9..a6330b76e98 100644 --- a/tools/licenses/analysis_options.yaml +++ b/tools/licenses/analysis_options.yaml @@ -10,6 +10,7 @@ analyzer: linter: rules: + - always_require_non_null_named_parameters - avoid_empty_else - avoid_function_literals_in_foreach_calls - comment_references diff --git a/tools/licenses/lib/licenses.dart b/tools/licenses/lib/licenses.dart index 89d1099c2de..097863fee0d 100644 --- a/tools/licenses/lib/licenses.dart +++ b/tools/licenses/lib/licenses.dart @@ -5,6 +5,8 @@ import 'dart:convert'; import 'dart:io' as system; +import 'package:meta/meta.dart'; + import 'cache.dart'; import 'limits.dart'; import 'patterns.dart'; @@ -838,7 +840,10 @@ Iterable<_LicenseMatch> _tryReferenceByUrl(String body, MultipleVersionedLicense } } -Iterable<_LicenseMatch> _tryInline(String body, RegExp pattern, { bool needsCopyright, String origin }) sync* { +Iterable<_LicenseMatch> _tryInline(String body, RegExp pattern, { + @required bool needsCopyright, + String origin, +}) sync* { assert(needsCopyright != null); for (_PartialLicenseMatch match in _findLicenseBlocks(body, pattern, 1, 2, needsCopyright: false)) { // We search with "needsCopyright: false" but then create a _LicenseMatch with diff --git a/tools/licenses/pubspec.yaml b/tools/licenses/pubspec.yaml index f56b63a03bb..72743843249 100644 --- a/tools/licenses/pubspec.yaml +++ b/tools/licenses/pubspec.yaml @@ -1,6 +1,7 @@ name: licenses dependencies: - path: ^1.3.0 archive: ^2.0.4 args: 1.5.0 crypto: ^2.0.2+1 + meta: ^1.1.6 + path: ^1.3.0