Avoid deprecated analyzer APIs (#3351)

- Bump dependencies to ^4.6.0.
- Bump min SDK to ^2.17.0 and switch mono_repo to test on that.
- Use constructor tearoffs now that the language version is newer

build_modules/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 4.0.6-dev
+
 ## 4.0.5
 
 * Allow analyzer verion 4.x.

build_modules/lib/src/module_library.dart

@@ -238,6 +238,6 @@ bool _isPart(CompilationUnit dart) =>
 // but has a part that does, or it exports a `main` from another library.
 bool _hasMainMethod(CompilationUnit dart) => dart.declarations.any((node) =>
     node is FunctionDeclaration &&
-    node.name.name == 'main' &&
+    node.name2.lexeme == 'main' &&
     node.functionExpression.parameters != null &&
     node.functionExpression.parameters!.parameters.length <= 2);

build_modules/pubspec.yaml

@@ -1,13 +1,13 @@
 name: build_modules
-version: 4.0.5
+version: 4.0.6-dev
 description: Builders for Dart modules
 repository: https://github.com/dart-lang/build/tree/master/build_modules
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
 
 dependencies:
-  analyzer: ">=3.4.1 <5.0.0"
+  analyzer: ^4.4.0
   async: ^2.5.0
   bazel_worker: ^1.0.0
   build: ^2.0.0

build_resolvers/pubspec.yaml

@@ -7,7 +7,7 @@ environment:
   sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
-  analyzer: ">=4.3.0 <5.0.0"
+  analyzer: ^4.6.0
   async: ^2.5.0
   build: ^2.0.0
   crypto: ^3.0.0

build_resolvers/test/resolver_test.dart

@@ -46,7 +46,7 @@ void main() {
         var lib = await resolver.libraryFor(entryPoint);
         expect(lib.importedLibraries.length, 2);
         var libA = lib.importedLibraries.where((l) => l.name == 'a').single;
-        expect(libA.getType('Foo'), isNull);
+        expect(libA.getClass('Foo'), isNull);
       }, resolvers: AnalyzerResolvers());
     });
 
@@ -64,7 +64,7 @@ void main() {
         var lib = await resolver.libraryFor(entryPoint);
         expect(lib.importedLibraries.length, 2);
         var libB = lib.importedLibraries.where((l) => l.name == 'b').single;
-        expect(libB.getType('Foo'), isNull);
+        expect(libB.getClass('Foo'), isNull);
       }, resolvers: AnalyzerResolvers());
     });
 
@@ -253,7 +253,7 @@ void main() {
               ''',
       }, (resolver) async {
         var lib = await resolver.libraryFor(entryPoint);
-        var clazz = lib.getType('A');
+        var clazz = lib.getClass('A');
         expect(clazz, isNotNull);
         expect(clazz!.interfaces, isEmpty);
       }, resolvers: resolvers);
@@ -270,7 +270,7 @@ void main() {
               ''',
       }, (resolver) async {
         var lib = await resolver.libraryFor(entryPoint);
-        var clazz = lib.getType('A');
+        var clazz = lib.getClass('A');
         expect(clazz, isNotNull);
         expect(clazz!.interfaces, hasLength(1));
         expect(clazz.interfaces.first.getDisplayString(withNullability: false),
@@ -354,7 +354,7 @@ void main() {
               class Bar {}''',
       }, (resolver) async {
         var main = (await resolver.findLibraryByName('web.main'))!;
-        var meta = main.getType('Foo')!.supertype!.element.metadata[0];
+        var meta = main.getClass('Foo')!.supertype!.element2.metadata[0];
         expect(meta, isNotNull);
         expect(meta.computeConstantValue()?.toIntValue(), 0);
       }, resolvers: AnalyzerResolvers());
@@ -392,7 +392,7 @@ void main() {
       }, (resolver) async {
         var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart'));
         var classDefinition = entry.importedLibraries
-            .map((l) => l.getType('SomeClass'))
+            .map((l) => l.getClass('SomeClass'))
             .singleWhere((c) => c != null)!;
         expect(await resolver.assetIdForElement(classDefinition),
             AssetId('a', 'lib/b.dart'));
@@ -631,18 +631,18 @@ int? get x => 1;
               } ''',
       }, (resolver) async {
         var entry = await resolver.libraryFor(AssetId('a', 'lib/a.dart'));
-        var classDefinition = entry.getType('MyClass')!;
+        var classDefinition = entry.getClass('MyClass')!;
         var color = classDefinition.getField('color')!;
 
         if (isFlutter) {
-          expect(color.type.element!.name, equals('Color'));
-          expect(color.type.element!.library!.name, equals('dart.ui'));
+          expect(color.type.element2!.name, equals('Color'));
+          expect(color.type.element2!.library!.name, equals('dart.ui'));
           expect(
-              color.type.element!.library!.definingCompilationUnit.source.uri
+              color.type.element2!.library!.definingCompilationUnit.source.uri
                   .toString(),
               equals('dart:ui'));
         } else {
-          expect(color.type.element!.name, equals('dynamic'));
+          expect(color.type.element2!.name, equals('dynamic'));
         }
       }, resolvers: AnalyzerResolvers());
     });
@@ -733,7 +733,7 @@ int? get x => 1;
         expect(
             unit.declarations.first,
             isA<FunctionDeclaration>()
-                .having((d) => d.name.name, 'main', 'main'));
+                .having((d) => d.name2.lexeme, 'main', 'main'));
       }, resolvers: AnalyzerResolvers());
     });
   });
@@ -747,7 +747,7 @@ int? get x => 1;
         var unit = await resolver.astNodeFor(lib.topLevelElements.first);
         expect(unit, isA<FunctionDeclaration>());
         expect(unit!.toSource(), 'main() {}');
-        expect((unit as FunctionDeclaration).declaredElement, isNull);
+        expect((unit as FunctionDeclaration).declaredElement2, isNull);
       }, resolvers: AnalyzerResolvers());
     });
 
@@ -762,7 +762,8 @@ int? get x => 1;
           unit,
           isA<FunctionDeclaration>()
               .having((fd) => fd.toSource(), 'toSource()', 'main() {}')
-              .having((fd) => fd.declaredElement, 'declaredElement', isNotNull),
+              .having(
+                  (fd) => fd.declaredElement2, 'declaredElement', isNotNull),
         );
       }, resolvers: AnalyzerResolvers());
     });

build_runner_core/lib/src/generate/input_matcher.dart

@@ -21,8 +21,8 @@ class InputMatcher {
 
   InputMatcher(InputSet inputSet, {List<String>? defaultInclude})
       : includeGlobs =
-            (inputSet.include ?? defaultInclude)?.map((p) => Glob(p)).toList(),
-        excludeGlobs = inputSet.exclude?.map((p) => Glob(p)).toList();
+            (inputSet.include ?? defaultInclude)?.map(Glob.new).toList(),
+        excludeGlobs = inputSet.exclude?.map(Glob.new).toList();
 
   /// Whether [input] is included in this set of assets.
   bool matches(AssetId input) => includes(input) && !excludes(input);

build_runner_core/mono_pkg.yaml

@@ -1,4 +1,5 @@
 sdk:
+- 2.17.0
 - dev
 
 stages:

build_runner_core/pubspec.yaml

@@ -4,7 +4,7 @@ description: Core tools to write binaries that run builders.
 repository: https://github.com/dart-lang/build/tree/master/build_runner_core
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   async: ^2.5.0
@@ -27,7 +27,7 @@ dependencies:
   yaml: ^3.0.0
 
 dev_dependencies:
-  analyzer: ">=2.0.0 <5.0.0"
+  analyzer: ^4.6.0
   build_runner: ^2.0.0
   build_test: ^2.0.0
   lints: '>=1.0.0 <3.0.0'

build_runner_core/test/generate/resolution_test.dart

@@ -49,7 +49,7 @@ class ListClassesAndHierarchyBuilder implements Builder {
     for (final type in types) {
       output
         ..write('${type.name}: [')
-        ..writeAll(type.allSupertypes.map((t) => t.element.name), ', ')
+        ..writeAll(type.allSupertypes.map((t) => t.element2.name), ', ')
         ..writeln(']');
     }
     await buildStep.writeAsString(outputId, output.toString());

build_runner_core/test/package_graph/apply_builders_test.dart

@@ -22,8 +22,7 @@ void main() {
       var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
           defaultRootPackageSources: const ['**']);
       var builderApplications = [
-        apply('b:cool_builder', [(options) => CoolBuilder(options)],
-            toAllPackages())
+        apply('b:cool_builder', [CoolBuilder.new], toAllPackages())
       ];
       var phases = await createBuildPhases(
           targetGraph,
@@ -63,8 +62,7 @@ void main() {
         var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
             defaultRootPackageSources: ['**'], overrideBuildConfig: overrides);
         var builderApplications = [
-          apply('b:cool_builder', [(options) => CoolBuilder(options)],
-              toAllPackages())
+          apply('b:cool_builder', [CoolBuilder.new], toAllPackages())
         ];
         var phases = await createBuildPhases(
             targetGraph,
@@ -91,8 +89,7 @@ void main() {
       var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
           defaultRootPackageSources: ['**']);
       var builderApplications = [
-        apply('b:cool_builder', [(options) => CoolBuilder(options)],
-            toDependentsOf('b')),
+        apply('b:cool_builder', [CoolBuilder.new], toDependentsOf('b')),
       ];
       var phases =
           await createBuildPhases(targetGraph, builderApplications, {}, false);
@@ -108,8 +105,7 @@ void main() {
       var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
           defaultRootPackageSources: ['**']);
       var builderApplications = [
-        apply('b:cool_builder', [(options) => CoolBuilder(options)],
-            toDependentsOf('b'),
+        apply('b:cool_builder', [CoolBuilder.new], toDependentsOf('b'),
             appliesBuilders: ['b:not_by_default']),
         apply('b:not_by_default', [(_) => TestBuilder()], toNoneByDefault()),
       ];
@@ -131,8 +127,7 @@ void main() {
       var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
           defaultRootPackageSources: ['**']);
       var builderApplications = [
-        apply('c:cool_builder', [(options) => CoolBuilder(options)],
-            toDependentsOf('c'),
+        apply('c:cool_builder', [CoolBuilder.new], toDependentsOf('c'),
             hideOutput: false),
       ];
       var phases =
@@ -154,8 +149,7 @@ void main() {
       var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
           defaultRootPackageSources: ['**']);
       var builderApplications = [
-        apply('c:cool_builder', [(options) => CoolBuilder(options)],
-            toDependentsOf('c'),
+        apply('c:cool_builder', [CoolBuilder.new], toDependentsOf('c'),
             appliesBuilders: ['c:not_by_default']),
         apply('c:not_by_default', [(_) => TestBuilder()], toNoneByDefault(),
             hideOutput: false),
@@ -186,8 +180,7 @@ void main() {
         var targetGraph = await TargetGraph.forPackageGraph(packageGraph,
             defaultRootPackageSources: ['**'], overrideBuildConfig: overrides);
         var builderApplications = [
-          apply('b:cool_builder', [(options) => CoolBuilder(options)],
-              toAllPackages()),
+          apply('b:cool_builder', [CoolBuilder.new], toAllPackages()),
         ];
         expect(
             () =>
@@ -218,11 +211,9 @@ void main() {
             'a',
             []);
         var builderApplications = [
-          apply('b:cool_builder', [(options) => CoolBuilder(options)],
-              toDependentsOf('b'),
+          apply('b:cool_builder', [CoolBuilder.new], toDependentsOf('b'),
               appliesBuilders: ['b:cool_builder_2']),
-          apply('b:cool_builder_2', [(options) => CoolBuilder(options)],
-              toDependentsOf('b')),
+          apply('b:cool_builder_2', [CoolBuilder.new], toDependentsOf('b')),
         ];
         return await createBuildPhases(
             targetGraph, builderApplications, {}, false);

build_test/mono_pkg.yaml

@@ -1,5 +1,5 @@
 sdk:
-- 2.14.0
+- 2.17.0
 - dev
 
 stages:

build_test/pubspec.yaml

@@ -4,7 +4,7 @@ version: 2.1.6-dev
 repository: https://github.com/dart-lang/build/tree/master/build_test
 
 environment:
-  sdk: ">=2.14.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
   async: ^2.5.0
@@ -24,6 +24,6 @@ dependencies:
   watcher: ^1.0.0
 
 dev_dependencies:
-  analyzer: ">=2.1.0 <5.0.0"
+  analyzer: ^4.6.0
   collection: ^1.15.0
   lints: '>=1.0.0 <3.0.0'

build_test/test/resolve_source_test.dart

@@ -20,7 +20,7 @@ void main() {
 
         class Foo {}
       ''', (resolver) => resolver.findLibraryNotNull('example'));
-      expect(libExample.getType('Foo'), isNotNull);
+      expect(libExample.getClass('Foo'), isNotNull);
     });
 
     test('a simple dart file with dart: dependencies', () async {
@@ -31,7 +31,7 @@ void main() {
 
         abstract class Foo implements LinkedHashMap {}
       ''', (resolver) => resolver.findLibraryNotNull('example'));
-      var classFoo = libExample.getType('Foo')!;
+      var classFoo = libExample.getClass('Foo')!;
       expect(
         classFoo.allSupertypes.map(_toStringId),
         contains('dart:collection#LinkedHashMap'),
@@ -46,7 +46,7 @@ void main() {
 
         abstract class Foo implements Equality {}
       ''', (resolver) => resolver.findLibraryNotNull('example'));
-      var classFoo = libExample.getType('Foo')!;
+      var classFoo = libExample.getClass('Foo')!;
       expect(
         classFoo.allSupertypes.map(_toStringId),
         contains(endsWith(':collection#Equality')),
@@ -72,9 +72,9 @@ void main() {
         (resolver) => resolver.findLibraryNotNull('example'),
         resolverFor: mock,
       );
-      final type = library.getType('ExamplePrime');
+      final type = library.getClass('ExamplePrime');
       expect(type, isNotNull);
-      expect(type!.supertype!.element.name, 'Example');
+      expect(type!.supertype!.element2.name, 'Example');
     });
 
     test('waits for tearDown', () async {
@@ -91,7 +91,7 @@ void main() {
           true);
       var libExample = await resolver.findLibraryNotNull('example');
       resolverDone.complete();
-      var classFoo = libExample.getType('Foo')!;
+      var classFoo = libExample.getClass('Foo')!;
       expect(
         classFoo.allSupertypes.map(_toStringId),
         contains(endsWith(':collection#Equality')),
@@ -107,7 +107,7 @@ void main() {
         abstract class Foo implements Equality {}
       ''', (resolver) async {
         var libExample = await resolver.findLibraryNotNull('example');
-        var classFoo = libExample.getType('Foo')!;
+        var classFoo = libExample.getClass('Foo')!;
         expect(classFoo.allSupertypes.map(_toStringId),
             contains(endsWith(':collection#Equality')));
       });
@@ -140,7 +140,7 @@ void main() {
       var asset = AssetId('build_test', 'test/_files/example_lib.dart');
       var libExample = await resolveAsset(
           asset, (resolver) => resolver.findLibraryNotNull('example_lib'));
-      expect(libExample.getType('Example'), isNotNull);
+      expect(libExample.getClass('Example'), isNotNull);
     });
   });
 
@@ -158,7 +158,7 @@ void main() {
 }
 
 String _toStringId(InterfaceType t) =>
-    '${t.element.source.uri.toString().split('/').first}#${t.element.name}';
+    '${t.element2.source.uri.toString().split('/').first}#${t.element2.name}';
 
 extension on Resolver {
   Future<LibraryElement> findLibraryNotNull(String name) async {

build_vm_compilers/lib/src/vm_entrypoint_builder.dart

@@ -94,7 +94,7 @@ Future<bool> _isAppEntryPoint(AssetId dartId, AssetReader reader) async {
   // but has a part that does, or it exports a `main` from another library.
   return parsed.declarations.any((node) {
     return node is FunctionDeclaration &&
-        node.name.name == 'main' &&
+        node.name2.lexeme == 'main' &&
         node.functionExpression.parameters != null &&
         node.functionExpression.parameters!.parameters.length <= 2;
   });

build_vm_compilers/mono_pkg.yaml

@@ -1,4 +1,5 @@
 sdk:
+- 2.17.0
 - dev
 
 stages:

build_vm_compilers/pubspec.yaml

@@ -4,10 +4,10 @@ description: Builder implementations wrapping Dart VM compilers.
 repository: https://github.com/dart-lang/build/tree/master/build_vm_compilers
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 
 dependencies:
-  analyzer: ">=1.0.0 <5.0.0"
+  analyzer: ^4.4.0
   build: ^2.0.0
   build_config: ^1.0.0
   build_modules: ^4.0.0