Google Git
Sign in
flutter/mirrors/flutter/8c043d06dedf114d67396d80274ef25492e86b85^!/./packages/flutter_tools
commit
8c043d06dedf114d67396d80274ef25492e86b85
[log]
author
Alexandre Ardhuin <alexandre.ardhuin@gmail.com>
Thu Feb 23 22:37:26 2017 +0100
committer
Adam Barth <github@adambarth.com>
Thu Feb 23 13:37:26 2017 -0800
tree
eb10de42bb0ccc18b95cbe20903ae9fecb27b46a
parent
2b61e21b29a9d6a01ca1dd7af8981228786273ea [diff]
fix lints for directives_ordering rule (#8382)


diff --git a/packages/flutter_tools/lib/executable.dart b/packages/flutter_tools/lib/executable.dart
index 2fa5e20..a661ec3 100644
--- a/packages/flutter_tools/lib/executable.dart
+++ b/packages/flutter_tools/lib/executable.dart

@@ -5,10 +5,11 @@
 import 'dart:async';
 
 import 'package:args/command_runner.dart';
+import 'package:intl/intl_standalone.dart' as intl;
 import 'package:process/process.dart';
 import 'package:stack_trace/stack_trace.dart';
-import 'package:intl/intl_standalone.dart' as intl;
 
+import 'src/artifacts.dart';
 import 'src/base/common.dart';
 import 'src/base/config.dart';
 import 'src/base/context.dart';
@@ -41,7 +42,6 @@
 import 'src/commands/trace.dart';
 import 'src/commands/update_packages.dart';
 import 'src/commands/upgrade.dart';
-import 'src/artifacts.dart';
 import 'src/devfs.dart';
 import 'src/device.dart';
 import 'src/doctor.dart';

diff --git a/packages/flutter_tools/lib/src/android/android_studio_validator.dart b/packages/flutter_tools/lib/src/android/android_studio_validator.dart
index 23b243d..d2400d6 100644
--- a/packages/flutter_tools/lib/src/android/android_studio_validator.dart
+++ b/packages/flutter_tools/lib/src/android/android_studio_validator.dart

@@ -6,11 +6,11 @@
 
 import '../base/file_system.dart';
 import '../base/io.dart';
-import '../doctor.dart';
-import '../globals.dart';
 import '../base/platform.dart';
 import '../base/process_manager.dart';
 import '../base/version.dart';
+import '../doctor.dart';
+import '../globals.dart';
 import 'android_studio.dart';
 
 class AndroidStudioValidator extends DoctorValidator {

diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart
index dfa46db..948befa 100644
--- a/packages/flutter_tools/lib/src/android/gradle.dart
+++ b/packages/flutter_tools/lib/src/android/gradle.dart

@@ -4,6 +4,7 @@
 
 import 'dart:async';
 
+import '../artifacts.dart';
 import '../base/common.dart';
 import '../base/file_system.dart';
 import '../base/logger.dart';
@@ -11,7 +12,6 @@
 import '../base/platform.dart';
 import '../base/process.dart';
 import '../base/utils.dart';
-import '../artifacts.dart';
 import '../build_info.dart';
 import '../cache.dart';
 import '../globals.dart';

diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart
index e399217..c69bc4d 100644
--- a/packages/flutter_tools/lib/src/asset.dart
+++ b/packages/flutter_tools/lib/src/asset.dart

@@ -11,8 +11,8 @@
 import 'base/file_system.dart';
 import 'build_info.dart';
 import 'cache.dart';
-import 'devfs.dart';
 import 'dart/package_map.dart';
+import 'devfs.dart';
 import 'globals.dart';
 
 /// A bundle of assets.

diff --git a/packages/flutter_tools/lib/src/base/process.dart b/packages/flutter_tools/lib/src/base/process.dart
index b22671e..ea73dba 100644
--- a/packages/flutter_tools/lib/src/base/process.dart
+++ b/packages/flutter_tools/lib/src/base/process.dart

@@ -5,10 +5,10 @@
 import 'dart:async';
 import 'dart:convert';
 
+import '../globals.dart';
 import 'file_system.dart';
 import 'io.dart';
 import 'process_manager.dart';
-import '../globals.dart';
 
 typedef String StringConverter(String string);
 typedef Future<dynamic> ShutdownHook();

diff --git a/packages/flutter_tools/lib/src/commands/build.dart b/packages/flutter_tools/lib/src/commands/build.dart
index a458843..cd7ac3f 100644
--- a/packages/flutter_tools/lib/src/commands/build.dart
+++ b/packages/flutter_tools/lib/src/commands/build.dart

@@ -12,8 +12,8 @@
 import '../build_info.dart';
 import '../globals.dart';
 import '../runner/flutter_command.dart';
-import 'build_apk.dart';
 import 'build_aot.dart';
+import 'build_apk.dart';
 import 'build_flx.dart';
 import 'build_ios.dart';
 

diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart
index 254abfb..50031aa 100644
--- a/packages/flutter_tools/lib/src/commands/build_apk.dart
+++ b/packages/flutter_tools/lib/src/commands/build_apk.dart

@@ -20,8 +20,8 @@
 import '../globals.dart';
 import '../resident_runner.dart';
 import '../services.dart';
-import 'build_aot.dart';
 import 'build.dart';
+import 'build_aot.dart';
 
 export '../android/android_device.dart' show AndroidDevice;
 

diff --git a/packages/flutter_tools/lib/src/commands/config.dart b/packages/flutter_tools/lib/src/commands/config.dart
index cc1340d..c00a24d 100644
--- a/packages/flutter_tools/lib/src/commands/config.dart
+++ b/packages/flutter_tools/lib/src/commands/config.dart

@@ -5,8 +5,8 @@
 import 'dart:async';
 
 import '../globals.dart';
-import '../usage.dart';
 import '../runner/flutter_command.dart';
+import '../usage.dart';
 
 class ConfigCommand extends FlutterCommand {
   ConfigCommand() {

diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart
index 4d843fa..cfc1cb3 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart

@@ -6,8 +6,8 @@
 
 import '../android/android_device.dart' show AndroidDevice;
 import '../application_package.dart';
-import '../base/file_system.dart';
 import '../base/common.dart';
+import '../base/file_system.dart';
 import '../base/platform.dart';
 import '../base/process.dart';
 import '../build_info.dart';

diff --git a/packages/flutter_tools/lib/src/commands/trace.dart b/packages/flutter_tools/lib/src/commands/trace.dart
index 43b59c3..474d373 100644
--- a/packages/flutter_tools/lib/src/commands/trace.dart
+++ b/packages/flutter_tools/lib/src/commands/trace.dart

@@ -11,8 +11,8 @@
 import '../build_info.dart';
 import '../cache.dart';
 import '../globals.dart';
-import '../vmservice.dart';
 import '../runner/flutter_command.dart';
+import '../vmservice.dart';
 
 // Names of some of the Timeline events we care about.
 const String kFlutterEngineMainEnterEventName = 'FlutterEngineMainEnter';

diff --git a/packages/flutter_tools/lib/src/dependency_checker.dart b/packages/flutter_tools/lib/src/dependency_checker.dart
index b63a0d8..fa9d73c 100644
--- a/packages/flutter_tools/lib/src/dependency_checker.dart
+++ b/packages/flutter_tools/lib/src/dependency_checker.dart

@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'globals.dart';
-
+import 'asset.dart';
 import 'base/file_system.dart';
 import 'dart/dependencies.dart';
 import 'dart/package_map.dart';
-import 'asset.dart';
+import 'globals.dart';
 
 class DependencyChecker {
   final DartDependencySetBuilder builder;

diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart
index 8ef1931..6f18a7d 100644
--- a/packages/flutter_tools/lib/src/devfs.dart
+++ b/packages/flutter_tools/lib/src/devfs.dart

@@ -5,12 +5,12 @@
 import 'dart:async';
 import 'dart:convert' show BASE64, UTF8;
 
+import 'asset.dart';
 import 'base/context.dart';
 import 'base/file_system.dart';
 import 'base/io.dart';
 import 'build_info.dart';
 import 'dart/package_map.dart';
-import 'asset.dart';
 import 'globals.dart';
 import 'vmservice.dart';
 

diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
index f2bb62d..6e0d08c 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart

@@ -7,8 +7,8 @@
 
 import 'package:archive/archive.dart';
 
-import 'android/android_workflow.dart';
 import 'android/android_studio_validator.dart';
+import 'android/android_workflow.dart';
 import 'base/common.dart';
 import 'base/context.dart';
 import 'base/file_system.dart';

diff --git a/packages/flutter_tools/lib/src/flx.dart b/packages/flutter_tools/lib/src/flx.dart
index f22d9f3..b35ccbf 100644
--- a/packages/flutter_tools/lib/src/flx.dart
+++ b/packages/flutter_tools/lib/src/flx.dart

@@ -9,9 +9,9 @@
 import 'base/common.dart';
 import 'base/file_system.dart';
 import 'base/process.dart';
+import 'build_info.dart';
 import 'dart/package_map.dart';
 import 'devfs.dart';
-import 'build_info.dart';
 import 'globals.dart';
 import 'zip.dart';
 

diff --git a/packages/flutter_tools/lib/src/ios/xcodeproj.dart b/packages/flutter_tools/lib/src/ios/xcodeproj.dart
index c7bb1d9..9cd5087 100644
--- a/packages/flutter_tools/lib/src/ios/xcodeproj.dart
+++ b/packages/flutter_tools/lib/src/ios/xcodeproj.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 '../artifacts.dart';
 import '../base/file_system.dart';
 import '../base/process.dart';
 import '../build_info.dart';
-import '../artifacts.dart';
 import '../cache.dart';
 import '../globals.dart';
 

diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart
index 570e762..93c6cb7 100644
--- a/packages/flutter_tools/lib/src/run_hot.dart
+++ b/packages/flutter_tools/lib/src/run_hot.dart

@@ -13,15 +13,13 @@
 import 'base/logger.dart';
 import 'base/utils.dart';
 import 'build_info.dart';
-
 import 'dart/dependencies.dart';
 import 'devfs.dart';
 import 'device.dart';
 import 'globals.dart';
 import 'resident_runner.dart';
-
-import 'vmservice.dart';
 import 'usage.dart';
+import 'vmservice.dart';
 
 class HotRunnerConfig {
   /// Should the hot runner compute the minimal Dart dependencies?

diff --git a/packages/flutter_tools/lib/src/services.dart b/packages/flutter_tools/lib/src/services.dart
index 8df1392..bf4da51 100644
--- a/packages/flutter_tools/lib/src/services.dart
+++ b/packages/flutter_tools/lib/src/services.dart

@@ -7,9 +7,9 @@
 
 import 'package:yaml/yaml.dart';
 
+import 'android/android_sdk.dart';
 import 'base/file_system.dart';
 import 'dart/package_map.dart';
-import 'android/android_sdk.dart';
 import 'globals.dart';
 
 const String _kFlutterManifestPath = 'pubspec.yaml';

diff --git a/packages/flutter_tools/lib/src/zip.dart b/packages/flutter_tools/lib/src/zip.dart
index 2b7a300..463f296 100644
--- a/packages/flutter_tools/lib/src/zip.dart
+++ b/packages/flutter_tools/lib/src/zip.dart

@@ -6,9 +6,9 @@
 
 import 'package:archive/archive.dart';
 
-import 'devfs.dart';
 import 'base/file_system.dart';
 import 'base/process.dart';
+import 'devfs.dart';
 
 abstract class ZipBuilder {
   factory ZipBuilder() {