Fixes for build_test 3.0.0. (kevmoo#86)

* Bump SDK version.
* Prepare for release as 1.2.0.

Author: davidmorgan

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
       matrix:
         # Add macos-latest and/or windows-latest if relevant for this package.
         os: [ubuntu-latest]
-        sdk: [3.4, dev]
+        sdk: [3.7, dev]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c

CHANGELOG.md

@@ -1,5 +1,8 @@
-## 1.1.2-wip
+## 1.2.0
 
+- Require `build: ^2.5.0`.
+- Require `build_test: ^3.2.0`.
+- Require `sdk: ^3.7.0`
 - Fixed some doc comment references.
 
 ## 1.1.1

example/example_generator.dart

@@ -7,9 +7,7 @@ import 'src/example_annotation.dart';
 class ExampleGenerator extends GeneratorForAnnotation<ExampleAnnotation> {
   final bool requireTestClassPrefix;
 
-  const ExampleGenerator({
-    this.requireTestClassPrefix = true,
-  });
+  const ExampleGenerator({this.requireTestClassPrefix = true});
 
   @override
   Iterable<String> generateForAnnotatedElement(

lib/src/annotations.dart

@@ -9,7 +9,7 @@ abstract class TestExpectation {
   final List<String> expectedLogItems;
 
   const TestExpectation._(this.configurations, List<String>? expectedLogItems)
-      : expectedLogItems = expectedLogItems ?? const [];
+    : expectedLogItems = expectedLogItems ?? const [];
 
   TestExpectation replaceConfiguration(Iterable<String> newConfiguration);
 }
@@ -74,11 +74,11 @@ class ShouldGenerateFile extends TestExpectation {
     this.partOfCurrent = false,
     Iterable<String>? configurations,
     List<String>? expectedLogItems,
-  })  : assert(
-          partOf == null || !partOfCurrent,
-          'Cannot have both partOf and partOfCurrent',
-        ),
-        super._(configurations, expectedLogItems);
+  }) : assert(
+         partOf == null || !partOfCurrent,
+         'Cannot have both partOf and partOfCurrent',
+       ),
+       super._(configurations, expectedLogItems);
 
   @override
   TestExpectation replaceConfiguration(Iterable<String> newConfiguration) =>
@@ -118,8 +118,8 @@ class ShouldThrow extends TestExpectation {
     Object? element = true,
     Iterable<String>? configurations,
     List<String>? expectedLogItems,
-  })  : element = element ?? true,
-        super._(configurations, expectedLogItems);
+  }) : element = element ?? true,
+       super._(configurations, expectedLogItems);
 
   @override
   TestExpectation replaceConfiguration(Iterable<String> newConfiguration) =>

lib/src/expectation_element.dart

