Revert "Use aliasElement name, it is not "aliased"."

This reverts commit 492dd56.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,11 @@
-## 5.4.7-wip
+## 5.5.0
 
+* Switch to `build` 3.0.0.
+* Require Dart SDK ^3.7.0.
+
+## 5.5.0-dev
+
+* Switch to `build` 3.0.0-dev.
 * Require Dart SDK ^3.7.0.
 
 ## 5.4.6

lib/src/builder.dart

@@ -937,8 +937,8 @@ class _MockTargetGatherer {
     final className = interfaceElement.name3;
     final substitution = Substitution.fromInterfaceType(mockTarget.classType);
     final relevantMembers = _inheritanceManager
-        .getInterface(interfaceElement)
-        .map
+        .getInterface2(interfaceElement)
+        .map2
         .values
         .where((m) => !m.isPrivate && !m.isStatic)
         .map((member) => ExecutableMember.from(member, substitution));
@@ -1247,15 +1247,16 @@ class _MockClassInfo {
   });
 
   Class _buildMockClass() {
-    final instantiatedAlias = mockTarget.classType.alias;
-    final aliasElement = instantiatedAlias?.element;
-    final aliasedType = aliasElement?.aliasedType as analyzer.InterfaceType?;
+    final typeAlias = mockTarget.classType.alias;
+    final aliasedElement = typeAlias?.element2;
+    final aliasedType =
+        typeAlias?.element2.aliasedType as analyzer.InterfaceType?;
     final typeToMock = aliasedType ?? mockTarget.classType;
     final classToMock = mockTarget.interfaceElement;
     final classIsImmutable = classToMock.metadata2.annotations.any(
       (it) => it.isImmutable,
     );
-    final className = aliasElement?.name3 ?? classToMock.name3;
+    final className = aliasedElement?.name3 ?? classToMock.name3;
 
     return Class((cBuilder) {
       cBuilder
@@ -1277,9 +1278,9 @@ class _MockClassInfo {
       // the "implements" clause.
 
       final typeParameters =
-          aliasElement?.typeParameters2 ?? classToMock.typeParameters2;
+          aliasedElement?.typeParameters2 ?? classToMock.typeParameters2;
       final typeArguments =
-          instantiatedAlias?.typeArguments ?? typeToMock.typeArguments;
+          typeAlias?.typeArguments ?? typeToMock.typeArguments;
 
       _withTypeParameters(
         mockTarget.hasExplicitTypeArguments ? [] : typeParameters,
@@ -1299,7 +1300,7 @@ class _MockClassInfo {
             TypeReference((b) {
               b
                 ..symbol = className
-                ..url = _typeImport(aliasElement ?? classToMock)
+                ..url = _typeImport(aliasedElement ?? classToMock)
                 ..types.addAll(
                   mockTarget.hasExplicitTypeArguments
                       ? typeArguments.map(_typeReference)
@@ -1312,12 +1313,15 @@ class _MockClassInfo {
           }
 
           final substitution = Substitution.fromPairs2(
-            [...classToMock.typeParameters2, ...?aliasElement?.typeParameters2],
-            [...typeToMock.typeArguments, ...?instantiatedAlias?.typeArguments],
+            [
+              ...classToMock.typeParameters2,
+              ...?aliasedElement?.typeParameters2,
+            ],
+            [...typeToMock.typeArguments, ...?typeAlias?.typeArguments],
           );
           final members = inheritanceManager
-              .getInterface(classToMock)
-              .map
+              .getInterface2(classToMock)
+              .map2
               .values
               .map((member) => ExecutableMember.from(member, substitution));
 

pubspec.yaml

@@ -1,5 +1,5 @@
 name: mockito
-version: 5.4.6
+version: 5.5.0
 description: >-
   A mock framework inspired by Mockito with APIs for Fakes, Mocks,
   behavior verification, and stubbing.
@@ -13,22 +13,23 @@ environment:
   sdk: ^3.7.0
 
 dependencies:
-  analyzer: '>=6.9.0 <8.0.0'
-  build: ^2.4.1
+  analyzer: '>=7.5.5 <8.0.0'
+  build: ^3.0.0
   code_builder: ^4.5.0
   collection: ^1.19.0
   dart_style: '>=2.3.7 <4.0.0'
   matcher: ^0.12.16
   meta: ^1.15.0
   path: ^1.9.0
-  source_gen: ">=1.4.0 <3.0.0"
+  source_gen: ^3.0.0
   test_api: ">=0.6.1 <0.8.0"
 
 dev_dependencies:
-  build_runner: ^2.4.11
-  build_test: ^2.1.7
-  build_web_compilers: ^4.0.11
+  build_runner: ^2.5.0
+  build_test: ^3.3.0
+  build_web_compilers: ^4.2.0
   http: ^1.0.0
   lints: ^5.1.0
+  logging: ^1.0.0
   package_config: ^2.1.1
   test: ^1.24.4