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

@@ -5,20 +5,22 @@ import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 void main() {
-  runApp(BaseflowPluginExample(
-    pluginName: 'Flutter Cache Manager',
-    githubURL: 'https://github.com/Baseflow/flutter_cache_manager',
-    pubDevURL: 'https://pub.dev/packages/flutter_cache_manager',
-    pages: [CacheManagerPage.createPage()],
-  ));
+  runApp(
+    BaseflowPluginExample(
+      pluginName: 'Flutter Cache Manager',
+      githubURL: 'https://github.com/Baseflow/flutter_cache_manager',
+      pubDevURL: 'https://pub.dev/packages/flutter_cache_manager',
+      pages: [CacheManagerPage.createPage()],
+    ),
+  );
   CacheManager.logLevel = CacheManagerLogLevel.verbose;
 }
 
 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({super.key});
 
   static ExamplePage createPage() {
     return ExamplePage(Icons.save_alt, (context) => const CacheManagerPage());
@@ -29,7 +31,7 @@ class CacheManagerPage extends StatefulWidget {
 }
 
 class _CacheManagerPageState extends State<CacheManagerPage> {
-  Stream<FileResponse> fileStream;
+  Stream<FileResponse>? fileStream;
 
   void _downloadFile() {
     setState(() {
@@ -41,16 +43,16 @@ class _CacheManagerPageState extends State<CacheManagerPage> {
   Widget build(BuildContext context) {
     if (fileStream == null) {
       return Scaffold(
-        appBar: null,
         body: const ListTile(
-            title: Text('Tap the floating action button to download.')),
+          title: Text('Tap the floating action button to download.'),
+        ),
         floatingActionButton: Fab(
           downloadFile: _downloadFile,
         ),
       );
     }
     return DownloadPage(
-      fileStream: fileStream,
+      fileStream: fileStream!,
       downloadFile: _downloadFile,
       clearCache: _clearCache,
       removeFile: _removeFile,

flutter_cache_manager/example/lib/plugin_example/download_page.dart

@@ -8,17 +8,17 @@ 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,
+    super.key,
+    required this.fileStream,
     this.downloadFile,
     this.clearCache,
     this.removeFile,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -27,7 +27,7 @@ class DownloadPage extends StatelessWidget {
       builder: (context, snapshot) {
         Widget body;
 
-        var loading = !snapshot.hasData || snapshot.data is DownloadProgress;
+        final loading = !snapshot.hasData || snapshot.data is DownloadProgress;
 
         if (snapshot.hasError) {
           body = ListTile(
@@ -36,17 +36,17 @@ class DownloadPage extends StatelessWidget {
           );
         } else if (loading) {
           body = p_i.ProgressIndicator(
-              progress: snapshot.data as DownloadProgress);
+            progress: snapshot.data as DownloadProgress,
+          );
         } else {
           body = FileInfoWidget(
-            fileInfo: snapshot.data as FileInfo,
+            fileInfo: snapshot.requireData as FileInfo,
             clearCache: clearCache,
             removeFile: removeFile,
           );
         }
 
         return Scaffold(
-          appBar: null,
           body: body,
           floatingActionButton: !loading
               ? Fab(

flutter_cache_manager/example/lib/plugin_example/file_info_widget.dart

@@ -3,52 +3,52 @@ 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 FileInfo? fileInfo;
+  final VoidCallback? clearCache;
+  final VoidCallback? removeFile;
 
   const FileInfoWidget({
-    Key key,
+    super.key,
     this.fileInfo,
     this.clearCache,
     this.removeFile,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
     return ListView(
       children: <Widget>[
         ListTile(
           title: const Text('Original URL'),
-          subtitle: Text(fileInfo.originalUrl),
+          subtitle: Text(fileInfo?.originalUrl ?? ''),
         ),
-        if (fileInfo.file != null)
+        if (fileInfo?.file != null)
           ListTile(
             title: const Text('Local file path'),
-            subtitle: Text(fileInfo.file.path),
+            subtitle: Text(fileInfo?.file.path ?? ''),
           ),
         ListTile(
           title: const Text('Loaded from'),
-          subtitle: Text(fileInfo.source.toString()),
+          subtitle: Text(fileInfo?.source.toString() ?? ''),
         ),
         ListTile(
           title: const Text('Valid Until'),
-          subtitle: Text(fileInfo.validTill.toIso8601String()),
+          subtitle: Text(fileInfo?.validTill.toIso8601String() ?? ''),
         ),
         Padding(
-          padding: const EdgeInsets.all(10.0),
+          padding: const EdgeInsets.all(10),
           // ignore: deprecated_member_use
-          child: RaisedButton(
-            child: const Text('CLEAR CACHE'),
+          child: ElevatedButton(
             onPressed: clearCache,
+            child: const Text('CLEAR CACHE'),
           ),
         ),
         Padding(
-          padding: const EdgeInsets.all(10.0),
+          padding: const EdgeInsets.all(10),
           // ignore: deprecated_member_use
-          child: RaisedButton(
-            child: const Text('REMOVE FILE'),
+          child: ElevatedButton(
             onPressed: removeFile,
+            child: const Text('REMOVE FILE'),
           ),
         ),
       ],

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({super.key, this.downloadFile});
 
   @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({super.key, this.progress});
 
   @override
   Widget build(BuildContext context) {
@@ -15,13 +15,13 @@ class ProgressIndicator extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
           SizedBox(
-            width: 50.0,
-            height: 50.0,
+            width: 50,
+            height: 50,
             child: CircularProgressIndicator(
               value: progress?.progress,
             ),
           ),
-          const SizedBox(width: 20.0),
+          const SizedBox(width: 20),
           const Text('Downloading'),
         ],
       ),

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