From 6446a927f07ea76ac64176b2c57e39acfe173dca Mon Sep 17 00:00:00 2001
From: Janice Collins <jcollins@google.com>
Date: Tue, 27 Apr 2021 09:46:02 -0700
Subject: [PATCH] Enable experimental feature testing again for 2.14 (#2625)

* analyzer 1.5.0 and enable features

* use flutter pub to activate dartdoc
---
 pubspec.yaml                               | 4 ++--
 test/end2end/model_special_cases_test.dart | 4 ++--
 tool/grind.dart                            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index e5433d1a40..4c6594da05 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  analyzer: ^1.4.0
+  analyzer: ^1.5.0
   args: ^2.0.0
   charcode: ^1.2.0
   collection: ^1.2.0
@@ -27,7 +27,7 @@ dependencies:
 dev_dependencies:
   async: ^2.0.8
   build: ^2.0.0
-  build_runner: ^1.10.0
+  build_runner: ^2.0.1
   build_test: ^2.0.0
   build_version: ^2.0.1
   coverage: ^1.0.2
diff --git a/test/end2end/model_special_cases_test.dart b/test/end2end/model_special_cases_test.dart
index 4f267ecf81..668814120f 100644
--- a/test/end2end/model_special_cases_test.dart
+++ b/test/end2end/model_special_cases_test.dart
@@ -77,9 +77,9 @@ void main() {
   final _generalizedTypedefsAllowed =
       VersionRange(min: Version.parse('2.13.0-0'), includeMin: true);
   final _genericMetadataAllowed =
-      VersionRange(min: Version.parse('2.15.0-0'), includeMin: true);
+      VersionRange(min: Version.parse('2.14.0-0'), includeMin: true);
   final _tripleShiftAllowed =
-      VersionRange(min: Version.parse('2.15.0-0'), includeMin: true);
+      VersionRange(min: Version.parse('2.14.0-0'), includeMin: true);
 
   // Experimental features not yet enabled by default.  Move tests out of this
   // block when the feature is enabled by default.
diff --git a/tool/grind.dart b/tool/grind.dart
index 083da9eb03..447afa8397 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -916,8 +916,8 @@ Future<List<Map>> _buildFlutterDocs(
   );
   // TODO(jcollins-g): flutter's dart SDK pub tries to precompile the universe
   // when using -spath.  Why?
-  await flutterRepo.launcher.runStreamed(
-      'pub', ['global', 'activate', '-spath', '.', '-x', 'dartdoc'],
+  await flutterRepo.launcher.runStreamed(flutterRepo.cachePub,
+      ['global', 'activate', '-spath', '.', '-x', 'dartdoc'],
       workingDirectory: await futureCwd);
   return await flutterRepo.launcher.runStreamed(
     flutterRepo.cacheDart,