From 0c1590ddb91f870fb90f8dee2e717ba8c86983d5 Mon Sep 17 00:00:00 2001 From: Irina Date: Wed, 28 Sep 2022 16:47:41 +0300 Subject: [PATCH 1/8] changed dependency --- pubspec.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 9c97c44..691a2a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,21 +1,21 @@ name: built_redux -version: 8.0.0 +version: 9.0.0 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: ^1.0.0 - build: ">=1.0.0 <3.0.0" - built_collection: ^5.0.0 - built_value: ^8.0.0 - source_gen: ">=0.9.4 <2.0.0" - test: ^1.16.0 + analyzer: ^4.6.0 + build: ^2.3.1 + built_collection: ^5.1.1 + built_value: ^8.4.1 + source_gen: ^1.2.5 + test: ^1.21.6 dev_dependencies: - build_runner: ^1.7.1 - build_test: ">=1.2.0 <3.0.0" - built_value_generator: ^8.0.0 - build_web_compilers: ^2.7.1 - workiva_analysis_options: ^1.0.0 + build_runner: ^2.2.1 + build_test: + built_value_generator: ^8.4.1 + build_web_compilers: ^3.2.6 + workiva_analysis_options: ^1.2.2 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.17.0 <3.0.0" From ffa67d91f57ae5d8a3d942fffa90c3ee0567788e Mon Sep 17 00:00:00 2001 From: Irina Date: Wed, 28 Sep 2022 16:54:35 +0300 Subject: [PATCH 2/8] changed dependency --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 691a2a8..c8b37b2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ dependencies: built_collection: ^5.1.1 built_value: ^8.4.1 source_gen: ^1.2.5 - test: ^1.21.6 + test: ^1.20.0 dev_dependencies: build_runner: ^2.2.1 From 8e5f1247fd5811ccf71a43004d973e6178de87b9 Mon Sep 17 00:00:00 2001 From: Vladimit Ushakov Date: Wed, 28 Sep 2022 17:35:08 +0300 Subject: [PATCH 3/8] changed dependency --- lib/generator.dart | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index 5bdd92e..408d3d5 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -9,7 +9,7 @@ class BuiltReduxGenerator extends Generator { final result = StringBuffer(); var hasWrittenHeaders = false; for (final element in library.allElements) { - if (_isReduxActions(element) && element is ClassElement) { + if (_isReduxActions(element) && element is InterfaceElement) { if (!hasWrittenHeaders) { hasWrittenHeaders = true; result.writeln(_lintIgnores); @@ -29,44 +29,44 @@ const _lintIgnores = """ // ignore_for_file: type_annotate_public_apis """; -ActionsClass _actionsClassFromElement(ClassElement element) => ActionsClass( +ActionsClass _actionsClassFromElement(InterfaceElement element) => ActionsClass( element.name, _actionsFromElement(element).toSet(), _composedActionClasses(element).toSet(), _actionsClassFromInheritedElements(element).toSet(), ); -Iterable _composedActionClasses(ClassElement element) => - element.fields.where((f) => _isReduxActions(f.type.element)).map((f) => +Iterable _composedActionClasses(InterfaceElement element) => + element.fields.where((f) => _isReduxActions(f.type.element2)).map((f) => ComposedActionClass( f.name, f.type.getDisplayString(withNullability: true))); -Iterable _actionsFromElement(ClassElement element) => element.fields +Iterable _actionsFromElement(InterfaceElement element) => element.fields .where(_isActionDispatcher) .map((field) => _fieldElementToAction(element, field)); Iterable _actionsClassFromInheritedElements( - ClassElement element) => + InterfaceElement element) => element.allSupertypes - .map((s) => s.element) + .map((s) => s.element2) .where(_isReduxActions) .map(_actionsClassFromElement); -Action _fieldElementToAction(ClassElement element, FieldElement field) => +Action _fieldElementToAction(InterfaceElement element, FieldElement field) => Action('${element.name}-${field.name}', field.name, _fieldType(element, field)); // hack to return the generics for the action // this is used so action whose payloads are of generated types // will not result in dynamic -String _fieldType(ClassElement element, FieldElement field) { +String _fieldType(InterfaceElement element, FieldElement field) { if (field.isSynthetic) { return _syntheticFieldType(element, field); } return _getGenerics(field.source!.contents.data, field.nameOffset); } -String _syntheticFieldType(ClassElement element, FieldElement field) { +String _syntheticFieldType(InterfaceElement element, FieldElement field) { final method = element.getGetter(field.name); return _getGenerics(method!.source.contents.data, method.nameOffset); } @@ -81,25 +81,25 @@ String _getGenerics(String source, int nameOffset) { } bool _isReduxActions(Element? element) => - element is ClassElement && _hasSuperType(element, 'ReduxActions'); + element is InterfaceElement && _hasSuperType(element, 'ReduxActions'); bool _isActionDispatcher(FieldElement element) => element.type .getDisplayString(withNullability: true) .startsWith('ActionDispatcher<'); -bool _hasSuperType(ClassElement classElement, String type) => - classElement.allSupertypes - .any((interfaceType) => interfaceType.element.name == type) && - !classElement.displayName.startsWith('_\$'); +bool _hasSuperType(InterfaceElement InterfaceElement, String type) => + InterfaceElement.allSupertypes + .any((interfaceType) => interfaceType.element2.name == type) && + !InterfaceElement.displayName.startsWith('_\$'); -String _generateActions(ClassElement element) { +String _generateActions(InterfaceElement element) { final actionClass = _actionsClassFromElement(element); return _generateDispatchersIfNeeded(element, actionClass) + _actionNamesClassTemplate(actionClass); } String _generateDispatchersIfNeeded( - ClassElement element, ActionsClass actionsClass) => + InterfaceElement element, ActionsClass actionsClass) => element.constructors.length > 1 ? _actionDispatcherClassTemplate(actionsClass) : ''; From ba104bc58ed9bdb54f7746eb08879c8d7281a7db Mon Sep 17 00:00:00 2001 From: Vladimit Ushakov Date: Wed, 28 Sep 2022 17:58:35 +0300 Subject: [PATCH 4/8] changed dependency --- lib/generator.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index 408d3d5..09dbec3 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -8,8 +8,8 @@ class BuiltReduxGenerator extends Generator { Future generate(LibraryReader library, BuildStep buildStep) async { final result = StringBuffer(); var hasWrittenHeaders = false; - for (final element in library.allElements) { - if (_isReduxActions(element) && element is InterfaceElement) { + for (final element in library.allElements.whereType()) { + if (_isReduxActions(element)) { if (!hasWrittenHeaders) { hasWrittenHeaders = true; result.writeln(_lintIgnores); From 76b8aed91f7779de723dd37e7574497014d8690e Mon Sep 17 00:00:00 2001 From: Vladimit Ushakov Date: Wed, 23 Nov 2022 13:23:56 +0300 Subject: [PATCH 5/8] updated dependency --- pubspec.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index c8b37b2..0b9e5f6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,21 +1,21 @@ name: built_redux -version: 9.0.0 +version: 9.0.1 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: ^4.6.0 - build: ^2.3.1 - built_collection: ^5.1.1 - built_value: ^8.4.1 - source_gen: ^1.2.5 - test: ^1.20.0 + analyzer: ">=4.6.0 <6.0.0" + build: ">=2.3.1 <3.0.0" + built_collection: ">=5.1.1 <6.0.0" + built_value: ">=8.4.1 <9.0.0" + source_gen: ">=1.2.5 <2.0.0" + test: ">=1.20.0 <2.0.0" dev_dependencies: - build_runner: ^2.2.1 + build_runner: ">=2.2.1 <3.0.0" build_test: - built_value_generator: ^8.4.1 - build_web_compilers: ^3.2.6 - workiva_analysis_options: ^1.2.2 + built_value_generator: ">=8.4.1 <9.0.0" + build_web_compilers: ">=3.2.0 <4.0.0" + workiva_analysis_options: ">=1.2.2 <2.0.0" environment: sdk: ">=2.17.0 <3.0.0" From 54198c40925f81ca7419fbfaf33064ec8c49a004 Mon Sep 17 00:00:00 2001 From: Vladimit Ushakov Date: Wed, 23 Nov 2022 13:25:15 +0300 Subject: [PATCH 6/8] updated dependency --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 0b9e5f6..3243adf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ dependencies: built_collection: ">=5.1.1 <6.0.0" built_value: ">=8.4.1 <9.0.0" source_gen: ">=1.2.5 <2.0.0" - test: ">=1.20.0 <2.0.0" + test: ">=0.2.0 <2.0.0" dev_dependencies: build_runner: ">=2.2.1 <3.0.0" From 120e576d09dc63b430d70e4373bb9f72eff947f2 Mon Sep 17 00:00:00 2001 From: Vladimit Ushakov Date: Mon, 12 Dec 2022 16:35:48 +0300 Subject: [PATCH 7/8] updated dependency --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 3243adf..facc97d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ dependencies: built_collection: ">=5.1.1 <6.0.0" built_value: ">=8.4.1 <9.0.0" source_gen: ">=1.2.5 <2.0.0" - test: ">=0.2.0 <2.0.0" + test: ">=0.2.0 <3.0.0" dev_dependencies: build_runner: ">=2.2.1 <3.0.0" From 59b138e6b230f133449d1692b584a3d25fb6ebd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A3=D1=88=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=92=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=B8=D0=BC=D0=B8=D1=80?= Date: Thu, 21 Dec 2023 14:47:57 +0300 Subject: [PATCH 8/8] updated analyzer version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index facc97d..24e2e9c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ version: 9.0.1 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: ">=4.6.0 <6.0.0" + analyzer: ">=4.6.0" build: ">=2.3.1 <3.0.0" built_collection: ">=5.1.1 <6.0.0" built_value: ">=8.4.1 <9.0.0"