diff --git a/packages/freezed/CHANGELOG.md b/packages/freezed/CHANGELOG.md index dc6379fb..e07ddcc5 100644 --- a/packages/freezed/CHANGELOG.md +++ b/packages/freezed/CHANGELOG.md @@ -1,8 +1,12 @@ +# 2.2.1 + +Upgrade analyzer + # 2.2.0 - The generated `copyWith` is now annotated by `@useResult` (thanks to @miDeb) - Improved performance of `copyWith` (thanks to @miDeb) -- Improved type inference when using `mapOrNull`/`whenOrNull` (thanks to @DevNico) +- Improved type inference when using `mapOrNull`/`whenOrNull` (thanks to @DevNico) - Re-introduced `@With.fromString` and `@Implements.fromString` to allow unions to implement generic types. (thanks to @rorystephenson) - fixes @Default for Strings containing (, [ or { (thanks to @hugobrancowb) diff --git a/packages/freezed/lib/src/freezed_generator.dart b/packages/freezed/lib/src/freezed_generator.dart index a49f011b..236e256e 100644 --- a/packages/freezed/lib/src/freezed_generator.dart +++ b/packages/freezed/lib/src/freezed_generator.dart @@ -424,7 +424,7 @@ Read here: https://github.com/rrousselGit/freezed/blob/master/packages/freezed/C final parameterType = parameter.type; if (parameterType is! InterfaceType) continue; - final element = parameterType.element2; + final element = parameterType.element; if (element is! ClassElement) continue; final classElement = element; @@ -660,7 +660,7 @@ Read here: https://github.com/rrousselGit/freezed/blob/master/packages/freezed/C element, ...element.allSupertypes .where((e) => !e.isDartCoreObject) - .map((e) => e.element2) + .map((e) => e.element) ]) { for (final method in type.methods) { if (method.name == 'toString') { @@ -677,7 +677,7 @@ Read here: https://github.com/rrousselGit/freezed/blob/master/packages/freezed/C element, ...element.allSupertypes .where((e) => !e.isDartCoreObject) - .map((e) => e.element2) + .map((e) => e.element) ]) { for (final method in type.methods.where((e) => e.isOperator)) { if (method.name == '==') { diff --git a/packages/freezed/lib/src/tools/type.dart b/packages/freezed/lib/src/tools/type.dart index 1b003475..b34f4315 100644 --- a/packages/freezed/lib/src/tools/type.dart +++ b/packages/freezed/lib/src/tools/type.dart @@ -11,7 +11,7 @@ import 'imports.dart'; /// type.alias.element Element? _getElementForType(DartType type) { if (type is InterfaceType) { - return type.element2; + return type.element; } if (type is FunctionType) { return type.alias?.element; @@ -27,7 +27,7 @@ String resolveFullTypeStringFrom( }) { final owner = originLibrary.prefixes.firstWhereOrNull( (e) { - return e.imports2.any((l) { + return e.imports.any((l) { return l.importedLibrary!.anyTransitiveExport((library) { return library.id == _getElementForType(type)?.library?.id; }); diff --git a/packages/freezed/pubspec.yaml b/packages/freezed/pubspec.yaml index 099348ae..50142a04 100644 --- a/packages/freezed/pubspec.yaml +++ b/packages/freezed/pubspec.yaml @@ -2,7 +2,7 @@ name: freezed description: > Code generation for immutable classes that has a simple syntax/API without compromising on the features. -version: 2.2.0 +version: 2.2.1 repository: https://github.com/rrousselGit/freezed issue_tracker: https://github.com/rrousselGit/freezed/issues @@ -10,7 +10,7 @@ environment: sdk: '>=2.17.0 <3.0.0' dependencies: - analyzer: ">=4.6.0 <6.0.0" + analyzer: ^5.2.0 build: ^2.3.1 build_config: ^1.1.0 collection: ^1.15.0