Removed deprecated methods.

Author: davidmorgan

build/lib/src/analyzer/resolver.dart

@@ -29,18 +29,6 @@ abstract class Resolver {
   ///    instance because due to imports or exports.
   Stream<LibraryElement2> get libraries;
 
-  /// All libraries resolved by this resolver.
-  ///
-  /// This includes the following libraries:
-  ///  - The primary input of this resolver (in other words, the
-  ///   [BuildStep.inputId] of a build step).
-  ///  - Libraries resolved with a direct [libraryFor] call.
-  ///  - Every public `dart:` library part of the SDK.
-  ///  - All libraries recursively accessible from the mentioned sources, for
-  ///    instance because due to imports or exports.
-  @Deprecated('use libraries')
-  Stream<LibraryElement2> get libraries2;
-
   /// Returns the parsed [AstNode] for [Fragment].
   ///
   /// This should always be preferred over using the [AnalysisSession]
@@ -54,20 +42,6 @@ abstract class Resolver {
   /// reason.
   Future<AstNode?> astNodeFor(Fragment fragment, {bool resolve = false});
 
-  /// Returns the parsed [AstNode] for [Fragment].
-  ///
-  /// This should always be preferred over using the [AnalysisSession]
-  /// directly, because it avoids [InconsistentAnalysisException] issues.
-  ///
-  /// If [resolve] is `true` then you will get a resolved ast node, otherwise
-  /// it will only be a parsed ast node.
-  ///
-  /// Returns `null` if the ast node can not be found. This can happen if an
-  /// element is coming from a summary, or is unavailable for some other
-  /// reason.
-  @Deprecated('use astNodeFor')
-  Future<AstNode?> astNodeFor2(Fragment element, {bool resolve = false});
-
   /// Returns a parsed AST structor representing the file defined in [assetId].
   ///
   /// * If the [assetId] has syntax errors, and [allowSyntaxErrors] is set to
@@ -90,17 +64,6 @@ abstract class Resolver {
     bool allowSyntaxErrors = false,
   });
 
-  /// Returns a resolved library representing the file defined in [assetId].
-  ///
-  /// * Throws [NonLibraryAssetException] if [assetId] is not a Dart library.
-  /// * If the [assetId] has syntax errors, and [allowSyntaxErrors] is set to
-  ///   `false` (the default), throws a [SyntaxErrorInAssetException].
-  @Deprecated('use libraryFor')
-  Future<LibraryElement2> libraryFor2(
-    AssetId assetId, {
-    bool allowSyntaxErrors = false,
-  });
-
   /// Returns the first resolved library identified by [libraryName].
   ///
   /// A library is resolved if it's recursively accessible from the entry point
@@ -113,19 +76,6 @@ abstract class Resolver {
   /// being unique.
   Future<LibraryElement2?> findLibraryByName(String libraryName);
 
-  /// Returns the first resolved library identified by [libraryName].
-  ///
-  /// A library is resolved if it's recursively accessible from the entry point
-  /// or subsequent calls to [libraryFor]. In other words, this searches for
-  /// libraries in [libraries].
-  /// If no library can be found, returns `null`.
-  ///
-  /// **NOTE**: In general, its recommended to use [libraryFor] with an absolute
-  /// asset id instead of a named identifier that has the possibility of not
-  /// being unique.
-  @Deprecated('use findLibraryByName')
-  Future<LibraryElement2?> findLibraryByName2(String libraryName);
-
   /// Returns the [AssetId] of the Dart library or part declaring [element].
   ///
   /// If [element] is defined in the SDK or in a summary throws
@@ -135,17 +85,6 @@ abstract class Resolver {
   /// The returned asset is not necessarily the asset that should be imported to
   /// use the element, it may be a part file instead of the library.
   Future<AssetId> assetIdForElement(Element2 element);
-
-  /// Returns the [AssetId] of the Dart library or part declaring [element].
-  ///
-  /// If [element] is defined in the SDK or in a summary throws
-  /// `UnresolvableAssetException`, although a non-throwing return here does not
-  /// guarantee that the asset is readable.
-  ///
-  /// The returned asset is not necessarily the asset that should be imported to
-  /// use the element, it may be a part file instead of the library.
-  @Deprecated('use assetIdForElement')
-  Future<AssetId> assetIdForElement2(Element2 element);
 }
 
 /// A resolver that should be manually released at the end of a build step.

build/lib/src/builder/build_step.dart

@@ -39,22 +39,6 @@ abstract class BuildStep implements AssetReader, AssetWriter {
   /// ```
   Future<LibraryElement2> get inputLibrary;
 
-  /// Resolved library defined by [inputId].
-  ///
-  /// Throws [NonLibraryAssetException] if [inputId] is not a Dart library file.
-  /// Throws [SyntaxErrorInAssetException] if [inputId] contains syntax errors.
-  /// If you want to support libraries with syntax errors, resolve the library
-  /// manually instead of using [inputLibrary]:
-  /// ```dart
-  /// Future<void> build(BuildStep step) async {
-  ///   // Resolve the input library, allowing syntax errors
-  ///   final inputLibrary =
-  ///     await step.resolver.libraryFor(step.inputId, allowSyntaxErrors: true);
-  /// }
-  /// ```
-  @Deprecated('use inputLibrary')
-  Future<LibraryElement2> get inputLibrary2;
-
   /// Gets an instance provided by [resource] which is guaranteed to be unique
   /// within a single build, and may be reused across build steps within a
   /// build if the implementation allows.

build/lib/src/builder/build_step_impl.dart

@@ -39,10 +39,6 @@ class BuildStepImpl implements BuildStep {
     return resolver.libraryFor(inputId);
   }
 
-  @Deprecated('use inputLibrary')
-  @override
-  Future<LibraryElement2> get inputLibrary2 => inputLibrary;
-
   /// The list of all outputs which are expected/allowed to be output from this
   /// step.
   @override
@@ -236,22 +232,13 @@ class _DelayedResolver implements Resolver {
     return completer.stream;
   }
 
-  @Deprecated('use libraries')
-  @override
-  Stream<LibraryElement2> get libraries2 => libraries;
-
   @override
   Future<AstNode?> astNodeFor(
     Fragment fragment, {
     bool resolve = false,
   }) async =>
       (await _delegate).astNodeFor(fragment, resolve: resolve);
 
-  @Deprecated('use astNodeFor')
-  @override
-  Future<AstNode?> astNodeFor2(Fragment fragment, {bool resolve = false}) =>
-      astNodeFor(fragment, resolve: resolve);
-
   @override
   Future<CompilationUnit> compilationUnitFor(
     AssetId assetId, {
@@ -272,29 +259,11 @@ class _DelayedResolver implements Resolver {
         allowSyntaxErrors: allowSyntaxErrors,
       );
 
-  @Deprecated('use libraryFor')
-  @override
-  Future<LibraryElement2> libraryFor2(
-    AssetId assetId, {
-    bool allowSyntaxErrors = false,
-  }) async =>
-      libraryFor(assetId, allowSyntaxErrors: allowSyntaxErrors);
-
   @override
   Future<LibraryElement2?> findLibraryByName(String libraryName) async =>
       (await _delegate).findLibraryByName(libraryName);
 
-  @Deprecated('use findLibraryByName')
-  @override
-  Future<LibraryElement2?> findLibraryByName2(String libraryName) async =>
-      findLibraryByName(libraryName);
-
   @override
   Future<AssetId> assetIdForElement(Element2 element) async =>
       (await _delegate).assetIdForElement(element);
-
-  @Deprecated('use assetIdForElement')
-  @override
-  Future<AssetId> assetIdForElement2(Element2 element) async =>
-      assetIdForElement(element);
 }

build_resolvers/lib/src/resolver.dart

@@ -87,14 +87,10 @@ class PerActionResolver implements ReleasableResolver {
 
   @override
   Stream<LibraryElement2> get libraries async* {
-    yield* _delegate.sdkLibraries2;
+    yield* _delegate.sdkLibraries;
     yield* _librariesFromEntrypoints.where((library) => !library.isInSdk);
   }
 
-  @Deprecated('use libraries instead')
-  @override
-  Stream<LibraryElement2> get libraries2 => libraries;
-
   @override
   Future<LibraryElement2?> findLibraryByName(String libraryName) async {
     return _step.trackStage('findLibraryByName $libraryName', () async {
@@ -105,11 +101,6 @@ class PerActionResolver implements ReleasableResolver {
     });
   }
 
-  @Deprecated('use findLibraryByName instead')
-  @override
-  Future<LibraryElement2?> findLibraryByName2(String libraryName) =>
-      findLibraryByName(libraryName);
-
   @override
   Future<bool> isLibrary(AssetId assetId) =>
       _step.trackStage('isLibrary $assetId', () async {
@@ -125,11 +116,6 @@ class PerActionResolver implements ReleasableResolver {
         () => _delegate.astNodeFor(fragment, resolve: resolve),
       );
 
-  @Deprecated('use astNodeFor instead')
-  @override
-  Future<AstNode?> astNodeFor2(Fragment fragment, {bool resolve = false}) =>
-      astNodeFor(fragment, resolve: resolve);
-
   @override
   Future<CompilationUnit> compilationUnitFor(
     AssetId assetId, {
@@ -163,14 +149,6 @@ class PerActionResolver implements ReleasableResolver {
     });
   }
 
-  @Deprecated('use libraryFor instead')
-  @override
-  Future<LibraryElement2> libraryFor2(
-    AssetId assetId, {
-    bool allowSyntaxErrors = false,
-  }) =>
-      libraryFor(assetId, allowSyntaxErrors: allowSyntaxErrors);
-
   // Ensures we only resolve one entrypoint at a time from the same build step,
   // otherwise there are race conditions with `_entryPoints` being updated
   // before it is actually ready, or resolving entrypoints more than once.
@@ -218,11 +196,6 @@ class PerActionResolver implements ReleasableResolver {
   @override
   Future<AssetId> assetIdForElement(Element2 element) =>
       _delegate.assetIdForElement(element);
-
-  @Deprecated('use assetIdForElement instead')
-  @override
-  Future<AssetId> assetIdForElement2(Element2 element) =>
-      assetIdForElement(element);
 }
 
 class AnalyzerResolver implements ReleasableResolver {
@@ -283,11 +256,6 @@ class AnalyzerResolver implements ReleasableResolver {
     });
   }
 
-  @Deprecated('use astNodeFor instead')
-  @override
-  Future<AstNode?> astNodeFor2(Fragment fragment, {bool resolve = false}) =>
-      astNodeFor(fragment, resolve: resolve);
-
   @override
   Future<CompilationUnit> compilationUnitFor(
     AssetId assetId, {
@@ -344,14 +312,6 @@ class AnalyzerResolver implements ReleasableResolver {
     return library.element2;
   }
 
-  @Deprecated('use libraryFor instead')
-  @override
-  Future<LibraryElement2> libraryFor2(
-    AssetId assetId, {
-    bool allowSyntaxErrors = false,
-  }) =>
-      libraryFor(assetId, allowSyntaxErrors: allowSyntaxErrors);
-
   /// Finds syntax errors in files related to the [element].
   ///
   /// This includes the main library and existing part files.
@@ -398,10 +358,6 @@ class AnalyzerResolver implements ReleasableResolver {
     throw UnimplementedError();
   }
 
-  @Deprecated('use libraries instead')
-  @override
-  Stream<LibraryElement2> get libraries2 => libraries;
-
   Stream<LibraryElement2> get sdkLibraries {
     final loadLibraries = _sdkLibraries ??= Future.sync(() {
       final publicSdkUris = _driver.sdkLibraryUris.where(
@@ -422,24 +378,13 @@ class AnalyzerResolver implements ReleasableResolver {
     return Stream.fromFuture(loadLibraries).expand((libraries) => libraries);
   }
 
-  @Deprecated('use sdkLibraries instead')
-  Stream<LibraryElement2> get sdkLibraries2 => sdkLibraries;
-
   @override
   Future<LibraryElement2?> findLibraryByName(String libraryName) async {
     // We don't know what libraries to expose without leaking libraries written
     // by later phases.
     throw UnimplementedError();
   }
 
-  @Deprecated('use findLibraryByName instead')
-  @override
-  Future<LibraryElement2?> findLibraryByName2(String libraryName) async {
-    // We don't know what libraries to expose without leaking libraries written
-    // by later phases.
-    throw UnimplementedError();
-  }
-
   @override
   Future<AssetId> assetIdForElement(Element2 element) async {
     if (element is MultiplyDefinedElement2) {
@@ -459,11 +404,6 @@ class AnalyzerResolver implements ReleasableResolver {
     }
     return AssetId.resolve(source.uri);
   }
-
-  @Deprecated('use assetIdForElement instead')
-  @override
-  Future<AssetId> assetIdForElement2(Element2 element) =>
-      assetIdForElement(element);
 }
 
 class AnalyzerResolvers implements Resolvers {