allow latest pkg:analyzer (#804)

Author: kevmoo

json_serializable/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.1
+
+- Allow latest `package:analyzer`.
+
 ## 4.0.0
 
 - Requires Dart 2.12 or greater.

json_serializable/lib/src/json_key_utils.dart

@@ -136,7 +136,7 @@ JsonKey _from(FieldElement element, JsonSerializable classAnnotation) {
         }
         assert(targetEnumType != null);
         final annotatedEnumType = annotationValue.objectValue.type;
-        if (annotatedEnumType != targetEnumType) {
+        if (!_interfaceTypesEqual(annotatedEnumType, targetEnumType)) {
           throwUnsupported(
             element,
             '`$fieldName` has type '
@@ -254,3 +254,11 @@ bool _includeIfNull(
   }
   return keyIncludeIfNull ?? classIncludeIfNull;
 }
+
+bool _interfaceTypesEqual(DartType a, DartType b) {
+  if (a is InterfaceType && b is InterfaceType) {
+    // Handle nullability case. Pretty sure this is fine for enums.
+    return a.element == b.element;
+  }
+  return a == b;
+}

json_serializable/pubspec.yaml

@@ -1,5 +1,5 @@
 name: json_serializable
-version: 4.0.0
+version: 4.0.1
 description: >-
   Automatically generate code for converting to and from JSON by annotating
   Dart classes.
@@ -9,7 +9,7 @@ environment:
   sdk: '>=2.11.99 <3.0.0'
 
 dependencies:
-  analyzer: ^0.41.2
+  analyzer: '>=0.41.2 <2.0.0'
   build: ^1.6.1
   build_config: ^0.4.4