Merge 79fb123cbc into 63bf694d5c

lib/collections/assets.gen.dart

@@ -43,6 +43,7 @@ class $AssetsTutorialGen {
 class Assets {
   Assets._();
 
+  static const String license = 'LICENSE';
   static const AssetGenImage albumPlaceholder =
       AssetGenImage('assets/album-placeholder.png');
   static const AssetGenImage bengaliPatternsBg =
@@ -89,6 +90,7 @@ class Assets {
 
   /// List of all assets
   static List<dynamic> get values => [
+        license,
         albumPlaceholder,
         bengaliPatternsBg,
         branding,
@@ -117,10 +119,17 @@ class Assets {
 }
 
 class AssetGenImage {
-  const AssetGenImage(this._assetName);
+  const AssetGenImage(
+    this._assetName, {
+    this.size,
+    this.flavors = const {},
+  });
 
   final String _assetName;
 
+  final Size? size;
+  final Set<String> flavors;
+
   Image image({
     Key? key,
     AssetBundle? bundle,

lib/models/connect/connect.g.dart

@@ -16,7 +16,7 @@ _$WebSocketLoadEventDataPlaylistImpl
               ? null
               : PlaylistSimple.fromJson(
                   Map<String, dynamic>.from(json['collection'] as Map)),
-          initialIndex: json['initialIndex'] as int?,
+          initialIndex: (json['initialIndex'] as num?)?.toInt(),
           $type: json['runtimeType'] as String?,
         );
 
@@ -39,7 +39,7 @@ _$WebSocketLoadEventDataAlbumImpl _$$WebSocketLoadEventDataAlbumImplFromJson(
           ? null
           : AlbumSimple.fromJson(
               Map<String, dynamic>.from(json['collection'] as Map)),
-      initialIndex: json['initialIndex'] as int?,
+      initialIndex: (json['initialIndex'] as num?)?.toInt(),
       $type: json['runtimeType'] as String?,
     );
 

lib/services/sourced_track/models/source_info.g.dart

@@ -12,7 +12,7 @@ SourceInfo _$SourceInfoFromJson(Map json) => SourceInfo(
       artist: json['artist'] as String,
       thumbnail: json['thumbnail'] as String,
       pageUrl: json['pageUrl'] as String,
-      duration: Duration(microseconds: json['duration'] as int),
+      duration: Duration(microseconds: (json['duration'] as num).toInt()),
       artistUrl: json['artistUrl'] as String,
       album: json['album'] as String?,
     );

pubspec.yaml

@@ -48,7 +48,7 @@ dependencies:
   flutter_svg: ^1.1.6
   form_validator: ^2.1.1
   fuzzywuzzy: ^1.1.6
-  go_router: 12.1.3 # Stuck on this https://github.com/flutter/flutter/issues/140869
+  go_router: ^14.2.1 # Stuck on this https://github.com/flutter/flutter/issues/140869
   google_fonts: ^6.2.1
   hive: ^2.2.3
   hive_flutter: ^1.1.0
@@ -63,7 +63,7 @@ dependencies:
   media_kit_libs_audio: ^1.0.4
   metadata_god: ^0.5.2+1
   mime: ^1.0.2
-  package_info_plus: ^6.0.0
+  package_info_plus: ^8.0.1
   palette_generator: ^0.3.3
   path: ^1.8.0
   path_provider: ^2.1.3
@@ -80,7 +80,7 @@ dependencies:
   skeleton_text: ^3.0.1
   smtc_windows: ^0.1.3
   stroke_text: ^0.0.2
-  system_theme: ^2.1.0
+  system_theme: ^3.0.0
   titlebar_buttons: ^1.0.0
   url_launcher: ^6.2.6
   uuid: ^4.4.0
@@ -103,7 +103,7 @@ dependencies:
   html_unescape: ^2.0.0
   wikipedia_api: ^0.1.0
   skeletonizer: ^1.1.1
-  app_links: ^4.0.1
+  app_links: ^6.1.4
   win32_registry: ^1.1.3
   flutter_sharing_intent: ^1.1.0
   flutter_broadcasts: ^0.4.0
@@ -131,7 +131,7 @@ dev_dependencies:
   envied_generator: ^0.5.4+1
   flutter_gen_runner: ^5.4.0
   flutter_launcher_icons: ^0.13.1
-  flutter_lints: ^3.0.1
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
   integration_test:
@@ -141,7 +141,7 @@ dev_dependencies:
   freezed: ^2.5.2
   custom_lint: ^0.6.4
   riverpod_lint: ^2.3.10
-  process_run: ^0.14.2
+  process_run: ^1.1.0
   xml: ^6.5.0
   io: ^1.0.4