From e46e3fb3e324596be3732e2caf6d34009ac49342 Mon Sep 17 00:00:00 2001 From: peter <16809252+percula@users.noreply.github.com> Date: Mon, 8 Mar 2021 21:39:03 -0500 Subject: [PATCH 1/4] Add null safety and upgrade dependencies --- .../lib/src/firebase_cache_manager.dart | 4 ++-- .../lib/src/firebase_http_file_service.dart | 4 ++-- flutter_cache_manager_firebase/pubspec.yaml | 10 +++++----- 3 files changed, 9 insertions(+), 9 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..f05ebba7 100644 --- a/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart +++ b/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart @@ -7,11 +7,11 @@ import 'firebase_http_file_service.dart'; class FirebaseCacheManager extends CacheManager { static const key = 'firebaseCache'; - static FirebaseCacheManager _instance; + static FirebaseCacheManager? _instance; factory FirebaseCacheManager() { _instance ??= FirebaseCacheManager._(); - return _instance; + return _instance!; } FirebaseCacheManager._() 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..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,9 +7,9 @@ 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() as String; + var _url = await ref.getDownloadURL(); return super.get(_url); } diff --git a/flutter_cache_manager_firebase/pubspec.yaml b/flutter_cache_manager_firebase/pubspec.yaml index 9d226cfb..6c31fecf 100644 --- a/flutter_cache_manager_firebase/pubspec.yaml +++ b/flutter_cache_manager_firebase/pubspec.yaml @@ -4,15 +4,15 @@ version: 1.1.0 homepage: https://github.com/Baseflow/flutter_cache_manager environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" 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.0-nullsafety.0 + firebase_storage: ">=8.0.0 <9.0.0" + path_provider: ^2.0.0 + path: ^1.8.0 dev_dependencies: flutter_test: From 23706e2e362f51b14f2f74c96298a8ebc139dd92 Mon Sep 17 00:00:00 2001 From: peter <16809252+percula@users.noreply.github.com> Date: Mon, 8 Mar 2021 22:07:28 -0500 Subject: [PATCH 2/4] Update version --- 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 6c31fecf..e51c56af 100644 --- a/flutter_cache_manager_firebase/pubspec.yaml +++ b/flutter_cache_manager_firebase/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_cache_manager_firebase description: CacheManager implementation for firebase_storage. Uses the gs:// as key and translates to https:// -version: 1.1.0 +version: 2.0.0-nullsafety.0 homepage: https://github.com/Baseflow/flutter_cache_manager environment: From 32dd291b6e4834285828b73a7bd6e8c1a993c764 Mon Sep 17 00:00:00 2001 From: Rene Floor Date: Fri, 28 May 2021 15:53:53 +0200 Subject: [PATCH 3/4] use lazy loading of instance --- .../lib/src/firebase_cache_manager.dart | 5 ++--- .../lib/src/firebase_http_file_service.dart | 2 +- 2 files changed, 3 insertions(+), 4 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 f05ebba7..492f9f02 100644 --- a/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart +++ b/flutter_cache_manager_firebase/lib/src/firebase_cache_manager.dart @@ -7,11 +7,10 @@ import 'firebase_http_file_service.dart'; class FirebaseCacheManager extends CacheManager { static const key = 'firebaseCache'; - static FirebaseCacheManager? _instance; + static late final FirebaseCacheManager _instance = FirebaseCacheManager._(); factory FirebaseCacheManager() { - _instance ??= FirebaseCacheManager._(); - return _instance!; + return _instance; } FirebaseCacheManager._() 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 8550e736..bc2c9554 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}) async { var ref = FirebaseStorage.instance.ref().child(url); var _url = await ref.getDownloadURL(); From c4b5ee6b87102dc13783d503d340645ad9868b99 Mon Sep 17 00:00:00 2001 From: Rene Floor Date: Fri, 28 May 2021 15:54:14 +0200 Subject: [PATCH 4/4] update changelog and pubspec --- flutter_cache_manager_firebase/CHANGELOG.md | 3 +++ flutter_cache_manager_firebase/pubspec.yaml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/flutter_cache_manager_firebase/CHANGELOG.md b/flutter_cache_manager_firebase/CHANGELOG.md index b8281917..d5480a45 100644 --- a/flutter_cache_manager_firebase/CHANGELOG.md +++ b/flutter_cache_manager_firebase/CHANGELOG.md @@ -1,3 +1,6 @@ +## [2.0.0] - 2021-05-28 +* Update to null safety + ## [1.1.0] - 2021-01-14 * Update Firebase dependency diff --git a/flutter_cache_manager_firebase/pubspec.yaml b/flutter_cache_manager_firebase/pubspec.yaml index e51c56af..ac6a8c3b 100644 --- a/flutter_cache_manager_firebase/pubspec.yaml +++ b/flutter_cache_manager_firebase/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_cache_manager_firebase description: CacheManager implementation for firebase_storage. Uses the gs:// as key and translates to https:// -version: 2.0.0-nullsafety.0 +version: 2.0.0 homepage: https://github.com/Baseflow/flutter_cache_manager environment: @@ -9,8 +9,8 @@ environment: dependencies: flutter: sdk: flutter - flutter_cache_manager: ^3.0.0-nullsafety.0 - firebase_storage: ">=8.0.0 <9.0.0" + flutter_cache_manager: ^3.0.0 + firebase_storage: ^8.0.0 path_provider: ^2.0.0 path: ^1.8.0