@@ -10,9 +10,8 @@ List<ExpectationElement> genAnnotatedElements(
   Set<String> configDefaults,
 ) {
   final allElements = libraryReader.allElements
-      .where((element) => element.name != null)
-      .toList(growable: false)
-    ..sort((a, b) => a.name!.compareTo(b.name!));
+    .where((element) => element.name != null)
+    .toList(growable: false)..sort((a, b) => a.name!.compareTo(b.name!));
 
   return allElements.expand((element) {
     final initialValues = _expectationElements(element).toList();
@@ -21,9 +20,10 @@ List<ExpectationElement> genAnnotatedElements(
 
     final duplicateConfigs = <String>{};
 
-    for (var configs in initialValues
-        .map((e) => e.configurations)
-        .whereType<Iterable<String>>()) {
+    for (var configs
+        in initialValues
+            .map((e) => e.configurations)
+            .whereType<Iterable<String>>()) {
       if (configs.isEmpty) {
         throw InvalidGenerationSourceError(
           '`configuration` cannot be empty.',
@@ -123,11 +123,12 @@ ShouldThrow _shouldThrow(DartObject obj) {
   );
 }
 
-List<String> _expectedLogItems(ConstantReader reader) => reader
-    .read('expectedLogItems')
-    .listValue
-    .map((obj) => obj.toStringValue()!)
-    .toList();
+List<String> _expectedLogItems(ConstantReader reader) =>
+    reader
+        .read('expectedLogItems')
+        .listValue
+        .map((obj) => obj.toStringValue()!)
+        .toList();
 
 Set<String>? _configurations(ConstantReader reader) {
   final field = reader.read('configurations');

lib/src/generate_for_element.dart

@@ -47,19 +47,20 @@ Future<String> generateForElement<T>(
   var annotation = generator.typeChecker.firstAnnotationOf(element);
 
   if (annotation == null) {
-    final annotationFromTestLib = element.metadata
-        .map((ea) => ea.computeConstantValue()!)
-        .where((obj) {
-          if (obj.type is InterfaceType) {
-            final uri = (obj.type as InterfaceType).element.source.uri;
-            return uri.isScheme('package') &&
-                uri.pathSegments.first == testPackageName;
-          }
-
-          return false;
-        })
-        .where((obj) => obj.type!.element!.name == T.toString())
-        .toList();
+    final annotationFromTestLib =
+        element.metadata
+            .map((ea) => ea.computeConstantValue()!)
+            .where((obj) {
+              if (obj.type is InterfaceType) {
+                final uri = (obj.type as InterfaceType).element.source.uri;
+                return uri.isScheme('package') &&
+                    uri.pathSegments.first == testPackageName;
+              }
+
+              return false;
+            })
+            .where((obj) => obj.type!.element!.name == T.toString())
+            .toList();
 
     String msg;
     if (annotationFromTestLib.length == 1) {
@@ -99,7 +100,6 @@ Future<String> generateForElement<T>(
   return formatter.format(generated);
 }
 
-// ignore: subtype_of_sealed_class
 class _MockBuildStep extends BuildStep {
   @override
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);

lib/src/init_library_reader.dart

@@ -16,10 +16,9 @@ Future<PathAwareLibraryReader> initializeLibraryReaderForDirectory(
   String targetLibraryFileName,
 ) async {
   final map = Map.fromEntries(
-    Directory(sourceDirectory)
-        .listSync()
-        .whereType<File>()
-        .map((f) => MapEntry(p.basename(f.path), f.readAsStringSync())),
+    Directory(sourceDirectory).listSync().whereType<File>().map(
+      (f) => MapEntry(p.basename(f.path), f.readAsStringSync()),
+    ),
   );
 
   try {
@@ -64,8 +63,9 @@ Future<LibraryReader> initializeLibraryReader(
 
   final targetLibraryAssetId = assetIdForFile(targetLibraryFileName);
 
-  final assetMap = contentMap
-      .map((file, content) => MapEntry(assetIdForFile(file), content));
+  final assetMap = contentMap.map(
+    (file, content) => MapEntry(assetIdForFile(file), content),
+  );
 
   final library = await resolveSources(
     assetMap,
@@ -74,6 +74,7 @@ Future<LibraryReader> initializeLibraryReader(
       return item.libraryFor(assetId);
     },
     resolverFor: targetLibraryAssetId,
+    readAllSourcesFromFilesystem: true,
   );
 
   return LibraryReader(library);

lib/src/matchers.dart

@@ -10,8 +10,11 @@ Matcher throwsInvalidGenerationSourceError(
   Object? todoMatcher,
   Object? elementMatcher,
 }) {
-  var matcher = const TypeMatcher<InvalidGenerationSource>()
-      .having((e) => e.message, 'message', messageMatcher);
+  var matcher = const TypeMatcher<InvalidGenerationSource>().having(
+    (e) => e.message,
+    'message',
+    messageMatcher,
+  );
 
   if (elementMatcher != null) {
     matcher = matcher.having((e) => e.element, 'element', elementMatcher);

lib/src/test_annotated_classes.dart

@@ -104,13 +104,16 @@ List<AnnotatedTest<T>> getAnnotatedClasses<T>(
     defaultConfigSet = generators.keys.toSet();
   }
 
-  final annotatedElements =
-      genAnnotatedElements(libraryReader, defaultConfigSet);
+  final annotatedElements = genAnnotatedElements(
+    libraryReader,
+    defaultConfigSet,
+  );
 
   final unusedConfigurations = generators.keys.toSet();
   for (var annotatedElement in annotatedElements) {
-    unusedConfigurations
-        .removeAll(annotatedElement.expectation.configurations!);
+    unusedConfigurations.removeAll(
+      annotatedElement.expectation.configurations!,
+    );
   }
   if (unusedConfigurations.isNotEmpty) {
     if (unusedConfigurations.contains(_defaultConfigurationName)) {
@@ -184,14 +187,18 @@ List<AnnotatedTest<T>> getAnnotatedClasses<T>(
   }
 
   if (mapMissingConfigs.isNotEmpty) {
-    final elements = mapMissingConfigs.entries.toList()
-      ..sort((a, b) => a.key.compareTo(b.key));
-
-    final message = elements.map((e) {
-      final sortedConfigs =
-          (e.value.toList()..sort()).map((v) => '"$v"').join(', ');
-      return '`${e.key}`: $sortedConfigs';
-    }).join('; ');
+    final elements =
+        mapMissingConfigs.entries.toList()
+          ..sort((a, b) => a.key.compareTo(b.key));
+
+    final message = elements
+        .map((e) {
+          final sortedConfigs = (e.value.toList()..sort())
+              .map((v) => '"$v"')
+              .join(', ');
+          return '`${e.key}`: $sortedConfigs';
+        })
+        .join('; ');
 
     throw ArgumentError(
       'There are elements defined with configurations with no associated '
@@ -288,10 +295,7 @@ class AnnotatedTest<T> {
         File(path).writeAsStringSync(testOutput);
       } else {
         final content = File(path).readAsStringSync();
-        expect(
-          testOutput,
-          exp.contains ? contains(content) : equals(content),
-        );
+        expect(testOutput, exp.contains ? contains(content) : equals(content));
       }
     } on FileSystemException catch (ex) {
       throw TestFailure(
@@ -331,10 +335,7 @@ class AnnotatedTest<T> {
       final outputDirectory =
           File(p.join(reader.directory, exp.expectedOutputFileName)).parent;
 
-      final path = p.relative(
-        reader.path,
-        from: outputDirectory.path,
-      );
+      final path = p.relative(reader.path, from: outputDirectory.path);
       return "part of '$path';\n\n$output";
     }
 
@@ -355,8 +356,11 @@ class AnnotatedTest<T> {
         expectedElementName = exp.element as String;
       }
       // ignore: deprecated_member_use
-      elementMatcher = const TypeMatcher<Element>()
-          .having((e) => e.name, 'name', expectedElementName);
+      elementMatcher = const TypeMatcher<Element>().having(
+        (e) => e.name,
+        'name',
+        expectedElementName,
+      );
     } else if (exp.element == true) {
       elementMatcher = isNotNull;
     } else {

pubspec.yaml

@@ -1,17 +1,17 @@
 name: source_gen_test
-version: 1.1.2-wip
+version: 1.2.0
 description: >-
   Test support for the source_gen package.
   Includes helpers to make it easy to validate both success and failure cases.
 repository: https://github.com/kevmoo/source_gen_test
 
 environment:
-  sdk: ^3.4.0
+  sdk: ^3.7.0
 
 dependencies:
   analyzer: ">=6.5.0 <8.0.0"
-  build: ^2.4.1
-  build_test: ^2.1.7
+  build: ^2.5.0
+  build_test: ^3.2.0
   dart_style: '>=2.3.7 <4.0.0'
   meta: ^1.15.0
   path: ^1.9.0