From ca8915dc03cf490ecf06bcce151cafbcc428f19d Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Thu, 19 Aug 2021 08:13:01 -0700 Subject: [PATCH 1/2] update usages of deprecated analyzer apis --- build_resolvers/CHANGELOG.md | 5 +++++ build_resolvers/lib/src/resolver.dart | 4 ++-- build_resolvers/pubspec.yaml | 4 ++-- build_resolvers/test/resolver_test.dart | 12 ++++++------ build_test/CHANGELOG.md | 2 ++ build_test/pubspec.yaml | 2 +- build_test/test/resolve_source_test.dart | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/build_resolvers/CHANGELOG.md b/build_resolvers/CHANGELOG.md index 48b238d5d2..0c88734df9 100644 --- a/build_resolvers/CHANGELOG.md +++ b/build_resolvers/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.0.5-dev + +- Update usages of deprecated analyzer apis. +- Require at least analyzer `2.1.0`. + ## 2.0.4 - Allow analyzer version 2.x.x. diff --git a/build_resolvers/lib/src/resolver.dart b/build_resolvers/lib/src/resolver.dart index 3139c568bb..02f13dc5e5 100644 --- a/build_resolvers/lib/src/resolver.dart +++ b/build_resolvers/lib/src/resolver.dart @@ -170,11 +170,11 @@ class AnalyzerResolver implements ReleasableResolver { var path = library.source.fullName; if (resolve) { - return (await session.getResolvedLibrary2(path) as ResolvedLibraryResult) + return (await session.getResolvedLibrary(path) as ResolvedLibraryResult) .getElementDeclaration(element) ?.node; } else { - return (session.getParsedLibrary2(path) as ParsedLibraryResult) + return (session.getParsedLibrary(path) as ParsedLibraryResult) .getElementDeclaration(element) ?.node; } diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml index b45305d269..dc8f7fd551 100644 --- a/build_resolvers/pubspec.yaml +++ b/build_resolvers/pubspec.yaml @@ -1,5 +1,5 @@ name: build_resolvers -version: 2.0.4 +version: 2.0.5-dev description: Resolve Dart code in a Builder repository: https://github.com/dart-lang/build/tree/master/build_resolvers @@ -7,7 +7,7 @@ environment: sdk: ">=2.12.0 <3.0.0" dependencies: - analyzer: ">=1.5.0 <3.0.0" + analyzer: ^2.1.0 async: ^2.5.0 build: ^2.0.0 crypto: ^3.0.0 diff --git a/build_resolvers/test/resolver_test.dart b/build_resolvers/test/resolver_test.dart index fa73cf80e4..69abdc1488 100644 --- a/build_resolvers/test/resolver_test.dart +++ b/build_resolvers/test/resolver_test.dart @@ -434,7 +434,7 @@ int? get x => 1; sdkLanguageVersion.major); expect(lib.languageVersion.effective.minor, sdkLanguageVersion.minor); - var errors = await lib.session.getErrors2('/a/web/main.dart') + var errors = await lib.session.getErrors('/a/web/main.dart') as ErrorsResult; expect(errors.errors, isEmpty); }, resolvers: AnalyzerResolvers()), @@ -452,7 +452,7 @@ int? get x => 1; expect(await resolver.isLibrary(AssetId('a', 'web/other.dart')), true); var newLib = await resolver.libraryFor(await resolver.assetIdForElement(lib)); - expect(await newLib.session.getResolvedLibraryByElement2(newLib), + expect(await newLib.session.getResolvedLibraryByElement(newLib), isA()); }, resolvers: resolvers); }); @@ -751,7 +751,7 @@ int? get x => 1; expect(await resolver.isLibrary(AssetId('a', 'web/other.dart')), true); // Validate that direct session usage would throw - expect(() => lib.session.getParsedLibraryByElement2(x.library!), + expect(() => lib.session.getParsedLibraryByElement(x.library!), throwsA(isA())); var astNode = await resolver.astNodeFor(x); @@ -775,7 +775,7 @@ int? get x => 1; expect(await resolver.isLibrary(AssetId('a', 'web/other.dart')), true); // Validate that direct session usage would throw - expect(() => lib.session.getParsedLibraryByElement2(x.library!), + expect(() => lib.session.getParsedLibraryByElement(x.library!), throwsA(isA())); var astNode = await resolver.astNodeFor(x, resolve: true); @@ -796,11 +796,11 @@ int? get x => 1; var x = lib.topLevelElements.firstWhere((x) => !x.isSynthetic); expect(x.name, 'x'); var originalResult = await lib.session - .getResolvedLibrary2(lib.source.fullName) as ResolvedLibraryResult; + .getResolvedLibrary(lib.source.fullName) as ResolvedLibraryResult; expect(await resolver.isLibrary(AssetId('a', 'web/other.dart')), true); // Validate that direct session usage would throw - expect(() => lib.session.getResolvedLibrary2(lib.source.fullName), + expect(() => lib.session.getResolvedLibrary(lib.source.fullName), throwsA(isA())); var astNode = originalResult.getElementDeclaration(x)!.node; diff --git a/build_test/CHANGELOG.md b/build_test/CHANGELOG.md index 1bf471bc6d..4a572f8ed6 100644 --- a/build_test/CHANGELOG.md +++ b/build_test/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.1.4-dev + ## 2.1.3 - Use `allowedOutputs` in `TestBuilder` instead of computing them again. diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index 16fa4ea63a..3c86d271f6 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -1,6 +1,6 @@ name: build_test description: Utilities for writing unit tests of Builders. -version: 2.1.3 +version: 2.1.4-dev repository: https://github.com/dart-lang/build/tree/master/build_test environment: diff --git a/build_test/test/resolve_source_test.dart b/build_test/test/resolve_source_test.dart index 87388c068d..e643028747 100644 --- a/build_test/test/resolve_source_test.dart +++ b/build_test/test/resolve_source_test.dart @@ -126,7 +126,7 @@ void main() { ''', (resolver) => resolver.findLibraryNotNull('example'), packageConfig: packageConfig, inputId: AssetId('a', 'invalid.dart')); var errors = await libExample.session - .getErrors2(libExample.source.fullName) as ErrorsResult; + .getErrors(libExample.source.fullName) as ErrorsResult; expect( errors.errors.map((e) => e.message), contains(contains( From 680360309e6fc8b5b25d5cab93287f88c365b37e Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Thu, 19 Aug 2021 08:14:08 -0700 Subject: [PATCH 2/2] also update analyzer constraint in build_test --- build_test/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_test/pubspec.yaml b/build_test/pubspec.yaml index 3c86d271f6..0926873e3f 100644 --- a/build_test/pubspec.yaml +++ b/build_test/pubspec.yaml @@ -25,5 +25,5 @@ dependencies: watcher: ^1.0.0 dev_dependencies: - analyzer: ">=1.5.0 <3.0.0" + analyzer: ^2.1.0 collection: ^1.15.0