Merge pull request #324 from Baseflow/bugfix/fix-file

Move file export

Author: renefloor

flutter_cache_manager/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [3.1.1] - TBD
+* Move File to separate file. You can add it using the following import:
+```dart
+import 'package:flutter_cache_manager/file.dart' as cache_file;
+```
+
 ## [3.1.0] - 2021-05-28
 * Export File from package file ([#302](https://github.com/Baseflow/flutter_cache_manager/pull/302))
 * Bugfix for eTag on Flutter Web ([#304](https://github.com/Baseflow/flutter_cache_manager/pull/315))

flutter_cache_manager/lib/file.dart

@@ -0,0 +1 @@
+export 'package:file/file.dart' show File;

flutter_cache_manager/lib/flutter_cache_manager.dart

@@ -1,5 +1,3 @@
-export 'package:file/file.dart' show File;
-
 export 'src/cache_manager.dart';
 export 'src/cache_managers/cache_managers.dart';
 export 'src/compat/file_fetcher.dart';

flutter_cache_manager/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_cache_manager
 description: Generic cache manager for flutter. Saves web files on the storages of the device and saves the cache info using sqflite.
-version: 3.1.0
+version: 3.1.1
 homepage: https://github.com/Baseflow/flutter_cache_manager
 
 environment:

flutter_cache_manager/test/helpers/mock_file_service.dart

@@ -1,4 +1,4 @@
-import 'dart:io' as io;
+import 'dart:io';
 
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_cache_manager/src/web/file_service.dart';
@@ -24,7 +24,7 @@ class MockFileService extends MockFileServiceBase {
 class TestResponse extends FileServiceResponse {
   @override
   Stream<List<int>> get content async* {
-    var bytes = await io.File('test/images/image-120.png').readAsBytes();
+    var bytes = await File('test/images/image-120.png').readAsBytes();
     var length = bytes.length;
     var firstPart = (length / 2).floor();
     yield bytes.sublist(0, firstPart);

flutter_cache_manager/test/image_cache_manager_test.dart

@@ -1,4 +1,4 @@
-import 'dart:io' as io;
+import 'dart:io';
 import 'dart:typed_data';
 import 'dart:ui';
 
@@ -144,5 +144,5 @@ Future verifySize(
 }
 
 Future<Uint8List> getExampleImage() {
-  return io.File('test/images/image-120.png').readAsBytes();
+  return File('test/images/image-120.png').readAsBytes();
 }

flutter_cache_manager/test/repositories/json_file_repository_test.dart

@@ -1,4 +1,4 @@
-import 'dart:io' as io;
+import 'dart:io';
 
 import 'package:collection/collection.dart';
 import 'package:flutter_cache_manager/src/storage/cache_info_repositories/json_cache_info_repository.dart';
@@ -30,14 +30,14 @@ void main() {
     });
 
     test('Create repository with directory is successful', () {
-      var repository = JsonCacheInfoRepository.withFile(io.File(path));
+      var repository = JsonCacheInfoRepository.withFile(File(path));
       expect(repository, isNotNull);
     });
   });
 
   group('Open and close repository', () {
     test('Open repository should not throw', () async {
-      var repository = JsonCacheInfoRepository.withFile(io.File(path));
+      var repository = JsonCacheInfoRepository.withFile(File(path));
       await repository.open();
     });
 
@@ -59,7 +59,7 @@ void main() {
 
   group('Exist and delete', () {
     test('New repository does not exist', () async {
-      var repository = JsonCacheInfoRepository.withFile(io.File(path));
+      var repository = JsonCacheInfoRepository.withFile(File(path));
       var exists = await repository.exists();
       expect(exists, false);
     });