From 021458a49941c56a62eea79f6a09310435befbef Mon Sep 17 00:00:00 2001 From: davidmarne Date: Tue, 12 May 2020 16:31:33 -0600 Subject: [PATCH 1/3] 7.5.12 --- CHANGELOG.md | 4 ++++ lib/generator.dart | 6 +++--- pubspec.yaml | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c90a19..a95e425 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 7.5.12 +* tighten analyzer to require ^0.39.0 +* fix analyzer deprecations + ## 7.5.11 * allow analyzer 0.39.0 * make dispatcher name public diff --git a/lib/generator.dart b/lib/generator.dart index cce20b9..b3d4231 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -40,7 +40,7 @@ ActionsClass _actionsClassFromElement(ClassElement element) => ActionsClass( Iterable _composedActionClasses(ClassElement element) => element.fields .where((f) => _isReduxActions(f.type.element)) - .map((f) => ComposedActionClass(f.name, f.type.name)); + .map((f) => ComposedActionClass(f.name, f.type.getDisplayString())); Iterable _actionsFromElement(ClassElement element) => element.fields .where(_isActionDispatcher) @@ -85,11 +85,11 @@ bool _isReduxActions(Element element) => element is ClassElement && _hasSuperType(element, 'ReduxActions'); bool _isActionDispatcher(FieldElement element) => - element.type.name == 'ActionDispatcher'; + element.type.getDisplayString() == 'ActionDispatcher'; bool _hasSuperType(ClassElement classElement, String type) => classElement.allSupertypes - .any((interfaceType) => interfaceType.name == type) && + .any((interfaceType) => interfaceType.getDisplayString() == type) && !classElement.displayName.startsWith('_\$'); String _generateActions(ClassElement element) { diff --git a/pubspec.yaml b/pubspec.yaml index d6f1cfd..25d287a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,13 +1,13 @@ name: built_redux -version: 7.5.11 +version: 7.5.12 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: '>=0.33.0 <0.40.0' + analyzer: '>=0.39.3 <0.40.0' build: ^1.2.2 built_collection: ^4.3.0 - built_value: '>=6.8.2 <8.0.0' + built_value: '>=7.0.8 <8.0.0' source_gen: ^0.9.4+6 test: ^1.9.1 From 44dd4bab7caba212b2c4548f0206d33512b03ad1 Mon Sep 17 00:00:00 2001 From: davidmarne Date: Tue, 12 May 2020 16:38:24 -0600 Subject: [PATCH 2/3] use type element name --- lib/generator.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index b3d4231..4eb8630 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -40,7 +40,7 @@ ActionsClass _actionsClassFromElement(ClassElement element) => ActionsClass( Iterable _composedActionClasses(ClassElement element) => element.fields .where((f) => _isReduxActions(f.type.element)) - .map((f) => ComposedActionClass(f.name, f.type.getDisplayString())); + .map((f) => ComposedActionClass(f.name, f.type.element.name)); Iterable _actionsFromElement(ClassElement element) => element.fields .where(_isActionDispatcher) @@ -85,11 +85,11 @@ bool _isReduxActions(Element element) => element is ClassElement && _hasSuperType(element, 'ReduxActions'); bool _isActionDispatcher(FieldElement element) => - element.type.getDisplayString() == 'ActionDispatcher'; + element.type.element.name == 'ActionDispatcher'; bool _hasSuperType(ClassElement classElement, String type) => classElement.allSupertypes - .any((interfaceType) => interfaceType.getDisplayString() == type) && + .any((interfaceType) => interfaceType.element.name == type) && !classElement.displayName.startsWith('_\$'); String _generateActions(ClassElement element) { From 53350b1aa0cfcf53a04375c43b7db119be90e2ed Mon Sep 17 00:00:00 2001 From: Aaron Lademann Date: Thu, 4 Feb 2021 15:51:02 -0700 Subject: [PATCH 3/3] Widen analyzer / built_value ranges --- CHANGELOG.md | 4 ++-- pubspec.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a95e425..5ce4468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ ## 7.5.12 -* tighten analyzer to require ^0.39.0 +* update analyzer to dependency range * fix analyzer deprecations ## 7.5.11 @@ -304,4 +304,4 @@ final _nestedReducer = new NestedReducerBuilder=0.39.3 <0.40.0' + analyzer: '>=0.39.3 <0.42.0' build: ^1.2.2 - built_collection: ^4.3.0 - built_value: '>=7.0.8 <8.0.0' + built_collection: ">=4.3.0 <6.0.0" + built_value: '>=7.0.8 <9.0.0' source_gen: ^0.9.4+6 test: ^1.9.1 dev_dependencies: build_runner: ^1.7.1 build_test: ^0.10.11 - built_value_generator: ^7.0.0 + built_value_generator: ">=7.0.0 <9.0.0" build_web_compilers: ^2.7.1 workiva_analysis_options: ^1.0.0