From bb9bac9f3fae2d55de5e3b6a218e2b103a73c9b8 Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Mon, 14 Jun 2021 12:13:28 -0700 Subject: [PATCH] Prep for new `directives_ordering` (#84579) * sort directives * prep for new directives ordering * update excludes * - blank --- dev/analysis_options.yaml | 13 +++++++++++++ .../lib/gestures/gesture_detector_bench.dart | 2 +- dev/conductor/test/candidates_test.dart | 2 +- dev/conductor/test/clean_test.dart | 2 +- dev/conductor/test/codesign_test.dart | 2 +- dev/conductor/test/repository_test.dart | 3 +-- dev/conductor/test/roll_dev_test.dart | 2 +- dev/conductor/test/start_test.dart | 2 +- 8 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 dev/analysis_options.yaml diff --git a/dev/analysis_options.yaml b/dev/analysis_options.yaml new file mode 100644 index 0000000000..e0dcdea50f --- /dev/null +++ b/dev/analysis_options.yaml @@ -0,0 +1,13 @@ +# Temporary work-around for breaking changes to `directives_ordering` + +include: ../analysis_options.yaml + +analyzer: + exclude: + # Ignore protoc generated files + - "conductor/lib/proto/*" + +linter: + rules: + # Disable temporarily to unblock an SDK roll (https://github.com/flutter/flutter/issues/84577) + directives_ordering: false diff --git a/dev/benchmarks/microbenchmarks/lib/gestures/gesture_detector_bench.dart b/dev/benchmarks/microbenchmarks/lib/gestures/gesture_detector_bench.dart index 34025c6731..4156a717e2 100644 --- a/dev/benchmarks/microbenchmarks/lib/gestures/gesture_detector_bench.dart +++ b/dev/benchmarks/microbenchmarks/lib/gestures/gesture_detector_bench.dart @@ -4,8 +4,8 @@ import 'package:flutter_test/flutter_test.dart'; -import '../common.dart'; import './apps/button_matrix_app.dart' as button_matrix; +import '../common.dart'; const int _kNumWarmUpIters = 20; const int _kNumIters = 300; diff --git a/dev/conductor/test/candidates_test.dart b/dev/conductor/test/candidates_test.dart index 3a258531f1..f01e37a04f 100644 --- a/dev/conductor/test/candidates_test.dart +++ b/dev/conductor/test/candidates_test.dart @@ -8,8 +8,8 @@ import 'package:conductor/repository.dart'; import 'package:file/memory.dart'; import 'package:platform/platform.dart'; -import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; import './common.dart'; +import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; void main() { group('candidates command', () { diff --git a/dev/conductor/test/clean_test.dart b/dev/conductor/test/clean_test.dart index 7b09d3dcaa..55258b16d1 100644 --- a/dev/conductor/test/clean_test.dart +++ b/dev/conductor/test/clean_test.dart @@ -11,8 +11,8 @@ import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:platform/platform.dart'; -import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; import './common.dart'; +import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; void main() { group('clean command', () { diff --git a/dev/conductor/test/codesign_test.dart b/dev/conductor/test/codesign_test.dart index bb83835afa..5a93c08b1f 100644 --- a/dev/conductor/test/codesign_test.dart +++ b/dev/conductor/test/codesign_test.dart @@ -10,8 +10,8 @@ import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:platform/platform.dart'; -import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; import './common.dart'; +import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; void main() { group('codesign command', () { diff --git a/dev/conductor/test/repository_test.dart b/dev/conductor/test/repository_test.dart index d9cde62810..0a5e88bbb5 100644 --- a/dev/conductor/test/repository_test.dart +++ b/dev/conductor/test/repository_test.dart @@ -7,9 +7,8 @@ import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:platform/platform.dart'; -import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; - import './common.dart'; +import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; void main() { group('repository', () { diff --git a/dev/conductor/test/roll_dev_test.dart b/dev/conductor/test/roll_dev_test.dart index 67018c2f36..6101e817e3 100644 --- a/dev/conductor/test/roll_dev_test.dart +++ b/dev/conductor/test/roll_dev_test.dart @@ -10,8 +10,8 @@ import 'package:conductor/roll_dev.dart'; import 'package:file/memory.dart'; import 'package:platform/platform.dart'; -import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; import './common.dart'; +import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; void main() { group('rollDev()', () { diff --git a/dev/conductor/test/start_test.dart b/dev/conductor/test/start_test.dart index 1b1ae879c2..3639bfbb5c 100644 --- a/dev/conductor/test/start_test.dart +++ b/dev/conductor/test/start_test.dart @@ -16,8 +16,8 @@ import 'package:file/file.dart'; import 'package:file/memory.dart'; import 'package:platform/platform.dart'; -import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; import './common.dart'; +import '../../../packages/flutter_tools/test/src/fake_process_manager.dart'; void main() { group('start command', () {