Skip to content

Commit cd1cf2e

Browse files
authored
Fix for latest analyzer (#1487)
Fixes #1485
1 parent d05428e commit cd1cf2e

File tree

5 files changed

+22
-11
lines changed

5 files changed

+22
-11
lines changed

analysis_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ include: package:dart_flutter_team_lints/analysis_options.yaml
44
analyzer:
55
language:
66
strict-casts: true
7+
errors:
8+
# Analyzer v7.4.0 crazy
9+
deprecated_member_use: ignore
710

811
linter:
912
rules:

json_serializable/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
## 6.9.5
2+
3+
- Support the `analyzer: '>=6.9.0 <8.0.0'`.
4+
- Fixed use of deprecated analyzer APIs.
5+
16
## 6.9.4
27

3-
- Fix extra line being generated when targetting Dart 3.7 package.
8+
- Fix extra line being generated when targeting Dart 3.7 package.
49

510
## 6.9.3
611

json_serializable/lib/src/decode_helper.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@ mixin DecodeHelper implements HelperCore {
6161
config.constructor,
6262
accessibleFields.keys,
6363
accessibleFields.values
64-
.where((fe) =>
65-
element.augmented
66-
.lookUpSetter(name: fe.name, library: element.library) !=
67-
null)
64+
.where((fe) => element.lookUpSetter(fe.name, element.library) != null)
6865
.map((fe) => fe.name)
6966
.toList(),
7067
unavailableReasons,

json_serializable/lib/src/field_helpers.dart

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analyzer/dart/element/element.dart';
6+
import 'package:analyzer/src/dart/element/element.dart' // ignore: implementation_imports
7+
show
8+
InterfaceElementImpl;
69
import 'package:analyzer/src/dart/element/inheritance_manager3.dart' // ignore: implementation_imports
710
show
811
InheritanceManager3;
@@ -81,15 +84,18 @@ List<FieldElement> createSortedFieldSet(ClassElement element) {
8184
final inheritedFields = <String, FieldElement>{};
8285
final manager = InheritanceManager3();
8386

84-
for (final v in manager.getInheritedConcreteMap2(element).values) {
87+
for (final v in manager
88+
.getInheritedConcreteMap2(element as InterfaceElementImpl)
89+
.values) {
8590
assert(v is! FieldElement);
8691
if (_dartCoreObjectChecker.isExactly(v.enclosingElement3)) {
8792
continue;
8893
}
8994

90-
if (v is PropertyAccessorElement && v.isGetter) {
91-
assert(v.variable2 is FieldElement);
92-
final variable = v.variable2 as FieldElement;
95+
if (v is PropertyAccessorElement &&
96+
(v as PropertyAccessorElement).isGetter) {
97+
assert((v as PropertyAccessorElement).variable2 is FieldElement);
98+
final variable = (v as PropertyAccessorElement).variable2 as FieldElement;
9399
assert(!inheritedFields.containsKey(variable.name));
94100
inheritedFields[variable.name] = variable;
95101
}

json_serializable/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: json_serializable
2-
version: 6.9.4
2+
version: 6.9.5
33
description: >-
44
Automatically generate code for converting to and from JSON by annotating
55
Dart classes.
@@ -15,7 +15,7 @@ topics:
1515
resolution: workspace
1616

1717
dependencies:
18-
analyzer: '>=6.5.0 <8.0.0'
18+
analyzer: '>=6.9.0 <8.0.0'
1919
async: ^2.10.0
2020
build: ^2.4.1
2121
build_config: ^1.1.0

0 commit comments

Comments
 (0)