Merge pull request #90 from dukefirehawk/bug-fix/analyzer

Fixed analyzer

packages/orm/angel_orm_generator/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 7.1.2
+
+* Fixed #88 due to change in `analyzer` 5.3.x
+
 ## 7.1.1
 
 * Temporily locked `analyzer` to 5.2.x to resolve undocumented breaking changes in 5.3.x.

packages/orm/angel_orm_generator/lib/src/orm_build_context.dart

@@ -456,8 +456,8 @@ class RelationFieldImpl extends ShimFieldImpl {
 
   String get originalFieldName => originalField.name;
 
-  @override
-  PropertyAccessorElement? get getter => originalField.getter;
+  //@override
+  //PropertyAccessorElement? get getter => originalField.getter;
 }
 
 InterfaceType? firstModelAncestor(DartType? type) {

packages/orm/angel_orm_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: angel3_orm_generator
-version: 7.1.1
+version: 7.1.2
 description: Code generators for Angel3 ORM. Generates query builder classes.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_generator
@@ -10,7 +10,7 @@ dependencies:
   angel3_serialize: ^7.0.0
   angel3_orm: ^7.0.0
   angel3_serialize_generator: ^7.1.0
-  analyzer: '>=5.2.0 <5.3.0'
+  analyzer: ^5.3.0
   inflection3: ^0.5.3+1
   build: ^2.0.1
   build_config: ^1.0.0

packages/orm/angel_orm_test/pubspec.yaml

@@ -19,7 +19,7 @@ dev_dependencies:
   angel3_framework: ^7.0.0
   build_runner: ^2.0.1
   lints: ^2.0.0
-# dependency_overrides:
+dependency_overrides:
 #   angel3_container:
 #     path: ../../container/angel_container
 #   angel3_framework:
@@ -40,5 +40,5 @@ dev_dependencies:
 #      path: ../angel_orm
 #   angel3_migration:
 #      path: ../angel_migration
-#  angel3_orm_generator:
-#    path: ../angel_orm_generator
+  angel3_orm_generator:
+    path: ../angel_orm_generator