fix analyzer deprecations (#3376)

Fixes the build by removing usages of deprecated analyzer apis
dart-lang · Oct 4, 2022 · 9648eff · 9648eff
1 parent 7409980
commit 9648eff
Show file tree

Hide file tree

Showing 17 changed files with 583 additions and 250 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/build/pubspec.yaml b/build/pubspec.yaml
@@ -4,7 +4,7 @@ description: A package for authoring build_runner compatible code generators.
 repository: https://github.com/dart-lang/build/tree/master/build
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <3.0.0"
 
 dependencies:
   analyzer: ">=1.5.0 <6.0.0"

diff --git a/build_modules/CHANGELOG.md b/build_modules/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 4.0.7-dev
+
+- Migrate off deprecated analyzer apis.
+- Update min sdk constraint to 2.18.0.
+
 ## 4.0.6
 
 - Allow the latest `package:analyzer`.

diff --git a/build_modules/lib/src/module_library.dart b/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.name2.lexeme == 'main' &&
+    node.name.lexeme == 'main' &&
     node.functionExpression.parameters != null &&
     node.functionExpression.parameters!.parameters.length <= 2);
diff --git a/build_modules/mono_pkg.yaml b/build_modules/mono_pkg.yaml
@@ -1,5 +1,6 @@
 sdk:
 - dev
+- pubspec
 
 stages:
 - analyze_and_format:

diff --git a/build_modules/pubspec.yaml b/build_modules/pubspec.yaml
@@ -1,13 +1,13 @@
 name: build_modules
-version: 4.0.6
+version: 4.0.7-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"
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=4.4.0 <6.0.0'
+  analyzer: '>=5.1.0 <6.0.0'
   async: ^2.5.0
   bazel_worker: ^1.0.0
   build: ^2.0.0

diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.0.11-dev
+
+- Migrate off deprecated analyzer apis.
+- Update min sdk constraint to 2.18.0.
+
 ## 2.0.10
 
 - Migrate from `LibraryElement#parts` to `LibraryElement#parts2`.

diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
@@ -1,17 +1,17 @@
 name: build_resolvers
-version: 2.0.10
+version: 2.0.11-dev
 description: Resolve Dart code in a Builder
 repository: https://github.com/dart-lang/build/tree/master/build_resolvers
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=4.6.0 <6.0.0'
+  analyzer: '>=5.1.0 <6.0.0'
   async: ^2.5.0
   build: ^2.0.0
   crypto: ^3.0.0
-  graphs: ">=1.0.0 <3.0.0"
+  graphs: '>=1.0.0 <3.0.0'
   logging: ^1.0.0
   path: ^1.8.0
   package_config: ^2.0.0

diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart
@@ -733,7 +733,7 @@ int? get x => 1;
         expect(
             unit.declarations.first,
             isA<FunctionDeclaration>()
-                .having((d) => d.name2.lexeme, 'main', 'main'));
+                .having((d) => d.name.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).declaredElement2, isNull);
+        expect((unit as FunctionDeclaration).declaredElement, isNull);
       }, resolvers: AnalyzerResolvers());
     });
 
@@ -762,8 +762,7 @@ int? get x => 1;
           unit,
           isA<FunctionDeclaration>()
               .having((fd) => fd.toSource(), 'toSource()', 'main() {}')
-              .having(
-                  (fd) => fd.declaredElement2, 'declaredElement', isNotNull),
+              .having((fd) => fd.declaredElement, 'declaredElement', isNotNull),
         );
       }, resolvers: AnalyzerResolvers());
     });

diff --git a/build_test/pubspec.yaml b/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.17.0 <3.0.0"
+  sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
   async: ^2.5.0
@@ -20,7 +20,7 @@ dependencies:
   path: ^1.8.0
   stream_transform: ^2.0.0
   test: ^1.16.0
-  test_core: ">=0.3.19 <0.5.0"
+  test_core: '>=0.3.19 <0.5.0'
   watcher: ^1.0.0
 
 dev_dependencies:

diff --git a/build_vm_compilers/CHANGELOG.md b/build_vm_compilers/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.0.13-dev
+
+- Migrate off deprecated analyzer apis.
+- Update min sdk constraint to 2.18.0.
+
 ## 1.0.12
 
 - Allow the latest `package:analyzer`.

diff --git a/build_vm_compilers/lib/src/vm_entrypoint_builder.dart b/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.name2.lexeme == 'main' &&
+        node.name.lexeme == 'main' &&
         node.functionExpression.parameters != null &&
         node.functionExpression.parameters!.parameters.length <= 2;
   });

diff --git a/build_vm_compilers/pubspec.yaml b/build_vm_compilers/pubspec.yaml
@@ -1,13 +1,13 @@
 name: build_vm_compilers
-version: 1.0.12
+version: 1.0.13-dev
 description: Builder implementations wrapping Dart VM compilers.
 repository: https://github.com/dart-lang/build/tree/master/build_vm_compilers
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=4.4.0 <6.0.0'
+  analyzer: '>=5.1.0 <6.0.0'
   build: ^2.0.0
   build_config: ^1.0.0
   build_modules: ^4.0.0

diff --git a/build_web_compilers/CHANGELOG.md b/build_web_compilers/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 3.2.7-dev
+
+- Migrate off deprecated analyzer apis.
+- Update min sdk constraint to 2.18.0.
+
 ## 3.2.6
 
 - Allow the latest `package:analyzer`.

diff --git a/build_web_compilers/lib/src/web_entrypoint_builder.dart b/build_web_compilers/lib/src/web_entrypoint_builder.dart
@@ -181,7 +181,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.name2.lexeme == 'main' &&
+        node.name.lexeme == 'main' &&
         node.functionExpression.parameters != null &&
         node.functionExpression.parameters!.parameters.length <= 2;
   });

diff --git a/build_web_compilers/mono_pkg.yaml b/build_web_compilers/mono_pkg.yaml
@@ -1,5 +1,6 @@
 sdk:
 - dev
+- pubspec
 
 stages:
 - analyze_and_format:

diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml
@@ -1,13 +1,13 @@
 name: build_web_compilers
-version: 3.2.6
+version: 3.2.7-dev
 description: Builder implementations wrapping Dart compilers.
 repository: https://github.com/dart-lang/build/tree/master/build_web_compilers
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: '>=2.18.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=4.4.0 <6.0.0'
+  analyzer: '>=5.1.0 <6.0.0'
   archive: ^3.0.0
   bazel_worker: ^1.0.0
   build: ^2.0.0