feat: Upgrade flame lint dependency (#1132)

bluefireteam · Jun 9, 2022 · 0d6dae3 · 0d6dae3
1 parent b523a39
commit 0d6dae3
Show file tree

Hide file tree

Showing 31 changed files with 232 additions and 161 deletions.
diff --git a/packages/audioplayers/example/lib/components/btn.dart b/packages/audioplayers/example/lib/components/btn.dart
@@ -11,7 +11,10 @@ class Btn extends StatelessWidget {
   Widget build(BuildContext context) {
     return ButtonTheme(
       minWidth: 48.0,
-      child: ElevatedButton(child: Text(txt), onPressed: onPressed),
+      child: ElevatedButton(
+        onPressed: onPressed,
+        child: Text(txt),
+      ),
     );
   }
 }
diff --git a/packages/audioplayers/example/lib/components/dlg.dart b/packages/audioplayers/example/lib/components/dlg.dart
@@ -1,7 +1,6 @@
+import 'package:audioplayers_example/components/btn.dart';
 import 'package:flutter/material.dart';
 
-import 'btn.dart';
-
 class SimpleDlg extends StatelessWidget {
   final String message, action;
 

diff --git a/packages/audioplayers/example/lib/components/player_widget.dart b/packages/audioplayers/example/lib/components/player_widget.dart
@@ -153,7 +153,7 @@ class _PlayerWidgetState extends State<PlayerWidget> {
     await player.stop();
     setState(() {
       _playerState = PlayerState.stopped;
-      _position = const Duration();
+      _position = Duration.zero;
     });
   }
 }
diff --git a/packages/audioplayers/example/lib/components/tab_wrapper.dart b/packages/audioplayers/example/lib/components/tab_wrapper.dart
@@ -16,8 +16,8 @@ class TabWrapper extends StatelessWidget {
             children: children
                 .map(
                   (w) => Container(
-                    child: w,
                     padding: const EdgeInsets.all(6.0),
+                    child: w,
                   ),
                 )
                 .toList(),

diff --git a/packages/audioplayers/example/lib/components/tgl.dart b/packages/audioplayers/example/lib/components/tgl.dart
@@ -15,9 +15,9 @@ class Tgl extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ToggleButtons(
-      children: options.map((it) => Text(it)).toList(),
       isSelected: options.asMap().keys.map((it) => it == selected).toList(),
       onPressed: onChange,
+      children: options.map((it) => Text(it)).toList(),
     );
   }
 }

diff --git a/packages/audioplayers/example/lib/main.dart b/packages/audioplayers/example/lib/main.dart
@@ -1,21 +1,22 @@
 import 'package:audioplayers/audioplayers.dart';
+import 'package:audioplayers_example/components/tabs.dart';
+import 'package:audioplayers_example/components/tgl.dart';
+import 'package:audioplayers_example/tabs/audio_context.dart';
+import 'package:audioplayers_example/tabs/controls.dart';
+import 'package:audioplayers_example/tabs/logger.dart';
+import 'package:audioplayers_example/tabs/sources.dart';
+import 'package:audioplayers_example/tabs/streams.dart';
 import 'package:flutter/material.dart';
 
-import 'components/tabs.dart';
-import 'components/tgl.dart';
-import 'tabs/audio_context.dart';
-import 'tabs/controls.dart';
-import 'tabs/logger.dart';
-import 'tabs/sources.dart';
-import 'tabs/streams.dart';
-
 typedef OnError = void Function(Exception exception);
 
 void main() {
-  runApp(MaterialApp(home: ExampleApp()));
+  runApp(const MaterialApp(home: ExampleApp()));
 }
 
 class ExampleApp extends StatefulWidget {
+  const ExampleApp({Key? key}) : super(key: key);
+
   @override
   _ExampleAppState createState() => _ExampleAppState();
 }

