From 695700d8d6bc1164a80d6433211096e107adc6bc Mon Sep 17 00:00:00 2001 From: Steve Browne Date: Tue, 11 Jan 2022 11:57:23 -0500 Subject: [PATCH 1/2] Updated for null safety and made the pubspec match version 0.9.0 of redux_persist. --- packages/redux_persist_web/lib/redux_persist_web.dart | 6 +++--- packages/redux_persist_web/pubspec.yaml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/redux_persist_web/lib/redux_persist_web.dart b/packages/redux_persist_web/lib/redux_persist_web.dart index 4473be6..7e02f31 100644 --- a/packages/redux_persist_web/lib/redux_persist_web.dart +++ b/packages/redux_persist_web/lib/redux_persist_web.dart @@ -16,10 +16,10 @@ class WebStorage implements StorageEngine { @override Future load() => - Future.value(stringToUint8List(window.localStorage[key])); + Future.value(stringToUint8List(window.localStorage[key] ?? "")); @override - Future save(Uint8List data) async { - window.localStorage[key] = uint8ListToString(data); + Future save(Uint8List? data) async { + window.localStorage[key] = uint8ListToString(data) ?? ""; } } diff --git a/packages/redux_persist_web/pubspec.yaml b/packages/redux_persist_web/pubspec.yaml index 1f09470..797915a 100644 --- a/packages/redux_persist_web/pubspec.yaml +++ b/packages/redux_persist_web/pubspec.yaml @@ -1,14 +1,13 @@ name: redux_persist_web description: Redux Persist Web Integration with custom storage engines (localStorage) -version: 0.8.2 +version: 0.9.0 homepage: https://github.com/Cretezy/redux_persist/tree/master/packages/redux_persist_web -author: Charles Crete environment: - sdk: ">=1.24.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: - redux_persist: "^0.8.2" + redux_persist: "^0.9.0" # Used for development #dependency_overrides: From ad468d97df529f2eafee6413653374851cb9c1bb Mon Sep 17 00:00:00 2001 From: Steve Browne Date: Tue, 11 Jan 2022 11:58:24 -0500 Subject: [PATCH 2/2] Updated example for null safety. --- packages/redux_persist_web/example/pubspec.yaml | 4 ++-- .../redux_persist_web/example/redux_persist_web_example.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/redux_persist_web/example/pubspec.yaml b/packages/redux_persist_web/example/pubspec.yaml index f0fb415..779fa3d 100644 --- a/packages/redux_persist_web/example/pubspec.yaml +++ b/packages/redux_persist_web/example/pubspec.yaml @@ -1,12 +1,12 @@ name: redux_persist_web_example environment: - sdk: ">=2.0.0-dev <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: redux_persist_web: path: .. - redux: "^3.0.0" + redux: ^5.0.0 # Used for development #dependency_overrides: diff --git a/packages/redux_persist_web/example/redux_persist_web_example.dart b/packages/redux_persist_web/example/redux_persist_web_example.dart index 7358a1a..4dc55b0 100644 --- a/packages/redux_persist_web/example/redux_persist_web_example.dart +++ b/packages/redux_persist_web/example/redux_persist_web_example.dart @@ -27,7 +27,7 @@ class AppState { AppState({this.counter = 0}); - AppState copyWith({int counter}) => + AppState copyWith({int? counter}) => AppState(counter: counter ?? this.counter); static AppState fromJson(dynamic json) => @@ -38,7 +38,7 @@ class AppState { class IncrementCounterAction {} -AppState reducer(AppState state, Object action) { +AppState reducer(AppState state, dynamic action) { if (action is IncrementCounterAction) { // Increment return state.copyWith(counter: state.counter + 1);