From 47b15efe7b7619d0a6b84b2804d0ace83f26f375 Mon Sep 17 00:00:00 2001 From: Max Lapides Date: Tue, 30 Mar 2021 14:36:32 -0700 Subject: [PATCH 1/4] dependencies: upgrade dependencies --- pubspec.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 1b3a6b2..a37ccd4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,17 +3,17 @@ version: 8.0.0-nullsafety.0 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: ">=0.40.0 <0.41.0" - build: ^1.2.2 - built_collection: ^5.0.0-nullsafety.0 - built_value: ^8.0.0-nullsafety.0 + analyzer: '>=0.40.0 <2.0.0' + build: ^2.0.0 + built_collection: ^5.0.0 + built_value: ^8.0.0 source_gen: ^0.9.4+6 - test: ^1.16.0-nullsafety + test: ^1.16.0 dev_dependencies: - build_runner: ^1.7.1 - build_test: ^1.2.0 - built_value_generator: ^8.0.0-nullsafety.0 + build_runner: ^1.12.2 + build_test: ^2.0.0 + built_value_generator: ^8.0.0 build_web_compilers: ^2.7.1 workiva_analysis_options: ^1.0.0 From 988380321fe3c9f6e2d202fe69d0f18d18b87ea0 Mon Sep 17 00:00:00 2001 From: Max Lapides Date: Tue, 30 Mar 2021 14:55:02 -0700 Subject: [PATCH 2/4] fix NNBD issues --- lib/generator.dart | 15 ++++++++------- pubspec.yaml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/generator.dart b/lib/generator.dart index 4eb8630..fc0ff78 100644 --- a/lib/generator.dart +++ b/lib/generator.dart @@ -1,4 +1,5 @@ import 'dart:async'; + import 'package:analyzer/dart/element/element.dart'; import 'package:build/build.dart'; import 'package:source_gen/source_gen.dart'; @@ -40,7 +41,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.element.name)); + .map((f) => ComposedActionClass(f.name, f.type.element!.name!)); Iterable _actionsFromElement(ClassElement element) => element.fields .where(_isActionDispatcher) @@ -64,16 +65,16 @@ String _fieldType(ClassElement element, FieldElement field) { if (field.isSynthetic) { return _syntheticFieldType(element, field); } - return _getGenerics(field.source.contents.data, field.nameOffset); + return _getGenerics(field.source?.contents.data, field.nameOffset); } String _syntheticFieldType(ClassElement element, FieldElement field) { final method = element.getGetter(field.name); - return _getGenerics(method.source.contents.data, method.nameOffset); + return _getGenerics(method?.source.contents.data, method?.nameOffset ?? 0); } -String _getGenerics(String source, int nameOffset) { - final trimAfterName = source.substring(0, nameOffset); +String _getGenerics(String? source, int nameOffset) { + final trimAfterName = source?.substring(0, nameOffset) ?? ''; final trimBeforeActionDispatcher = trimAfterName.substring(trimAfterName.lastIndexOf('ActionDispatcher')); return trimBeforeActionDispatcher.substring( @@ -81,11 +82,11 @@ String _getGenerics(String source, int nameOffset) { trimBeforeActionDispatcher.lastIndexOf('>')); } -bool _isReduxActions(Element element) => +bool _isReduxActions(Element? element) => element is ClassElement && _hasSuperType(element, 'ReduxActions'); bool _isActionDispatcher(FieldElement element) => - element.type.element.name == 'ActionDispatcher'; + element.type.element?.name == 'ActionDispatcher'; bool _hasSuperType(ClassElement classElement, String type) => classElement.allSupertypes diff --git a/pubspec.yaml b/pubspec.yaml index a37ccd4..800c114 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: build: ^2.0.0 built_collection: ^5.0.0 built_value: ^8.0.0 - source_gen: ^0.9.4+6 + source_gen: ^1.0.0 test: ^1.16.0 dev_dependencies: From a79014b786a9d274f9558b68ab39c3ff82bc64f1 Mon Sep 17 00:00:00 2001 From: Max Lapides Date: Thu, 6 May 2021 17:02:37 -0700 Subject: [PATCH 3/4] deps: upgrade dependencies --- pubspec.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 800c114..24dffcf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,16 +3,16 @@ version: 8.0.0-nullsafety.0 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: '>=0.40.0 <2.0.0' + analyzer: '>=1.5.0 <2.0.0' build: ^2.0.0 built_collection: ^5.0.0 built_value: ^8.0.0 - source_gen: ^1.0.0 + source_gen: '>=0.9.0 <2.0.0' test: ^1.16.0 dev_dependencies: - build_runner: ^1.12.2 - build_test: ^2.0.0 + build_runner: '>=1.0.0 <3.0.0' + 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 From 3d437336c5ca554a058cd83612fe5483569e1952 Mon Sep 17 00:00:00 2001 From: Nikolay Burykin Date: Fri, 1 Oct 2021 23:21:14 +0300 Subject: [PATCH 4/4] Bump dependencies --- pubspec.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 24dffcf..48285a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,18 +1,18 @@ name: built_redux -version: 8.0.0-nullsafety.0 +version: 8.0.1 description: A state management library written in dart that enforces immutability homepage: https://github.com/davidmarne/built_redux dependencies: - analyzer: '>=1.5.0 <2.0.0' + analyzer: ">=1.8.0 <3.0.0" build: ^2.0.0 built_collection: ^5.0.0 built_value: ^8.0.0 - source_gen: '>=0.9.0 <2.0.0' + source_gen: ">=0.9.0 <2.0.0" test: ^1.16.0 dev_dependencies: - build_runner: '>=1.0.0 <3.0.0' - build_test: '>=1.2.0 <3.0.0' + build_runner: ">=1.0.0 <3.0.0" + 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