From 6a6d54edd44b34534d23f290a75f6383f7a9843d Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 15:15:00 -0800
Subject: [PATCH 01/11] Skip sdk-analyzer job

---
 .github/workflows/test.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0667f0bf27..ea49d24a77 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -38,6 +38,10 @@ jobs:
             job: sdk-analyzer
           - sdk: stable
             job: sdk-docs
+            # Skip dev sdk-analyzer until dart_style has analyzer 3.0.0.
+            # See https://github.com/dart-lang/dartdoc/runs/4493620139?check_suite_focus=true
+          - sdk: dev
+            job: sdk-analyzer
 
     steps:
       - name: Store date

From 2bb8b0602464c7ce2e213a296a2a0e1def0917b7 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 16:50:36 -0800
Subject: [PATCH 02/11] Update dartanalyzer command

---
 tool/grind.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tool/grind.dart b/tool/grind.dart
index 7b0d062350..3a8b4adcc0 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -258,8 +258,8 @@ void analyzeTestPackages() async {
       workingDirectory: testPackagePath,
     );
     await SubprocessLauncher('analyze-test-package').runStreamed(
-      sdkBin('dartanalyzer'),
-      ['.'],
+      sdkBin('dart'),
+      ['analyze'],
       workingDirectory: testPackagePath,
     );
   }

From eef6f2e257db5f6bc0246b5dc309a14003ee34c3 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 18:03:41 -0800
Subject: [PATCH 03/11] Ignore uninteresting static analyses in testing

---
 testing/test_package/lib/features/nullable_elements.dart | 1 +
 testing/test_package/lib/features/opt_out_of_nnbd.dart   | 1 +
 testing/test_package/lib/src/somelib.dart                | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/testing/test_package/lib/features/nullable_elements.dart b/testing/test_package/lib/features/nullable_elements.dart
index 384e9d67db..89dcf6b720 100644
--- a/testing/test_package/lib/features/nullable_elements.dart
+++ b/testing/test_package/lib/features/nullable_elements.dart
@@ -15,6 +15,7 @@ void set nullableSetter(String? value) {
 }
 
 /// This should have return type of `Future?`.
+// ignore: unnecessary_question_mark
 dynamic? oddAsyncFunction() async {}
 
 /// This should also have return type of `Future?`.
diff --git a/testing/test_package/lib/features/opt_out_of_nnbd.dart b/testing/test_package/lib/features/opt_out_of_nnbd.dart
index 0b9584a359..1980a22468 100644
--- a/testing/test_package/lib/features/opt_out_of_nnbd.dart
+++ b/testing/test_package/lib/features/opt_out_of_nnbd.dart
@@ -6,4 +6,5 @@
 
 library opt_out_of_nnbd;
 
+// ignore: dead_code
 String notOptedIn = false ? 'hi' : null;
diff --git a/testing/test_package/lib/src/somelib.dart b/testing/test_package/lib/src/somelib.dart
index b8ab5cea58..1bfa7e15b1 100644
--- a/testing/test_package/lib/src/somelib.dart
+++ b/testing/test_package/lib/src/somelib.dart
@@ -18,11 +18,13 @@ class ExtendedBaseReexported extends BaseReexported {}
 
 /// A private extension.
 extension _Unseen on Object {
+  // ignore: unused_element
   void doYouSeeMe() {}
 }
 
 /// An extension without a name
 extension on List {
+  // ignore: unused_element
   void somethingNew() {}
 }
 

From e8b5fa053ec79f83dae09509f70fe8655cae7086 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 18:37:45 -0800
Subject: [PATCH 04/11] Ignore invalid_dependency

---
 testing/test_package/pubspec.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testing/test_package/pubspec.yaml b/testing/test_package/pubspec.yaml
index 0ff1a4cc49..35eceec508 100644
--- a/testing/test_package/pubspec.yaml
+++ b/testing/test_package/pubspec.yaml
@@ -6,6 +6,7 @@ dependencies:
   meta: ^1.4.0
   args: ^1.5.0
   test_package_imported:
+    # ignore: invalid_dependency
     path: "../test_package_imported"
 environment:
   sdk: '>=2.14.0-0 <3.0.0'

From 03ebe859fbdb96d2ca0f07b980539c1f7079462f Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 20:11:47 -0800
Subject: [PATCH 05/11] just analyze code

---
 testing/test_package/pubspec.yaml | 1 -
 tool/grind.dart                   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/testing/test_package/pubspec.yaml b/testing/test_package/pubspec.yaml
index 35eceec508..0ff1a4cc49 100644
--- a/testing/test_package/pubspec.yaml
+++ b/testing/test_package/pubspec.yaml
@@ -6,7 +6,6 @@ dependencies:
   meta: ^1.4.0
   args: ^1.5.0
   test_package_imported:
-    # ignore: invalid_dependency
     path: "../test_package_imported"
 environment:
   sdk: '>=2.14.0-0 <3.0.0'
