Fix analyzer dependency conflicts with Flutter

IO-Design-Team · Jun 23, 2024 · b212da1 · b212da1
1 parent 7d7d4e0
commit b212da1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/hive_generator/CHANGELOG.md b/hive_generator/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.2.1
+
+- Fix `analyzer` dependency conflicts with Flutter
+
 ## 1.2.0
 
 - The first release of hive_ce_generator
diff --git a/hive_generator/lib/src/class_builder.dart b/hive_generator/lib/src/class_builder.dart
@@ -240,5 +240,7 @@ String _suffixFromType(DartType type) {
 
 String _displayString(DartType e) {
   final suffix = _suffixFromType(e);
-  return '${e.getDisplayString()}$suffix';
+  // TODO: Update when Flutter supports analyser 6.5.0
+  // ignore: deprecated_member_use
+  return '${e.getDisplayString(withNullability: false)}$suffix';
 }
diff --git a/hive_generator/lib/src/type_adapter_generator.dart b/hive_generator/lib/src/type_adapter_generator.dart
@@ -113,12 +113,18 @@ class TypeAdapterGenerator extends GeneratorForAnnotation<HiveType> {
     final getters = <AdapterField>[];
     final setters = <AdapterField>[];
     for (final name in accessorNames) {
-      final getter = cls.augmented.lookUpGetter(name: name, library: library);
+      // TODO: Update when Flutter supports analyser 6.5.0
+      // ignore: deprecated_member_use
+      final getter = cls.lookUpGetter(name, library);
       if (getter != null) {
         final getterAnn =
-            getHiveFieldAnn(getter.variable2) ?? getHiveFieldAnn(getter);
+            // TODO: Update when Flutter supports analyser 6.5.0
+            // ignore: deprecated_member_use
+            getHiveFieldAnn(getter.variable) ?? getHiveFieldAnn(getter);
         if (getterAnn != null) {
-          final field = getter.variable2!;
+          // TODO: Update when Flutter supports analyser 6.5.0
+          // ignore: deprecated_member_use
+          final field = getter.variable;
           getters.add(
             AdapterField(
               getterAnn.index,
@@ -130,13 +136,18 @@ class TypeAdapterGenerator extends GeneratorForAnnotation<HiveType> {
         }
       }
 
-      final setter =
-          cls.augmented.lookUpSetter(name: '$name=', library: library);
+      // TODO: Update when Flutter supports analyser 6.5.0
+      // ignore: deprecated_member_use
+      final setter = cls.lookUpSetter('$name=', library);
       if (setter != null) {
         final setterAnn =
-            getHiveFieldAnn(setter.variable2) ?? getHiveFieldAnn(setter);
+            // TODO: Update when Flutter supports analyser 6.5.0
+            // ignore: deprecated_member_use
+            getHiveFieldAnn(setter.variable) ?? getHiveFieldAnn(setter);
         if (setterAnn != null) {
-          final field = setter.variable2!;
+          // TODO: Update when Flutter supports analyser 6.5.0
+          // ignore: deprecated_member_use
+          final field = setter.variable;
           setters.add(
             AdapterField(
               setterAnn.index,

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.2.0
+version: 1.2.1
 homepage: https://github.com/IO-Design-Team/hive_ce/tree/main/hive_generator
 documentation: https://docs.hivedb.dev/
 
@@ -11,7 +11,7 @@ dependencies:
   build: ^2.0.0
   source_gen: ^1.0.0
   hive_ce: ^2.3.0
-  analyzer: ^6.5.0
+  analyzer: ^6.0.0
   source_helper: ^1.1.0
 
 dev_dependencies: