Use buildSdkSummary from the analyzer

Fixes #2745

This remains behind a `src/` import, but it is the new approach to
building the summary.

Author: natebosch

build_resolvers/CHANGELOG.md

@@ -1,4 +1,7 @@
-## 1.3.10-dev
+## 1.3.10
+
+- Migrate to new analyzer API for creating an SDK summary after the old approach
+  was broken.
 
 ## 1.3.9
 

build_resolvers/lib/src/resolver.dart

@@ -289,7 +289,12 @@ Future<String> _defaultSdkSummaryGenerator() async {
     var watch = Stopwatch()..start();
     _logger.info('Generating SDK summary...');
     await summaryFile.create(recursive: true);
-    await summaryFile.writeAsBytes(_buildSdkSummary());
+    final embedderYamlPath =
+        isFlutter ? p.join(_dartUiPath, '_embedder.yaml') : null;
+    await summaryFile.writeAsBytes(buildSdkSummary(
+        sdkPath: _runningDartSdkPath,
+        resourceProvider: PhysicalResourceProvider.INSTANCE,
+        embedderYamlPath: embedderYamlPath));
 
     await _createDepsFile(depsFile, currentDeps);
     watch.stop();
@@ -322,49 +327,6 @@ Future<void> _createDepsFile(
   await depsFile.writeAsString(jsonEncode(currentDeps));
 }
 
-List<int> _buildSdkSummary() {
-  var resourceProvider = PhysicalResourceProvider.INSTANCE;
-  var dartSdkFolder = resourceProvider.getFolder(_runningDartSdkPath);
-  var sdk = FolderBasedDartSdk(resourceProvider, dartSdkFolder)
-    ..useSummary = false
-    ..analysisOptions = AnalysisOptionsImpl();
-
-  if (isFlutter) {
-    _addFlutterLibraries(sdk, resourceProvider);
-  }
-
-  var sdkSources = {
-    for (var library in sdk.sdkLibraries) sdk.mapDartUri(library.shortName),
-  };
-
-  // ignore: deprecated_member_use
-  return SummaryBuilder(sdkSources, sdk.context).build(
-      // TODO: remove after https://github.com/dart-lang/sdk/issues/41820
-      // ignore: deprecated_member_use
-      featureSet: FeatureSet.fromEnableFlags(['non-nullable']));
-}
-
-/// Loads the flutter engine _embedder.yaml file and adds any new libraries to
-/// [sdk].
-void _addFlutterLibraries(
-    AbstractDartSdk sdk, ResourceProvider resourceProvider) {
-  var embedderYamlFile =
-      resourceProvider.getFile(p.join(_dartUiPath, '_embedder.yaml'));
-  if (!embedderYamlFile.exists) {
-    throw StateError('Unable to find flutter libraries, please run '
-        '`flutter precache` and try again.');
-  }
-
-  var embedderYaml = loadYaml(embedderYamlFile.readAsStringSync()) as YamlMap;
-  var flutterSdk = EmbedderSdk(resourceProvider,
-      {resourceProvider.getFolder(_dartUiPath): embedderYaml});
-
-  for (var library in flutterSdk.sdkLibraries) {
-    if (sdk.libraryMap.getLibrary(library.shortName) != null) continue;
-    sdk.libraryMap.setLibrary(library.shortName, library as SdkLibraryImpl);
-  }
-}
-
 /// Checks that the current analyzer version supports the current language
 /// version.
 void _warnOnLanguageVersionMismatch() {

build_resolvers/pubspec.yaml

@@ -1,13 +1,13 @@
 name: build_resolvers
-version: 1.3.10-dev
+version: 1.3.10
 description: Resolve Dart code in a Builder
 homepage: https://github.com/dart-lang/build/tree/master/build_resolvers
 
 environment:
   sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
-  analyzer: ^0.39.5
+  analyzer: ^0.39.12
   build: ">=1.3.0 <1.4.0"
   crypto: ^2.0.0
   graphs: ^0.2.0