diff --git a/build_modules/lib/src/errors.dart b/build_modules/lib/src/errors.dart
index b44cfad93..88d233e2e 100644
--- a/build_modules/lib/src/errors.dart
+++ b/build_modules/lib/src/errors.dart
@@ -104,7 +104,7 @@ Future<String?> _missingImportMessage(
     return id == missingId;
   });
   if (import == null) return null;
-  var lineInfo = parsed.lineInfo!.getLocation(import.offset);
+  var lineInfo = parsed.lineInfo.getLocation(import.offset);
   return '`$import` from $sourceId at $lineInfo';
 }
 
diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml
index c80670e38..63467d40f 100644
--- a/build_modules/pubspec.yaml
+++ b/build_modules/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
-  analyzer: ">=1.0.0 <4.0.0"
+  analyzer: ">=3.4.1 <4.0.0"
   async: ^2.5.0
   bazel_worker: ^1.0.0
   build: ^2.0.0
diff --git a/build_resolvers/lib/src/build_asset_uri_resolver.dart b/build_resolvers/lib/src/build_asset_uri_resolver.dart
index 6909d55c9..926dd7b6a 100644
--- a/build_resolvers/lib/src/build_asset_uri_resolver.dart
+++ b/build_resolvers/lib/src/build_asset_uri_resolver.dart
@@ -80,6 +80,7 @@ class BuildAssetUriResolver extends UriResolver {
         driver.changeFile(state.path);
       }
     }
+    await driver.applyPendingFileChanges();
   }
 
   /// Updates the internal state for [id], if it has changed.
diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart
index 8a8006238..099bf5320 100644
--- a/build_resolvers/lib/src/resolver.dart
+++ b/build_resolvers/lib/src/resolver.dart
@@ -402,10 +402,13 @@ Future<String> _defaultSdkSummaryGenerator() async {
     await summaryFile.create(recursive: true);
     final embedderYamlPath =
         isFlutter ? p.join(_dartUiPath, '_embedder.yaml') : null;
-    await summaryFile.writeAsBytes(buildSdkSummary(
+    await summaryFile.writeAsBytes(
+      await buildSdkSummary2(
         sdkPath: _runningDartSdkPath,
         resourceProvider: PhysicalResourceProvider.INSTANCE,
-        embedderYamlPath: embedderYamlPath));
+        embedderYamlPath: embedderYamlPath,
+      ),
+    );
 
     await _createDepsFile(depsFile, currentDeps);
     watch.stop();
diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
index 6b40b6f08..c3e03ebc3 100644
--- a/build_resolvers/pubspec.yaml
+++ b/build_resolvers/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
-  analyzer: ">=2.8.0 <4.0.0"
+  analyzer: ">=3.4.1 <4.0.0"
   async: ^2.5.0
   build: ^2.0.0
   crypto: ^3.0.0