Require analyzer 2.7.0, use createMockSdk() (#3043)

dart-lang · Oct 25, 2021 · 04aa930 · 04aa930
1 parent 548cbd4
commit 04aa930
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/lib/src/test_utilities/test_resource_provider.dart b/lib/src/test_utilities/test_resource_provider.dart
@@ -27,9 +27,16 @@ DartLinter buildDriver(LintRule? rule, File file, {String? analysisOptions}) {
     packageConfigPath = null;
   }
 
+  var sdkRoot = memoryResourceProvider.getFolder(
+    memoryResourceProvider.convertPath('/sdk'),
+  );
+  createMockSdk(
+    resourceProvider: memoryResourceProvider,
+    root: sdkRoot,
+  );
+
   var options = LinterOptions([rule!], analysisOptions)
-    ..dartSdkPath = sdkRoot
-    ..mockSdk = MockSdk(resourceProvider: memoryResourceProvider)
+    ..dartSdkPath = sdkRoot.path
     ..resourceProvider = resourceProvider
     ..packageConfigPath = packageConfigPath;
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -12,7 +12,7 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=2.5.0 <3.0.0'
+  analyzer: '>=2.7.0 <3.0.0'
   args: ^2.0.0
   collection: ^1.15.0
   glob: ^2.0.0

diff --git a/test/rule_test_support.dart b/test/rule_test_support.dart
@@ -368,13 +368,13 @@ abstract class _ContextResolutionTest with ResourceProviderMixin {
 
   late ResolvedUnitResult result;
 
-  List<MockSdkLibrary> get additionalMockSdkLibraries => [];
-
   List<String> get collectionIncludedPaths;
 
   /// The analysis errors that were computed during analysis.
   List<AnalysisError> get errors => result.errors;
 
+  Folder get sdkRoot => newFolder('/sdk');
+
   String get testFilePath => '/test/lib/test.dart';
 
   void addTestFile(String content) {
@@ -405,9 +405,9 @@ abstract class _ContextResolutionTest with ResourceProviderMixin {
       _lintRulesAreRegistered = true;
     }
 
-    MockSdk(
+    createMockSdk(
       resourceProvider: resourceProvider,
-      additionalLibraries: additionalMockSdkLibraries,
+      root: sdkRoot,
     );
   }
 
@@ -430,7 +430,7 @@ abstract class _ContextResolutionTest with ResourceProviderMixin {
       enableIndex: true,
       includedPaths: collectionIncludedPaths.map(convertPath).toList(),
       resourceProvider: resourceProvider,
-      sdkPath: convertPath('/sdk'),
+      sdkPath: sdkRoot.path,
     );
   }