Upgrade to Dart 3 to compatibility with http ^1.0.0

flutter_cache_manager/.gitignore

@@ -1,95 +1,44 @@
 # Miscellaneous
 *.class
-*.lock
 *.log
 *.pyc
 *.swp
 .DS_Store
 .atom/
 .buildlog/
 .history
-.project
 .svn/
-bin/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
 .idea/
 
-# Android Studio related
-android/.classpath
-android/.settings/
-
-# Visual Studio Code related
-.vscode/
-
-# Flutter repo-specific
-/bin/cache/
-/bin/mingit/
-/dev/benchmarks/mega_gallery/
-/dev/bots/.recipe_deps
-/dev/bots/android_tools/
-/dev/docs/doc/
-/dev/docs/lib/
-/dev/docs/pubspec.yaml
-/packages/flutter/coverage/
-version
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
-build/
-flutter_*.png
-linked_*.ds
-unlinked.ds
-unlinked_spec.ds
-flutter_export_environment.sh
+/build/
 
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
+# Symbolication related
+app.*.symbols
 
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
+# Obfuscation related
+app.*.map.json
 
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-example/.flutter-plugins-dependencies
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release

flutter_cache_manager/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [3.4.0] - 2023-05-29
+* Require Dart ^3.0.0 (for http ^1.0.0)
+
 ## [3.3.0] - 2021-11-29
 * Added option to manage the log level. Doesn't print failed downloads by default anymore. You can set it like this:
 ```dart

flutter_cache_manager/example/lib/main.dart

@@ -18,7 +18,7 @@ const url = 'https://blurha.sh/assets/images/img1.jpg';
 
 /// Example [Widget] showing the functionalities of flutter_cache_manager
 class CacheManagerPage extends StatefulWidget {
-  const CacheManagerPage({Key key}) : super(key: key);
+  const CacheManagerPage({Key? key}) : super(key: key);
 
   static ExamplePage createPage() {
     return ExamplePage(Icons.save_alt, (context) => const CacheManagerPage());
@@ -29,7 +29,7 @@ class CacheManagerPage extends StatefulWidget {
 }
 
 class _CacheManagerPageState extends State<CacheManagerPage> {
-  Stream<FileResponse> fileStream;
+  Stream<FileResponse>? fileStream;
 
   void _downloadFile() {
     setState(() {
@@ -50,7 +50,7 @@ class _CacheManagerPageState extends State<CacheManagerPage> {
       );
     }
     return DownloadPage(
-      fileStream: fileStream,
+      fileStream: fileStream!,
       downloadFile: _downloadFile,
       clearCache: _clearCache,
       removeFile: _removeFile,

flutter_cache_manager/example/lib/plugin_example/download_page.dart

@@ -8,13 +8,13 @@ import 'progress_indicator.dart' as p_i;
 /// A [Widget] showing the information about the status of the [FileResponse]
 class DownloadPage extends StatelessWidget {
   final Stream<FileResponse> fileStream;
-  final VoidCallback downloadFile;
-  final VoidCallback clearCache;
-  final VoidCallback removeFile;
+  final VoidCallback? downloadFile;
+  final VoidCallback? clearCache;
+  final VoidCallback? removeFile;
 
   const DownloadPage({
-    Key key,
-    this.fileStream,
+    Key? key,
+    required this.fileStream,
     this.downloadFile,
     this.clearCache,
     this.removeFile,

flutter_cache_manager/example/lib/plugin_example/file_info_widget.dart

@@ -4,12 +4,12 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 /// A [Widget] showing all available information about the downloaded file
 class FileInfoWidget extends StatelessWidget {
   final FileInfo fileInfo;
-  final VoidCallback clearCache;
-  final VoidCallback removeFile;
+  final VoidCallback? clearCache;
+  final VoidCallback? removeFile;
 
   const FileInfoWidget({
-    Key key,
-    this.fileInfo,
+    Key? key,
+    required this.fileInfo,
     this.clearCache,
     this.removeFile,
   }) : super(key: key);
@@ -38,15 +38,15 @@ class FileInfoWidget extends StatelessWidget {
         Padding(
           padding: const EdgeInsets.all(10.0),
           // ignore: deprecated_member_use
-          child: RaisedButton(
+          child: ElevatedButton(
             child: const Text('CLEAR CACHE'),
             onPressed: clearCache,
           ),
         ),
         Padding(
           padding: const EdgeInsets.all(10.0),
           // ignore: deprecated_member_use
-          child: RaisedButton(
+          child: ElevatedButton(
             child: const Text('REMOVE FILE'),
             onPressed: removeFile,
           ),

flutter_cache_manager/example/lib/plugin_example/floating_action_button.dart

@@ -2,8 +2,9 @@ import 'package:flutter/material.dart';
 
 /// A [FloatingActionButton] used for downloading a file in [CacheManagerPage]
 class Fab extends StatelessWidget {
-  final VoidCallback downloadFile;
-  const Fab({Key key, this.downloadFile}) : super(key: key);
+  final VoidCallback? downloadFile;
+
+  const Fab({Key? key, this.downloadFile}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

flutter_cache_manager/example/lib/plugin_example/progress_indicator.dart

@@ -4,9 +4,9 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 /// A centered and sized [CircularProgressIndicator] to show download progress
 /// in the [DownloadPage].
 class ProgressIndicator extends StatelessWidget {
-  final DownloadProgress progress;
+  final DownloadProgress? progress;
 
-  const ProgressIndicator({Key key, this.progress}) : super(key: key);
+  const ProgressIndicator({Key? key, this.progress}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {

flutter_cache_manager/example/linux/flutter/generated_plugins.cmake

@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_linux
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

flutter_cache_manager/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,7 +5,7 @@
 import FlutterMacOS
 import Foundation
 
-import path_provider_macos
+import path_provider_foundation
 import sqflite
 import url_launcher_macos
 

flutter_cache_manager/example/pubspec.yaml

@@ -5,24 +5,24 @@ publish_to: none
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.10.2 <3.0.0"
+  sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
   baseflow_plugin_template:
     git:
       url: https://github.com/Baseflow/baseflow_plugin_template.git
-      ref: v1.0.0
-  cupertino_icons: ^1.0.2
+      ref: v2.1.0
+  cupertino_icons: ^1.0.5
   flutter:
     sdk: flutter
   flutter_cache_manager:
     path: ../
-  url_launcher: ^5.4.11
+  url_launcher: ^6.1.11
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^1.0.4
+  flutter_lints: ^2.0.1
 
 
 # The following section is specific to Flutter.

flutter_cache_manager/example/windows/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <url_launcher_windows/url_launcher_plugin.h>
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  UrlLauncherPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("UrlLauncherPlugin"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

flutter_cache_manager/example/windows/flutter/generated_plugins.cmake

@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   url_launcher_windows
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)

flutter_cache_manager/lib/src/cache_manager.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:file/file.dart';
-import 'package:flutter/foundation.dart';
+import 'package:flutter/foundation.dart' show visibleForTesting;
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_cache_manager/src/cache_store.dart';
 import 'package:flutter_cache_manager/src/storage/cache_object.dart';

flutter_cache_manager/lib/src/cache_managers/default_cache_manager.dart

@@ -7,6 +7,7 @@ class DefaultCacheManager extends CacheManager with ImageCacheManager {
   static const key = 'libCachedImageData';
 
   static final DefaultCacheManager _instance = DefaultCacheManager._();
+
   factory DefaultCacheManager() {
     return _instance;
   }

flutter_cache_manager/lib/src/cache_store.dart

@@ -1,8 +1,7 @@
 import 'dart:async';
 
-import 'package:flutter_cache_manager/src/storage/file_system/file_system.dart';
-
 import '../flutter_cache_manager.dart';
+import '../src/storage/file_system/file_system.dart';
 import 'storage/cache_object.dart';
 
 ///Flutter Cache Manager
@@ -18,9 +17,12 @@ class CacheStore {
   FileSystem fileSystem;
 
   final Config _config;
+
   String get storeKey => _config.cacheKey;
   final Future<CacheInfoRepository> _cacheInfoRepository;
+
   int get _capacity => _config.maxNrOfCacheObjects;
+
   Duration get _maxAge => _config.stalePeriod;
 
   DateTime lastCleanupRun = DateTime.now();

flutter_cache_manager/lib/src/compat/file_service_compat.dart

@@ -7,6 +7,7 @@ import '../web/mime_converter.dart';
 
 class FileServiceCompat extends FileService {
   final FileFetcher fileFetcher;
+
   FileServiceCompat(this.fileFetcher);
 
   @override

flutter_cache_manager/lib/src/config/config.dart

@@ -32,9 +32,14 @@ abstract class Config {
   }) = impl.Config;
 
   String get cacheKey;
+
   Duration get stalePeriod;
+
   int get maxNrOfCacheObjects;
+
   CacheInfoRepository get repo;
+
   FileSystem get fileSystem;
+
   FileService get fileService;
 }