From 8755e569ca4633bd1e56bbd57e3adb198b5b646a Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Thu, 22 Sep 2016 07:40:38 -0700
Subject: [PATCH] suppress pub override warning; decouple the analyzer versions
 (#5991)

* suppress warning; decouple the analyzer versions

* also pass in --no-packages-dir
---
 bin/flutter                                  |  2 +-
 dev/devicelab/pubspec.yaml                   |  8 --------
 packages/flutter_test/pubspec.yaml           |  9 ---------
 packages/flutter_tools/lib/src/dart/pub.dart | 15 ++++++++++++++-
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/bin/flutter b/bin/flutter
index 04c3bc1230..627e18c54d 100755
--- a/bin/flutter
+++ b/bin/flutter
@@ -41,7 +41,7 @@ DART="$DART_SDK_PATH/bin/dart"
 
     echo Building flutter tool...
     FLUTTER_DIR="$FLUTTER_ROOT/packages/flutter"
-    (cd "$FLUTTER_TOOLS_DIR"; "../../bin/cache/dart-sdk/bin/pub" get --verbosity=warning)
+    (cd "$FLUTTER_TOOLS_DIR"; "../../bin/cache/dart-sdk/bin/pub" get --verbosity=error --no-packages-dir)
     "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH"
     echo $REVISION > "$STAMP_PATH"
   fi
diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml
index e8b5a6b742..013912f859 100644
--- a/dev/devicelab/pubspec.yaml
+++ b/dev/devicelab/pubspec.yaml
@@ -13,15 +13,7 @@ dependencies:
   path: ^1.3.0
   stack_trace: ^1.4.0
   vm_service_client: '^0.2.0'
-  
-  # Pulled in via dependency_override below.
-  analyzer: any
 
 dev_dependencies:
   # See packages/flutter_test/pubspec.yaml for why we're pinning this version.
   test: 0.12.15+4
-
-# See packages/flutter_test/pubspec.yaml for why we're using an override.
-dependency_overrides:
-  analyzer:
-    path: ../../bin/cache/dart-sdk/lib/analyzer
diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml
index f3f423ea68..873559571f 100644
--- a/packages/flutter_test/pubspec.yaml
+++ b/packages/flutter_test/pubspec.yaml
@@ -7,14 +7,5 @@ dependencies:
   # here we pin it precisely to avoid version skew across our packages.
   test: 0.12.15+4
 
-  # We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do.
-  # Like 'flutter_tools', we use the version of the analyzer in the vended Dart
-  # SDK as defined in the `dependency_overrides` below.
-  analyzer: any
-
   flutter:
     path: ../flutter
-
-dependency_overrides:
-  analyzer:
-    path: ../../bin/cache/dart-sdk/lib/analyzer
diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart
index 0fa70d9cb9..2bfd52e48d 100644
--- a/packages/flutter_tools/lib/src/dart/pub.dart
+++ b/packages/flutter_tools/lib/src/dart/pub.dart
@@ -49,7 +49,8 @@ Future<int> pubGet({
     Status status = logger.startProgress("Running 'pub $command' in ${path.basename(directory)}...");
     int code = await runCommandAndStreamOutput(
       <String>[sdkBinaryName('pub'), '--verbosity=warning', command, '--no-packages-dir', '--no-precompile'],
-      workingDirectory: directory
+      workingDirectory: directory,
+      mapFunction: _filterOverrideWarnings
     );
     status.stop(showElapsedTime: true);
     if (code != 0)
@@ -62,3 +63,15 @@ Future<int> pubGet({
   printError('$directory: pubspec.yaml and .packages are in an inconsistent state');
   return 1;
 }
+
+String _filterOverrideWarnings(String str) {
+  // Warning: You are using these overridden dependencies:
+  // ! analyzer 0.29.0-alpha.0 from path ../../bin/cache/dart-sdk/lib/analyzer
+
+  if (str.contains('overridden dependencies:'))
+    return null;
+  if (str.startsWith('! analyzer '))
+    return null;
+
+  return str;
+}