From 1bc09bc12991ad40997dc2065b127f117987f05c Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Tue, 13 Jul 2021 08:26:02 -0700 Subject: [PATCH] restore the directives_ordering lint (#27346) --- analysis_options.yaml | 3 +-- ci/licenses_golden/tool_signature | 2 +- tools/licenses/lib/filesystem.dart | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 12bb0f5452..66f5b5ca69 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -100,8 +100,7 @@ linter: # - curly_braces_in_flow_control_structures # not required by flutter style - deprecated_consistency # - diagnostic_describe_all_properties # not yet tested - # TODO: Re-enable directives_ordering once roll https://github.com/flutter/engine/pull/27324 has completed. - # - directives_ordering + - directives_ordering # - do_not_use_environment # we do this commonly - empty_catches - empty_constructor_bodies diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 097a8a8c23..994a643c46 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 5754c1ee0193299dad20012e408d4ce2 +Signature: 17e2c7f169a5804317b8f79ab1f8a838 diff --git a/tools/licenses/lib/filesystem.dart b/tools/licenses/lib/filesystem.dart index 6295422f0b..20385626c3 100644 --- a/tools/licenses/lib/filesystem.dart +++ b/tools/licenses/lib/filesystem.dart @@ -6,8 +6,8 @@ import 'dart:collection'; import 'dart:convert'; import 'dart:io' as io; -import 'package:path/path.dart' as path; import 'package:archive/archive.dart' as a; +import 'package:path/path.dart' as path; import 'cache.dart'; import 'limits.dart'; -- GitLab