Update imports to match the latest directives_ordering analyzer check

See dart-lang/linter#2609
jason-simmons · Apr 29, 2021 · d52b2de · d52b2de
1 parent ff15344
commit d52b2de
Show file tree

Hide file tree

Showing 32 changed files with 125 additions and 325 deletions.
diff --git a/app_flutter/ios/Flutter/Debug.xcconfig b/app_flutter/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/app_flutter/ios/Flutter/Release.xcconfig b/app_flutter/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/app_flutter/lib/logic/qualified_task.dart b/app_flutter/lib/logic/qualified_task.dart
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter/foundation.dart';
-
 import 'package:cocoon_service/protos.dart' show Task, Commit;
 
+import 'package:flutter/foundation.dart';
+
 /// [Task.stageName] that maps to StageName enums.
 // TODO(chillers): Remove these and use StageName enum when available. https://github.com/flutter/cocoon/issues/441
 class StageName {

diff --git a/app_flutter/lib/logic/task_grid_filter.dart b/app_flutter/lib/logic/task_grid_filter.dart
@@ -4,10 +4,10 @@
 
 import 'dart:collection';
 
-import 'package:flutter/material.dart';
-
 import 'package:cocoon_service/protos.dart' show CommitStatus;
 
+import 'package:flutter/material.dart';
+
 import '../logic/qualified_task.dart';
 import '../widgets/filter_property_sheet.dart';
 

diff --git a/app_flutter/lib/state/build.dart b/app_flutter/lib/state/build.dart
@@ -4,11 +4,11 @@
 
 import 'dart:async';
 
-import 'package:flutter/foundation.dart';
-
 import 'package:cocoon_service/protos.dart'
     show BuildStatusResponse, Commit, CommitStatus, EnumBuildStatus, RootKey, Task;
 
+import 'package:flutter/foundation.dart';
+
 import '../logic/brooks.dart';
 import '../service/cocoon.dart';
 import '../service/google_authentication.dart';

diff --git a/app_flutter/lib/widgets/commit_author_avatar.dart b/app_flutter/lib/widgets/commit_author_avatar.dart
@@ -3,9 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:app_flutter/widgets/web_image.dart';
-import 'package:flutter/material.dart';
-
 import 'package:cocoon_service/protos.dart' show Commit;
+import 'package:flutter/material.dart';
 
 /// Shows the appropriate avatar for a [Commit]'s author.
 ///

diff --git a/app_flutter/lib/widgets/commit_box.dart b/app_flutter/lib/widgets/commit_box.dart
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:cocoon_service/protos.dart' show Commit;
+
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:cocoon_service/protos.dart' show Commit;
-
 import 'commit_author_avatar.dart';
 
 // TODO(ianh): Factor out the logic in task_overlay.dart and use it here as well,

diff --git a/app_flutter/lib/widgets/lattice.dart b/app_flutter/lib/widgets/lattice.dart
@@ -5,9 +5,9 @@
 import 'dart:math' as math;
 
 import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
-import 'package:flutter/material.dart';
 
 typedef Painter = void Function(Canvas canvas, Rect rect);
 

diff --git a/app_flutter/lib/widgets/luci_task_attempt_summary.dart b/app_flutter/lib/widgets/luci_task_attempt_summary.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:cocoon_service/protos.dart' show Task;
+
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:cocoon_service/protos.dart' show Task;
-
 /// Show information regarding each attempt for a luci Task.
 ///
 /// Currently shows a button that links to each individual log

diff --git a/app_flutter/lib/widgets/task_attempt_summary.dart b/app_flutter/lib/widgets/task_attempt_summary.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:cocoon_service/protos.dart' show Task;
+
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:cocoon_service/protos.dart' show Task;
-
 /// Show information regarding each attempt for a Task.
 ///
 /// Currently shows a button that links to each individual log

diff --git a/app_flutter/lib/widgets/task_grid.dart b/app_flutter/lib/widgets/task_grid.dart
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:cocoon_service/protos.dart' show CommitStatus, Commit, Stage, Task;
+
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
-import 'package:cocoon_service/protos.dart' show CommitStatus, Commit, Stage, Task;
-
 import '../logic/qualified_task.dart';
 import '../logic/task_grid_filter.dart';
 import '../state/build.dart';

diff --git a/app_flutter/macos/Flutter/Flutter-Debug.xcconfig b/app_flutter/macos/Flutter/Flutter-Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/app_flutter/macos/Flutter/Flutter-Release.xcconfig b/app_flutter/macos/Flutter/Flutter-Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"