diff --git a/tool/grind.dart b/tool/grind.dart
index 3a8b4adcc0..bb8a7a136e 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -259,7 +259,7 @@ void analyzeTestPackages() async {
     );
     await SubprocessLauncher('analyze-test-package').runStreamed(
       sdkBin('dart'),
-      ['analyze'],
+      ['analyze', 'bin', 'examples', 'lib'],
       workingDirectory: testPackagePath,
     );
   }

From 584e7209c577379705eed6d6def517fc1d4fc651 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 20:46:12 -0800
Subject: [PATCH 06/11] Just lib

---
 tool/grind.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tool/grind.dart b/tool/grind.dart
index bb8a7a136e..f52943ee48 100644
--- a/tool/grind.dart
+++ b/tool/grind.dart
@@ -259,7 +259,9 @@ void analyzeTestPackages() async {
     );
     await SubprocessLauncher('analyze-test-package').runStreamed(
       sdkBin('dart'),
-      ['analyze', 'bin', 'examples', 'lib'],
+      // TODO(srawlins): Analyze the whole directory by ignoring the pubspec
+      // reports.
+      ['analyze', 'lib'],
       workingDirectory: testPackagePath,
     );
   }

From e64b6c80f9b7c016f19aa7842b2c5883a17c9e37 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Mon, 13 Dec 2021 23:46:23 -0800
Subject: [PATCH 07/11] bump

---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ea49d24a77..a6d81e283b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -38,7 +38,7 @@ jobs:
             job: sdk-analyzer
           - sdk: stable
             job: sdk-docs
-            # Skip dev sdk-analyzer until dart_style has analyzer 3.0.0.
+            # Skip sdk-analyzer on dev until dart_style has analyzer 3.0.0.
             # See https://github.com/dart-lang/dartdoc/runs/4493620139?check_suite_focus=true
           - sdk: dev
             job: sdk-analyzer

From ff1375c431210057211b0f5d0f08c702b3e1980a Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 07:02:10 -0800
Subject: [PATCH 08/11] Change dart_style dep

---
 .github/workflows/test.yaml | 4 ----
 pubspec.yaml                | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index a6d81e283b..0667f0bf27 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -38,10 +38,6 @@ jobs:
             job: sdk-analyzer
           - sdk: stable
             job: sdk-docs
-            # Skip sdk-analyzer on dev until dart_style has analyzer 3.0.0.
-            # See https://github.com/dart-lang/dartdoc/runs/4493620139?check_suite_focus=true
-          - sdk: dev
-            job: sdk-analyzer
 
     steps:
       - name: Store date
diff --git a/pubspec.yaml b/pubspec.yaml
index 2bf26da07e..07105e688e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -38,5 +38,9 @@ dev_dependencies:
   lints: ^1.0.1
   test: ^1.19.0
 
+dependency_overrides:
+  dart_style:
+    git: https://github.com/dart-lang/dart_style
+
 executables:
   dartdoc: null

From 9d5247490c7647d3d47a190a18b2239300956f95 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 07:10:36 -0800
Subject: [PATCH 09/11] deduplicate

---
 pubspec.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 07105e688e..8c25ed4f01 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,7 +32,6 @@ dev_dependencies:
   build_version: ^2.1.0
   code_builder: ^4.1.0
   coverage: ^1.0.3
-  dart_style: ^2.2.0
   grinder: ^0.9.0
   http: ^0.13.3
   lints: ^1.0.1

From a2ff8d23bd0985cb3b93bba03db903cb970c9d62 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 07:12:37 -0800
Subject: [PATCH 10/11] OG dart style

---
 pubspec.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 8c25ed4f01..2bf26da07e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,14 +32,11 @@ dev_dependencies:
   build_version: ^2.1.0
   code_builder: ^4.1.0
   coverage: ^1.0.3
+  dart_style: ^2.2.0
   grinder: ^0.9.0
   http: ^0.13.3
   lints: ^1.0.1
   test: ^1.19.0
 
-dependency_overrides:
-  dart_style:
-    git: https://github.com/dart-lang/dart_style
-
 executables:
   dartdoc: null

From b3fe8b0d8ac38049909866d9b97875fc7b87e65d Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 14 Dec 2021 07:34:20 -0800
Subject: [PATCH 11/11] No sdk-analyzer

---
 .github/workflows/test.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0667f0bf27..2f97301c04 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         sdk: [dev, stable]
-        job: [main, flutter, sdk-analyzer, packages, sdk-docs]
+        job: [main, flutter, packages, sdk-docs]
         include:
           - os: macos-latest
             sdk: dev
@@ -34,8 +34,8 @@ jobs:
             # results.
           - sdk: stable
             job: flutter
-          - sdk: stable
-            job: sdk-analyzer
+            #- sdk: stable
+            #  job: sdk-analyzer
           - sdk: stable
             job: sdk-docs