diff --git a/analysis_options.yaml b/analysis_options.yaml index 5381bdab..629e6274 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -4,6 +4,9 @@ include: package:dart_flutter_team_lints/analysis_options.yaml analyzer: language: strict-casts: true + errors: + # Analyzer v7.4.0 crazy + deprecated_member_use: ignore linter: rules: diff --git a/json_serializable/CHANGELOG.md b/json_serializable/CHANGELOG.md index 186aa799..332e9a49 100644 --- a/json_serializable/CHANGELOG.md +++ b/json_serializable/CHANGELOG.md @@ -1,6 +1,11 @@ +## 6.9.5 + +- Support the `analyzer: '>=6.9.0 <8.0.0'`. +- Fixed use of deprecated analyzer APIs. + ## 6.9.4 -- Fix extra line being generated when targetting Dart 3.7 package. +- Fix extra line being generated when targeting Dart 3.7 package. ## 6.9.3 diff --git a/json_serializable/lib/src/decode_helper.dart b/json_serializable/lib/src/decode_helper.dart index ea3eb379..3a20abbb 100644 --- a/json_serializable/lib/src/decode_helper.dart +++ b/json_serializable/lib/src/decode_helper.dart @@ -61,10 +61,7 @@ mixin DecodeHelper implements HelperCore { config.constructor, accessibleFields.keys, accessibleFields.values - .where((fe) => - element.augmented - .lookUpSetter(name: fe.name, library: element.library) != - null) + .where((fe) => element.lookUpSetter(fe.name, element.library) != null) .map((fe) => fe.name) .toList(), unavailableReasons, diff --git a/json_serializable/lib/src/field_helpers.dart b/json_serializable/lib/src/field_helpers.dart index c14d0d4b..8f8811f4 100644 --- a/json_serializable/lib/src/field_helpers.dart +++ b/json_serializable/lib/src/field_helpers.dart @@ -3,6 +3,9 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/dart/element/element.dart'; +import 'package:analyzer/src/dart/element/element.dart' // ignore: implementation_imports + show + InterfaceElementImpl; import 'package:analyzer/src/dart/element/inheritance_manager3.dart' // ignore: implementation_imports show InheritanceManager3; @@ -81,15 +84,18 @@ List createSortedFieldSet(ClassElement element) { final inheritedFields = {}; final manager = InheritanceManager3(); - for (final v in manager.getInheritedConcreteMap2(element).values) { + for (final v in manager + .getInheritedConcreteMap2(element as InterfaceElementImpl) + .values) { assert(v is! FieldElement); if (_dartCoreObjectChecker.isExactly(v.enclosingElement3)) { continue; } - if (v is PropertyAccessorElement && v.isGetter) { - assert(v.variable2 is FieldElement); - final variable = v.variable2 as FieldElement; + if (v is PropertyAccessorElement && + (v as PropertyAccessorElement).isGetter) { + assert((v as PropertyAccessorElement).variable2 is FieldElement); + final variable = (v as PropertyAccessorElement).variable2 as FieldElement; assert(!inheritedFields.containsKey(variable.name)); inheritedFields[variable.name] = variable; } diff --git a/json_serializable/pubspec.yaml b/json_serializable/pubspec.yaml index a28a6509..94d1cdfa 100644 --- a/json_serializable/pubspec.yaml +++ b/json_serializable/pubspec.yaml @@ -1,5 +1,5 @@ name: json_serializable -version: 6.9.4 +version: 6.9.5 description: >- Automatically generate code for converting to and from JSON by annotating Dart classes. @@ -15,7 +15,7 @@ topics: resolution: workspace dependencies: - analyzer: '>=6.5.0 <8.0.0' + analyzer: '>=6.9.0 <8.0.0' async: ^2.10.0 build: ^2.4.1 build_config: ^1.1.0