Merge pull request #66 from IO-Design-Team/feature/dependency-upgrade…

…s-2025-1-9 Support analyzer 7
IO-Design-Team · Jan 9, 2025 · ad0001e · ad0001e
2 parents 8e0b7e3 + 6d1327f
commit ad0001e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/benchmarks/storage/pubspec.yaml b/benchmarks/storage/pubspec.yaml
@@ -12,8 +12,8 @@ dependencies:
   csv: ^6.0.0
 
 dev_dependencies:
-  rexios_lints: ^8.2.0
-  build_runner: ^2.4.13
+  rexios_lints: ^9.2.0
+  # build_runner: ^2.4.13 # TODO: Fix this
   json_serializable: ^6.8.0
   hive_ce_generator: any
 
@@ -22,3 +22,5 @@ dependency_overrides:
     path: ../../hive
   hive_ce_generator:
     path: ../../hive_generator
+  source_gen: ^2.0.0
+  analyzer: ^7.0.0
diff --git a/hive_generator/CHANGELOG.md b/hive_generator/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.2
+
+- Supports analyzer 7
+
 ## 1.8.1
 
 - Fixes a bug in the migrator affecting `freezed` classes

diff --git a/hive_generator/lib/src/adapter_builder/class_adapter_builder.dart b/hive_generator/lib/src/adapter_builder/class_adapter_builder.dart
@@ -177,7 +177,9 @@ class ClassAdapterBuilder extends AdapterBuilder {
   String buildWrite() {
     final code = StringBuffer();
     code.writeln('writer');
-    code.writeln('..writeByte(${getters.length})');
+    // Only cascade when there are getters
+    if (getters.isNotEmpty) code.write('.');
+    code.writeln('.writeByte(${getters.length})');
     for (final field in getters) {
       code.writeln('''
       ..writeByte(${field.index})
@@ -218,9 +220,7 @@ extension on DartType {
     final definingLibrary = element.library;
     if (definingLibrary == currentLibrary) return getDisplayString();
 
-    // TODO: This is failing in beta (remove when fixed)
-    // ignore: deprecated_member_use
-    for (final import in currentLibrary.libraryImports) {
+    for (final import in currentLibrary.units.expand((e) => e.libraryImports)) {
       for (final MapEntry(:key, :value)
           in import.namespace.definedNames.entries) {
         if (value == element) {

diff --git a/hive_generator/pubspec.yaml b/hive_generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: hive_ce_generator
 description: Extension for Hive. Automatically generates TypeAdapters to store any class.
-version: 1.8.1
+version: 1.8.2
 homepage: https://github.com/IO-Design-Team/hive_ce/tree/main/hive_generator
 documentation: https://docs.hivedb.dev/
 
@@ -9,9 +9,9 @@ environment:
 
 dependencies:
   build: ^2.0.0
-  source_gen: ^1.0.0
+  source_gen: ^2.0.0
   hive_ce: ^2.8.0
-  analyzer: ^6.5.0
+  analyzer: ^7.1.0
   source_helper: ^1.1.0
   glob: ^2.1.2
   path: ^1.9.0