From 8b032f5d258fa9f91afc2a65c534fe5621331ea7 Mon Sep 17 00:00:00 2001 From: Aneesh Rao Date: Fri, 9 Apr 2021 11:12:26 +0530 Subject: [PATCH 1/4] refactor: Remove unnecessary cast --- .../lib/src/firebase_http_file_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart b/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart index f761bd25..bcf0574b 100644 --- a/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart +++ b/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart @@ -9,7 +9,7 @@ class FirebaseHttpFileService extends HttpFileService { Future get(String url, {Map headers = const {}}) async { var ref = FirebaseStorage.instance.ref().child(url); - var _url = await ref.getDownloadURL() as String; + var _url = await ref.getDownloadURL(); return super.get(_url); } From 51c8bdc63a9c7089c014389dc1026bc1b1b35af3 Mon Sep 17 00:00:00 2001 From: Aneesh Rao Date: Fri, 9 Apr 2021 11:24:11 +0530 Subject: [PATCH 2/4] build(dependency): Update version constraints --- flutter_cache_manager_firebase/pubspec.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flutter_cache_manager_firebase/pubspec.yaml b/flutter_cache_manager_firebase/pubspec.yaml index 9d226cfb..fce930f3 100644 --- a/flutter_cache_manager_firebase/pubspec.yaml +++ b/flutter_cache_manager_firebase/pubspec.yaml @@ -9,10 +9,10 @@ environment: dependencies: flutter: sdk: flutter - flutter_cache_manager: ^2.0.0 - firebase_storage: ">=3.0.0 <6.0.0" - path_provider: "^1.4.0" - path: "^1.6.4" + flutter_cache_manager: ^3.0.1 + firebase_storage: ">=3.0.0 <9.0.0" + path_provider: ^2.0.1 + path: ^1.8.0 dev_dependencies: flutter_test: From 6e9e0d5d621d207e45b1df1140135f959bff77fd Mon Sep 17 00:00:00 2001 From: Aneesh Rao Date: Fri, 9 Apr 2021 11:34:45 +0530 Subject: [PATCH 3/4] build: Update SDK constraints --- flutter_cache_manager_firebase/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flutter_cache_manager_firebase/pubspec.yaml b/flutter_cache_manager_firebase/pubspec.yaml index fce930f3..d9bb6f6b 100644 --- a/flutter_cache_manager_firebase/pubspec.yaml +++ b/flutter_cache_manager_firebase/pubspec.yaml @@ -4,7 +4,7 @@ version: 1.1.0 homepage: https://github.com/Baseflow/flutter_cache_manager environment: - sdk: ">=2.7.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: From 61e13bcf9061311f9f60b908763994b7d1c3d443 Mon Sep 17 00:00:00 2001 From: Aneesh Rao Date: Fri, 9 Apr 2021 11:43:34 +0530 Subject: [PATCH 4/4] feat(nnbd): Migrate to null safety * Make FirebaseCacheManager._instance final and initialize it * Migrate FirebaseHttpFileService.get to nnbd --- .../lib/src/firebase_cache_manager.dart | 3 +-- .../lib/src/firebase_http_file_service.dart | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart b/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart index 42ed85c9..d474901f 100644 --- a/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart +++ b/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart @@ -7,10 +7,9 @@ import 'firebase_http_file_service.dart'; class FirebaseCacheManager extends CacheManager { static const key = 'firebaseCache'; - static FirebaseCacheManager _instance; + static final FirebaseCacheManager _instance = FirebaseCacheManager._(); factory FirebaseCacheManager() { - _instance ??= FirebaseCacheManager._(); return _instance; } diff --git a/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart b/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart index bcf0574b..8550e736 100644 --- a/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart +++ b/flutter_cache_manager_firebase/lib/src/firebase_http_file_service.dart @@ -7,7 +7,7 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart'; class FirebaseHttpFileService extends HttpFileService { @override Future get(String url, - {Map headers = const {}}) async { + {Map? headers = const {}}) async { var ref = FirebaseStorage.instance.ref().child(url); var _url = await ref.getDownloadURL();