diff --git a/packages/audioplayers/example/lib/tabs/audio_context.dart b/packages/audioplayers/example/lib/tabs/audio_context.dart
@@ -1,11 +1,10 @@
 import 'package:audioplayers/audioplayers.dart';
+import 'package:audioplayers_example/components/btn.dart';
+import 'package:audioplayers_example/components/cbx.dart';
+import 'package:audioplayers_example/components/tab_wrapper.dart';
+import 'package:audioplayers_example/components/tabs.dart';
 import 'package:flutter/material.dart';
 
-import '../components/btn.dart';
-import '../components/cbx.dart';
-import '../components/tab_wrapper.dart';
-import '../components/tabs.dart';
-
 class AudioContextTab extends StatefulWidget {
   final AudioPlayer player;
 

diff --git a/packages/audioplayers/example/lib/tabs/controls.dart b/packages/audioplayers/example/lib/tabs/controls.dart
@@ -1,12 +1,11 @@
 import 'package:audioplayers/audioplayers.dart';
+import 'package:audioplayers_example/components/btn.dart';
+import 'package:audioplayers_example/components/tab_wrapper.dart';
+import 'package:audioplayers_example/components/tgl.dart';
+import 'package:audioplayers_example/components/txt.dart';
+import 'package:audioplayers_example/utils.dart';
 import 'package:flutter/material.dart';
 
-import '../components/btn.dart';
-import '../components/tab_wrapper.dart';
-import '../components/tgl.dart';
-import '../components/txt.dart';
-import '../utils.dart';
-
 class ControlsTab extends StatefulWidget {
   final AudioPlayer player;
 
@@ -19,7 +18,7 @@ class ControlsTab extends StatefulWidget {
 class _ControlsTabState extends State<ControlsTab> {
   String modalInputSeek = '';
 
-  void update(Future<void> Function() fn) async {
+  Future<void> update(Future<void> Function() fn) async {
     await fn();
     // update everyone who listens to "player"
     setState(() {});

diff --git a/packages/audioplayers/example/lib/tabs/logger.dart b/packages/audioplayers/example/lib/tabs/logger.dart
@@ -1,9 +1,8 @@
 import 'package:audioplayers/audioplayers.dart';
+import 'package:audioplayers_example/components/btn.dart';
+import 'package:audioplayers_example/components/tab_wrapper.dart';
 import 'package:flutter/material.dart';
 
-import '../components/btn.dart';
-import '../components/tab_wrapper.dart';
-
 class LoggerTab extends StatefulWidget {
   const LoggerTab({Key? key}) : super(key: key);
 

diff --git a/packages/audioplayers/example/lib/tabs/sources.dart b/packages/audioplayers/example/lib/tabs/sources.dart
@@ -1,11 +1,10 @@
 import 'package:audioplayers/audioplayers.dart';
+import 'package:audioplayers_example/components/btn.dart';
+import 'package:audioplayers_example/components/tab_wrapper.dart';
+import 'package:audioplayers_example/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 
-import '../components/btn.dart';
-import '../components/tab_wrapper.dart';
-import '../utils.dart';
-
 const _wavUrl1 = 'https://luan.xyz/files/audio/coins.wav';
 const _wavUrl2 = 'https://luan.xyz/files/audio/laser.wav';
 const _mp3Url1 = 'https://luan.xyz/files/audio/ambient_c_motion.mp3';
@@ -26,7 +25,7 @@ class SourcesTab extends StatefulWidget {
 }
 
 class _SourcesTabState extends State<SourcesTab> {
-  void setSource(Source source) async {
+  Future<void> setSource(Source source) async {
     await widget.player.setSource(source);
     toast('Completed setting source.');
   }
@@ -77,7 +76,7 @@ class _SourcesTabState extends State<SourcesTab> {
             setSource(BytesSource(bytes));
           },
         ),
-        // TODO(luan) add local files via file picker
+        // TODO(luan): add local files via file picker
       ],
     );
   }

diff --git a/packages/audioplayers/example/lib/tabs/streams.dart b/packages/audioplayers/example/lib/tabs/streams.dart
@@ -1,14 +1,13 @@
 import 'dart:async';
 
 import 'package:audioplayers/audioplayers.dart';
+import 'package:audioplayers_example/components/btn.dart';
+import 'package:audioplayers_example/components/pad.dart';
+import 'package:audioplayers_example/components/player_widget.dart';
+import 'package:audioplayers_example/components/tab_wrapper.dart';
+import 'package:audioplayers_example/utils.dart';
 import 'package:flutter/material.dart';
 
-import '../components/btn.dart';
-import '../components/pad.dart';
-import '../components/player_widget.dart';
-import '../components/tab_wrapper.dart';
-import '../utils.dart';
-
 class StreamsTab extends StatefulWidget {
   final AudioPlayer player;
 
@@ -46,12 +45,12 @@ class _StreamsTabState extends State<StreamsTab> {
     streams.forEach((it) => it.cancel());
   }
 
-  void getPosition() async {
+  Future<void> getPosition() async {
     final position = await widget.player.getCurrentPosition();
     setState(() => this.position = position);
   }
 
-  void getDuration() async {
+  Future<void> getDuration() async {
     final duration = await widget.player.getDuration();
     setState(() => this.duration = duration);
   }

diff --git a/packages/audioplayers/example/lib/utils.dart b/packages/audioplayers/example/lib/utils.dart
@@ -1,7 +1,6 @@
+import 'package:audioplayers_example/components/dlg.dart';
 import 'package:flutter/material.dart';
 
-import 'components/dlg.dart';
-
 extension StateExt<T extends StatefulWidget> on State<T> {
   void toast(String message) {
     ScaffoldMessenger.of(context).showSnackBar(

diff --git a/packages/audioplayers/example/linux/flutter/generated_plugins.cmake b/packages/audioplayers/example/linux/flutter/generated_plugins.cmake
@@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST
   audioplayers_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)
diff --git a/packages/audioplayers/example/pubspec.yaml b/packages/audioplayers/example/pubspec.yaml
@@ -2,19 +2,19 @@ name: audioplayers_example
 description: Demonstrates how to use the audioplayers plugin.
 
 dependencies:
-  flutter:
-    sdk: flutter
   audioplayers:
     path: ../
+  flutter:
+    sdk: flutter
   http: ^0.13.1
   path_provider: ^2.0.1
   path_provider_macos: ^2.0.0
   provider: 5.0.0
 
 dev_dependencies:
+  flame_lint: ^0.1.0
   integration_test:
     sdk: flutter
-  flame_lint: 0.0.1
 
 flutter:
   uses-material-design: true

diff --git a/packages/audioplayers/lib/src/audio_cache.dart b/packages/audioplayers/lib/src/audio_cache.dart
@@ -27,23 +27,27 @@ class AudioCache {
   /// A reference to the loaded files absolute URLs.
   ///
   /// This is a map of fileNames to pre-loaded URIs.
-  /// On mobile/desktop, the URIs are from local files where the bytes have been copied.
+  /// On mobile/desktop, the URIs are from local files where the bytes have been
+  /// copied.
   /// On web, the URIs are external links for pre-loaded files.
   Map<String, Uri> loadedFiles = {};
 
   /// This is the path inside your assets folder where your files lie.
   ///
-  /// For example, Flame uses the prefix 'assets/audio/' (you must include the final slash!).
+  /// For example, Flame uses the prefix 'assets/audio/' (you must include the
+  /// final slash!).
   /// The default prefix (if not provided) is 'assets/'
-  /// Your files will be found at <prefix><fileName> (so the trailing slash is crucial).
+  /// Your files will be found at <prefix><fileName> (so the trailing slash is
+  /// crucial).
   String prefix;
 
   AudioCache({this.prefix = 'assets/'});
 
   /// Clears the cache for the file [fileName].
   ///
   /// Does nothing if the file was not on cache.
-  /// Note: web relies on the browser cache which is handled entirely by the browser, thus this will no-op.
+  /// Note: web relies on the browser cache which is handled entirely by the
+  /// browser, thus this will no-op.
   Future<void> clear(Uri fileName) async {
     final uri = loadedFiles.remove(fileName);
     if (uri != null && !kIsWeb) {
@@ -79,7 +83,7 @@ class AudioCache {
 
   Uri _sanitizeURLForWeb(String fileName) {
     final tryAbsolute = Uri.tryParse(fileName);
-    if (tryAbsolute?.isAbsolute == true) {
+    if (tryAbsolute?.isAbsolute ?? false) {
       return tryAbsolute!;
     }
 

diff --git a/packages/audioplayers/lib/src/audioplayer.dart b/packages/audioplayers/lib/src/audioplayer.dart
@@ -1,12 +1,11 @@
 import 'dart:async';
 import 'dart:typed_data';
 
+import 'package:audioplayers/audioplayers.dart';
 import 'package:audioplayers_platform_interface/audioplayers_platform_interface.dart';
 import 'package:flutter/services.dart';
 import 'package:uuid/uuid.dart';
 
-import '../audioplayers.dart';
-
 const _uuid = Uuid();
 
 /// This represents a single AudioPlayer, which can play one audio at a time.

diff --git a/packages/audioplayers/lib/src/source.dart b/packages/audioplayers/lib/src/source.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'audioplayer.dart';
+import 'package:audioplayers/src/audioplayer.dart';
 
 /// A generic representation of a source from where audio can be pulled.
 ///

diff --git a/packages/audioplayers/pubspec.yaml b/packages/audioplayers/pubspec.yaml
@@ -20,23 +20,23 @@ flutter:
         default_package: audioplayers_windows
 
 dependencies:
-  audioplayers_platform_interface: ^1.0.0-rc.2
   audioplayers_android: ^1.0.0-rc.2
   audioplayers_darwin: ^1.0.0-rc.4
   audioplayers_linux: ^1.0.0-rc.3
+  audioplayers_platform_interface: ^1.0.0-rc.2
   audioplayers_web: ^1.0.0-rc.3
   audioplayers_windows: ^1.0.0-rc.3
-  uuid: ^3.0.1
-  path_provider: ^2.0.1
-  http: ^0.13.1
   flutter:
     sdk: flutter
+  http: ^0.13.1
+  path_provider: ^2.0.1
+  uuid: ^3.0.1
 
 dev_dependencies:
+  dartdoc: ^5.0.1
+  flame_lint: ^0.1.0
   flutter_test:
     sdk: flutter
-  flame_lint: 0.0.1
-  dartdoc: ^2.0.0
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

diff --git a/packages/audioplayers_android/pubspec.yaml b/packages/audioplayers_android/pubspec.yaml
@@ -17,10 +17,10 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  dartdoc: ^5.0.1
+  flame_lint: ^0.1.0
   flutter_test:
     sdk: flutter
-  flame_lint: 0.0.1
-  dartdoc: ^2.0.0
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

diff --git a/packages/audioplayers_darwin/pubspec.yaml b/packages/audioplayers_darwin/pubspec.yaml
@@ -18,10 +18,10 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  dartdoc: ^5.0.1
+  flame_lint: ^0.1.0
   flutter_test:
     sdk: flutter
-  flame_lint: 0.0.1
-  dartdoc: ^2.0.0
 
 environment:
   sdk: ">=2.14.0 <3.0.0"

diff --git a/packages/audioplayers_linux/pubspec.yaml b/packages/audioplayers_linux/pubspec.yaml
@@ -16,10 +16,10 @@ dependencies:
     sdk: flutter
 
 dev_dependencies:
+  dartdoc: ^5.0.1
+  flame_lint: ^0.1.0
   flutter_test:
     sdk: flutter
-  flame_lint: 0.0.1
-  dartdoc: ^2.0.0
 
 environment:
   sdk: ">=2.14.0 <3.0.0"