upgraded Flutter to stable v3.27.0

.flutter

@@ -1 +1 @@
-Subproject commit dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+Subproject commit 8495dee1fd4aacbe9de707e7581203232f591b2f

.github/workflows/quality-check.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Get Flutter packages
-        run: scripts/pub_get_all.sh
+        run: ./flutterw pub get
 
       - name: Static analysis.
         run: ./flutterw analyze

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Get Flutter packages
-        run: scripts/pub_get_all.sh
+        run: ./flutterw pub get
 
       - name: Update Flutter version file
         run: scripts/update_flutter_version.sh

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## <a id="unreleased"></a>[Unreleased]
 
+### Changed
+
+- upgraded Flutter to stable v3.27.0
+
 ## <a id="v1.11.20"></a>[v1.11.20] - 2024-12-11
 
 ### Added

android/app/src/main/AndroidManifest.xml

@@ -330,9 +330,6 @@
             android:name="flutterEmbedding"
             android:value="2" />
         <!--
-        Impeller is not supported by `media_kit` v1.1.10+1:
-        https://github.com/media-kit/media-kit/issues/707
-
         Screenshot driver scenario is not supported by Impeller:
         "Compressed screenshots not supported for Impeller"
         -->

lib/model/covers.dart

@@ -9,6 +9,7 @@ import 'package:aves/model/vaults/vaults.dart';
 import 'package:aves/services/common/services.dart';
 import 'package:aves/utils/android_file_utils.dart';
 import 'package:aves_model/aves_model.dart';
+import 'package:aves_utils/aves_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/foundation.dart';
@@ -178,14 +179,14 @@ class Covers {
           final volume = androidFileUtils.getStorageVolume(path)?.path;
           final relativePath = volume != null ? path?.substring(volume.length) : null;
           final packageName = row.packageName;
-          final colorValue = row.color?.value;
+          final colorJson = row.color?.toJson();
 
           return {
             'filter': row.filter.toJson(),
             if (volume != null) 'volume': volume,
             if (relativePath != null) 'relativePath': relativePath,
             if (packageName != null) 'packageName': packageName,
-            if (colorValue != null) 'color': colorValue,
+            if (colorJson != null) 'color': colorJson,
           };
         })
         .nonNulls
@@ -201,33 +202,39 @@ class Covers {
 
     final visibleEntries = source.visibleEntries;
     jsonList.forEach((row) {
-      final filter = CollectionFilter.fromJson(row['filter']);
+      try {
-      if (filter == null) {
+        final filter = CollectionFilter.fromJson(row['filter']);
-        debugPrint('failed to import cover for row=$row');
+        if (filter == null) {
-        return;
+          debugPrint('failed to import cover for row=$row');
-      }
+          return;
-
-      final volume = row['volume'] as String?;
-      final relativePath = row['relativePath'] as String?;
-      final packageName = row['packageName'] as String?;
-      final colorValue = row['color'] as int?;
-
-      AvesEntry? entry;
-      if (volume != null && relativePath != null) {
-        final path = pContext.join(volume, relativePath);
-        entry = visibleEntries.firstWhereOrNull((entry) => entry.path == path && filter.test(entry));
-        if (entry == null) {
-          debugPrint('failed to import cover entry for path=$path, filter=$filter');
         }
-      }
 
-      if (entry != null || packageName != null || colorValue != null) {
+        final volume = row['volume'] as String?;
-        set(
+        final relativePath = row['relativePath'] as String?;
-          filter: filter,
+        final packageName = row['packageName'] as String?;
-          entryId: entry?.id,
+        final color = row['color'];
-          packageName: packageName,
+        // for backward compatibility, color used to be an `int`, now a `string`
-          color: colorValue != null ? Color(colorValue) : null,
+        final colorJson = color is String ? color : null;
-        );
+
+        AvesEntry? entry;
+        if (volume != null && relativePath != null) {
+          final path = pContext.join(volume, relativePath);
+          entry = visibleEntries.firstWhereOrNull((entry) => entry.path == path && filter.test(entry));
+          if (entry == null) {
+            debugPrint('failed to import cover entry for path=$path, filter=$filter');
+          }
+        }
+
+        if (entry != null || packageName != null || colorJson != null) {
+          set(
+            filter: filter,
+            entryId: entry?.id,
+            packageName: packageName,
+            color: ExtraColor.fromJson(colorJson),
+          );
+        }
+      } catch (error, stack) {
+        debugPrint('failed to import cover for row=$row with error=$error\n$stack');
       }
     });
   }
@@ -254,13 +261,15 @@ class CoverRow extends Equatable {
     final filter = CollectionFilter.fromJson(map['filter']);
     if (filter == null) return null;
 
-    final colorValue = map['color'] as int?;
+    final entryId = map['entryId'] as int?;
-    final color = colorValue != null ? Color(colorValue) : null;
+    final packageName = map['packageName'] as String?;
+    final colorJson = map['color'] as String?;
+
     return CoverRow(
       filter: filter,
-      entryId: map['entryId'] as int?,
+      entryId: entryId,
-      packageName: map['packageName'] as String?,
+      packageName: packageName,
-      color: color,
+      color: ExtraColor.fromJson(colorJson),
     );
   }
 
@@ -268,6 +277,6 @@ class CoverRow extends Equatable {
         'filter': filter.toJson(),
         'entryId': entryId,
         'packageName': packageName,
-        'color': color?.value,
+        'color': color?.toJson(),
       };
 }

lib/model/db/db_sqflite.dart

@@ -33,7 +33,8 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
   static const trashTable = 'trash';
   static const videoPlaybackTable = 'videoPlayback';
 
-  static const _queryCursorBufferSize = 1000;
+  static const _entryInsertSliceMaxCount = 10000; // number of entries
+  static const _queryCursorBufferSize = 1000; // number of rows
   static int _lastId = 0;
 
   @override
@@ -93,7 +94,7 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
             'filter TEXT PRIMARY KEY'
             ', entryId INTEGER'
             ', packageName TEXT'
-            ', color INTEGER'
+            ', color TEXT'
             ')');
         await db.execute('CREATE TABLE $dynamicAlbumTable('
             'name TEXT PRIMARY KEY'
@@ -116,7 +117,7 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
             ')');
       },
       onUpgrade: LocalMediaDbUpgrader.upgradeDb,
-      version: 12,
+      version: 13,
     );
 
     final maxIdRows = await _db.rawQuery('SELECT MAX(id) AS maxId FROM $entryTable');
@@ -224,9 +225,15 @@ class SqfliteLocalMediaDb implements LocalMediaDb {
   Future<void> insertEntries(Set<AvesEntry> entries) async {
     if (entries.isEmpty) return;
     final stopwatch = Stopwatch()..start();
-    final batch = _db.batch();
+    // slice entries to avoid memory issues
-    entries.forEach((entry) => _batchInsertEntry(batch, entry));
+    int inserted = 0;
-    await batch.commit(noResult: true);
+    await Future.forEach(entries.slices(_entryInsertSliceMaxCount), (slice) async {
+      debugPrint('$runtimeType saveEntries inserting slice of [${inserted + 1}, ${inserted + slice.length}] entries');
+      final batch = _db.batch();
+      slice.forEach((entry) => _batchInsertEntry(batch, entry));
+      await batch.commit(noResult: true);
+      inserted += slice.length;
+    });
     debugPrint('$runtimeType saveEntries complete in ${stopwatch.elapsed.inMilliseconds}ms for ${entries.length} entries');
   }
 

lib/model/db/db_sqflite_upgrade.dart

@@ -1,4 +1,8 @@
+import 'dart:ui';
+
+import 'package:aves/model/covers.dart';
 import 'package:aves/model/db/db_sqflite.dart';
+import 'package:aves/model/filters/filters.dart';
 import 'package:flutter/foundation.dart';
 import 'package:sqflite/sqflite.dart';
 
@@ -41,6 +45,8 @@ class LocalMediaDbUpgrader {
           await _upgradeFrom10(db);
         case 11:
           await _upgradeFrom11(db);
+        case 12:
+          await _upgradeFrom12(db);
       }
       oldVersion++;
     }
@@ -388,4 +394,54 @@ class LocalMediaDbUpgrader {
         ', filter TEXT'
         ')');
   }
+
+  static Future<void> _upgradeFrom12(Database db) async {
+    debugPrint('upgrading DB from v12');
+
+    // retrieve covers stored with `int` color value
+    final rows = <CoverRow>{};
+    final cursor = await db.queryCursor(coverTable);
+    while (await cursor.moveNext()) {
+      final Map map = cursor.current;
+      final filter = CollectionFilter.fromJson(map['filter']);
+      if (filter != null) {
+        final colorValue = map['color'] as int?;
+        final color = colorValue != null ? Color(colorValue) : null;
+        final row = CoverRow(
+          filter: filter,
+          entryId: map['entryId'] as int?,
+          packageName: map['packageName'] as String?,
+          color: color,
+        );
+        rows.add(row);
+      }
+    }
+
+    // convert `color` column type from value number to JSON string
+    await db.transaction((txn) async {
+      const newCoverTable = '${coverTable}TEMP';
+      await db.execute('CREATE TABLE $newCoverTable('
+          'filter TEXT PRIMARY KEY'
+          ', entryId INTEGER'
+          ', packageName TEXT'
+          ', color TEXT'
+          ')');
+
+      // insert covers with `string` color value
+      if (rows.isNotEmpty) {
+        final batch = db.batch();
+        rows.forEach((row) {
+          batch.insert(
+            newCoverTable,
+            row.toMap(),
+            conflictAlgorithm: ConflictAlgorithm.replace,
+          );
+        });
+        await batch.commit(noResult: true);
+      }
+
+      await db.execute('DROP TABLE $coverTable;');
+      await db.execute('ALTER TABLE $newCoverTable RENAME TO $coverTable;');
+    });
+  }
 }

lib/model/filters/filters.dart

@@ -99,18 +99,18 @@ abstract class CollectionFilter extends Equatable implements Comparable<Collecti
     return null;
   }
 
-  static CollectionFilter? fromJson(String jsonString) {
+  static CollectionFilter? fromJson(String? jsonString) {
-    if (jsonString.isEmpty) return null;
+    if (jsonString == null || jsonString.isEmpty) return null;
 
     try {
       final jsonMap = jsonDecode(jsonString);
       if (jsonMap is Map<String, dynamic>) {
         return _fromMap(jsonMap);
       }
+      debugPrint('failed to parse filter from json=$jsonString');
     } catch (error, stack) {
       debugPrint('failed to parse filter from json=$jsonString error=$error\n$stack');
     }
-    debugPrint('failed to parse filter from json=$jsonString');
     return null;
   }
 

lib/model/settings/settings.dart

@@ -368,8 +368,6 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
           }
         } else {
           switch (key) {
-            case SettingKeys.subtitleTextColorKey:
-            case SettingKeys.subtitleBackgroundColorKey:
             case SettingKeys.convertQualityKey:
             case SettingKeys.screenSaverIntervalKey:
             case SettingKeys.slideshowIntervalKey:
@@ -466,6 +464,8 @@ class Settings with ChangeNotifier, SettingsAccess, AppSettings, DisplaySettings
             case SettingKeys.videoResumptionModeKey:
             case SettingKeys.subtitleTextAlignmentKey:
             case SettingKeys.subtitleTextPositionKey:
+            case SettingKeys.subtitleTextColorKey:
+            case SettingKeys.subtitleBackgroundColorKey:
             case SettingKeys.tagEditorExpandedSectionKey:
             case SettingKeys.convertMimeTypeKey:
             case SettingKeys.mapStyleKey:

lib/model/source/media_store_source.dart

@@ -209,7 +209,7 @@ class MediaStoreSource extends CollectionSource {
       },
       onDone: () async {
         if (newEntries.isNotEmpty) {
-          debugPrint('$runtimeType load ${stopwatch.elapsed} save new entries');
+          debugPrint('$runtimeType load ${stopwatch.elapsed} save ${newEntries.length} new entries');
           await localMediaDb.insertEntries(newEntries);
 
           // TODO TLAD find duplication cause

lib/theme/themes.dart

@@ -41,11 +41,11 @@ class Themes {
 
   static Color _schemeThirdLayer(ColorScheme colors) => _isDarkTheme(colors) ? colors.surfaceContainerHighest : colors.surfaceContainerHigh;
 
-  static Color _unselectedWidgetColor(ColorScheme colors) => colors.onSurface.withAlpha((255.0 * .6).round());
+  static Color _unselectedWidgetColor(ColorScheme colors) => colors.onSurface.withValues(alpha: .6);
 
   static Color backgroundTextColor(BuildContext context) {
     final colors = Theme.of(context).colorScheme;
-    return Color.alphaBlend(colors.surfaceTint, colors.onSurface).withAlpha((255.0 * .5).round());
+    return Color.alphaBlend(colors.surfaceTint, colors.onSurface).withValues(alpha: .5);
   }
 
   static final _typography = Typography.material2021(platform: TargetPlatform.android);
@@ -98,7 +98,7 @@ class Themes {
         // adapted from M3 defaults
         final TextStyle style = textTheme.labelLarge!;
         if (states.contains(WidgetState.disabled)) {
-          return style.apply(color: colors.onSurface.withAlpha((255.0 * .38).round()));
+          return style.apply(color: colors.onSurface.withValues(alpha: .38));
         }
         return style.apply(color: colors.onSurface);
       }),
@@ -118,12 +118,12 @@ class Themes {
         fillColor: WidgetStateProperty.resolveWith<Color>((states) {
           if (states.contains(WidgetState.selected)) {
             if (states.contains(WidgetState.disabled)) {
-              return colors.onSurface.withAlpha((255.0 * .38).round());
+              return colors.onSurface.withValues(alpha: .38);
             }
             return colors.primary;
           }
           if (states.contains(WidgetState.disabled)) {
-            return colors.onSurface.withAlpha((255.0 * .38).round());
+            return colors.onSurface.withValues(alpha: .38);
           }
           if (states.contains(WidgetState.pressed)) {
             return colors.onSurface;
@@ -139,7 +139,7 @@ class Themes {
       );
 
   static SliderThemeData _sliderTheme(ColorScheme colors) => SliderThemeData(
-        inactiveTrackColor: colors.primary.withAlpha((255.0 * .24).round()),
+        inactiveTrackColor: colors.primary.withValues(alpha: .24),
       );
 
   static SnackBarThemeData _snackBarTheme(ColorScheme colors) => SnackBarThemeData(

lib/widgets/about/about_tv_page.dart

@@ -103,7 +103,7 @@ class _ContentState extends State<_Content> {
                   return ListTile(
                     title: DefaultTextStyle(
                       style: theme.textTheme.bodyLarge!.copyWith(
-                        color: isSelected ? colors.primary : colors.onSurface.withAlpha((255.0 * .64).round()),
+                        color: isSelected ? colors.primary : colors.onSurface.withValues(alpha: .64),
                       ),
                       child: _getTitle(_Section.values[index]),
                     ),

lib/widgets/about/translators.dart

@@ -62,19 +62,19 @@ class _RandomTextSpanHighlighterState extends State<_RandomTextSpanHighlighter>
 
     final color = widget.color;
     _baseStyle = TextStyle(
-      color: color.withAlpha((255.0 * .7).round()),
+      color: color.withValues(alpha: .7),
       shadows: [
         Shadow(
-          color: color.withAlpha(0),
+          color: color.withValues(alpha: 0),
           blurRadius: 0,
         )
       ],
     );
     final highlightStyle = TextStyle(
-      color: color.withAlpha(255),
+      color: color.withValues(alpha: 1),
       shadows: [
         Shadow(
-          color: color.withAlpha(255),
+          color: color.withValues(alpha: 1),
           blurRadius: 3,
         )
       ],

lib/widgets/collection/collection_grid.dart

@@ -426,7 +426,7 @@ class _CollectionScaler extends StatelessWidget {
       ),
       mosaicItemBuilder: (index, targetExtent) => DecoratedBox(
         decoration: BoxDecoration(
-          color: ThumbnailImage.computeLoadingBackgroundColor(index * 10, brightness).withAlpha((255.0 * .9).round()),
+          color: ThumbnailImage.computeLoadingBackgroundColor(index * 10, brightness).withValues(alpha: .9),
           border: Border.all(
             color: borderColor,
             width: borderWidth,

lib/widgets/common/action_mixins/feedback.dart

@@ -257,7 +257,7 @@ class _ReportOverlayState<T> extends State<ReportOverlay<T>> with SingleTickerPr
                   percent: percent,
                   lineWidth: strokeWidth,
                   radius: diameter / 2,
-                  backgroundColor: colorScheme.onSurface.withAlpha((255.0 * .2).round()),
+                  backgroundColor: colorScheme.onSurface.withValues(alpha: .2),
                   progressColor: progressColor,
                   animation: animate,
                   center: total != null
@@ -314,7 +314,7 @@ class ReportProgressIndicator extends StatelessWidget {
       height: diameter,
       padding: const EdgeInsets.all(strokeWidth / 2),
       child: CircularProgressIndicator(
-        color: progressColor.withAlpha((255.0 * opacity).round()),
+        color: progressColor.withValues(alpha: opacity),
         strokeWidth: strokeWidth,
       ),
     );

lib/widgets/common/app_bar/sliver_app_bar_title.dart

@@ -16,7 +16,7 @@ class SliverAppBarTitleWrapper extends StatelessWidget {
     final toolbarOpacity = context.dependOnInheritedWidgetOfExactType<FlexibleSpaceBarSettings>()!.toolbarOpacity;
     final baseColor = (DefaultTextStyle.of(context).style.color ?? Theme.of(context).textTheme.titleLarge!.color!);
     return DefaultTextStyle.merge(
-      style: TextStyle(color: baseColor.withAlpha((255.0 * toolbarOpacity).round())),
+      style: TextStyle(color: baseColor.withValues(alpha: toolbarOpacity)),
       child: child,
     );
   }

lib/widgets/common/basic/text/background_painter.dart

@@ -23,7 +23,7 @@ class TextBackgroundPainter extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final backgroundColor = style.backgroundColor;
-    if (backgroundColor == null || backgroundColor.alpha == 0) {
+    if (backgroundColor == null || backgroundColor.a == 0) {
       return child;
     }
 

lib/widgets/common/basic/wheel.dart

@@ -81,7 +81,7 @@ class _WheelSelectorState<T> extends State<WheelSelector<T>> {
                           height: itemSize.height,
                           duration: transitionDuration,
                           decoration: BoxDecoration(
-                            color: foreground.withAlpha((255.0 * (focused ? .2 : 0)).round()),
+                            color: foreground.withValues(alpha: focused ? .2 : 0),
                             borderRadius: const BorderRadius.all(Radius.circular(8)),
                           ),
                         );

lib/widgets/common/grid/overlay.dart

@@ -31,7 +31,7 @@ class GridItemSelectionOverlay<T> extends StatelessWidget {
                   alignment: AlignmentDirectional.topEnd,
                   padding: padding,
                   decoration: BoxDecoration(
-                    color: isSelected ? Theme.of(context).colorScheme.primary.withAlpha((255.0 * .6).round()) : Colors.transparent,
+                    color: isSelected ? Theme.of(context).colorScheme.primary.withValues(alpha: .6) : Colors.transparent,
                     borderRadius: borderRadius,
                   ),
                   duration: duration,

lib/widgets/common/grid/sections/fixed/scale_grid.dart

@@ -77,7 +77,7 @@ class FixedExtentGridPainter extends CustomPainter {
       ..shader = strokeShader;
     final fillPaint = Paint()
       ..style = PaintingStyle.fill
-      ..color = color.withAlpha((255.0 * .25).round());
+      ..color = color.withValues(alpha: .25);
 
     final chipWidth = chipSize.width;
     final chipHeight = chipSize.height;

lib/widgets/common/grid/sections/mosaic/scale_overlay.dart

@@ -51,7 +51,7 @@ class MosaicScaleOverlay extends StatelessWidget {
                       child: Stack(
                         alignment: Alignment.center,
                         children: [
-                          _buildBar(extentMax, colorScheme.onSurface.withAlpha((255.0 * .2).round())),
+                          _buildBar(extentMax, colorScheme.onSurface.withValues(alpha: .2)),
                           _buildBar(scaledSize.width, colorScheme.primary),
                         ],
                       ),

lib/widgets/common/identity/aves_app_bar.dart

@@ -274,7 +274,7 @@ class _AvesFloatingBarState extends State<AvesFloatingBar> with RouteAware {
             borderRadius: AvesFloatingBar.borderRadius,
             child: widget.builder(
               context,
-              blurred ? backgroundColor.withAlpha((255.0 * .85).round()) : backgroundColor,
+              blurred ? backgroundColor.withValues(alpha: .85) : backgroundColor,
               widget.child,
             ),
           ),

lib/widgets/common/identity/buttons/captioned_button.dart

@@ -164,7 +164,7 @@ class CaptionedButtonText extends StatelessWidget {
   Widget build(BuildContext context) {
     var style = DefaultTextStyle.of(context).style;
     if (!enabled) {
-      style = style.copyWith(color: style.color!.withAlpha((255.0 * .2).round()));
+      style = style.copyWith(color: style.color!.withValues(alpha: .2));
     }
 
     return Text(

lib/widgets/common/identity/buttons/outlined_button.dart

@@ -15,15 +15,17 @@ class AvesOutlinedButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
+    final foreground = WidgetStateProperty.resolveWith<Color>((states) {
+      return states.contains(WidgetState.disabled) ? theme.disabledColor : theme.colorScheme.onSurface;
+    });
     final style = ButtonStyle(
+      foregroundColor: foreground,
+      iconColor: foreground,
       side: WidgetStateProperty.resolveWith<BorderSide>((states) {
         return BorderSide(
           color: states.contains(WidgetState.disabled) ? theme.disabledColor : theme.colorScheme.primary,
         );
       }),
-      foregroundColor: WidgetStateProperty.resolveWith<Color>((states) {
-        return states.contains(WidgetState.disabled) ? theme.disabledColor : theme.colorScheme.onSurface;
-      }),
     );
     return icon != null
         ? OutlinedButton.icon(

lib/widgets/common/identity/buttons/overlay_button.dart

@@ -167,6 +167,7 @@ class OverlayTextButton extends StatelessWidget {
   Widget build(BuildContext context) {
     final blurred = settings.enableBlurEffect;
     final theme = Theme.of(context);
+    final foreground = theme.colorScheme.onSurface;
     return BlurredRRect.all(
       enabled: blurred,
       borderRadius: _borderRadius,
@@ -174,9 +175,10 @@ class OverlayTextButton extends StatelessWidget {
         onPressed: onPressed,
         style: ButtonStyle(
           backgroundColor: WidgetStateProperty.all<Color>(Themes.overlayBackgroundColor(brightness: theme.brightness, blurred: blurred)),
-          foregroundColor: WidgetStateProperty.all<Color>(theme.colorScheme.onSurface),
+          foregroundColor: WidgetStateProperty.all<Color>(foreground),
-          overlayColor: theme.isDark ? WidgetStateProperty.all<Color>(Colors.white.withAlpha((255.0 * .12).round())) : null,
+          overlayColor: theme.isDark ? WidgetStateProperty.all<Color>(Colors.white.withValues(alpha: .12)) : null,
           minimumSize: _minSize,
+          iconColor: WidgetStateProperty.all<Color>(foreground),
           side: WidgetStateProperty.all<BorderSide>(AvesBorder.curvedSide(context)),
           shape: WidgetStateProperty.all<OutlinedBorder>(const RoundedRectangleBorder(
             borderRadius: BorderRadius.all(Radius.circular(_borderRadius)),

lib/widgets/common/identity/empty.dart

@@ -25,7 +25,7 @@ class EmptyContent extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final color = Theme.of(context).colorScheme.primary.withAlpha((255.0 * .5).round());
+    final color = Theme.of(context).colorScheme.primary.withValues(alpha: .5);
     final durations = context.watch<DurationsData>();
     return Padding(
       padding: safeBottom

lib/widgets/common/map/compass.dart

@@ -26,7 +26,7 @@ class CompassPainter extends CustomPainter {
 
     final fillPaint = Paint()
       ..style = PaintingStyle.fill
-      ..color = color.withAlpha((255.0 * .6).round());
+      ..color = color.withValues(alpha: .6);
     final strokePaint = Paint()
       ..style = PaintingStyle.stroke
       ..color = color

lib/widgets/common/map/leaflet/tile_layers.dart

@@ -82,7 +82,7 @@ class _OsmLibertyLayerState extends State<OsmLibertyLayer> {
   void initState() {
     super.initState();
 
-    _tileProviderFuture = StyleReaderExtra.readProviderByName(
+    _tileProviderFuture = ExtraStyleReader.readProviderByName(
       {
         _openMapTileProviderSource: {
           'url': _americanaTileProviderUri,

lib/widgets/common/map/leaflet/vector_style_reader_extra.dart

@@ -6,7 +6,7 @@ import 'package:latlong2/latlong.dart';
 import 'package:vector_map_tiles/vector_map_tiles.dart';
 import 'package:vector_tile_renderer/vector_tile_renderer.dart';
 
-extension StyleReaderExtra on StyleReader {
+extension ExtraStyleReader on StyleReader {
   Future<Style> readExtra({required bool skipSources}) async {
     final styleText = await _httpGet(uri);
     final style = await compute(jsonDecode, styleText);

lib/widgets/dialogs/convert_entry_dialog.dart

@@ -188,7 +188,7 @@ class _ConvertEntryDialogState extends State<ConvertEntryDialog> {
     // used by the drop down to match input decoration
     final textFieldDecorationBorder = Border(
       bottom: BorderSide(
-        color: colorScheme.onSurface.withAlpha((255.0 * .38).round()),
+        color: colorScheme.onSurface.withValues(alpha: .38),
         width: 1.0,
       ),
     );

lib/widgets/editor/transform/painter.dart

@@ -19,8 +19,8 @@ class CropperPainter extends CustomPainter {
   static const double gridWidth = 1;
 
   static const cornerColor = Colors.white;
-  static final borderColor = Colors.white.withAlpha((255.0 * .5).round());
+  static final borderColor = Colors.white.withValues(alpha: .5);
-  static final gridColor = Colors.white.withAlpha((255.0 * .5).round());
+  static final gridColor = Colors.white.withValues(alpha: .5);
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -32,7 +32,7 @@ class CropperPainter extends CustomPainter {
     final gridPaint = Paint()
       ..style = PaintingStyle.stroke
       ..strokeWidth = gridWidth
-      ..color = gridColor.withAlpha((255.0 * gridColor.opacity * gridOpacity).round());
+      ..color = gridColor.withValues(alpha: gridColor.a * gridOpacity);
 
     final xLeft = rect.left;
     final yTop = rect.top;
@@ -118,7 +118,7 @@ class ScrimPainter extends CustomPainter {
   void paint(Canvas canvas, Size size) {
     final scrimPaint = Paint()
       ..style = PaintingStyle.fill
-      ..color = scrimColor.withAlpha((255.0 * opacity).round());
+      ..color = scrimColor.withValues(alpha: opacity);
 
     final outside = Path()
       ..addRect(Rect.fromLTWH(0, 0, size.width, size.height).inflate(.5))

lib/widgets/filter_grids/common/filter_grid_page.dart

@@ -592,7 +592,7 @@ class _FilterScaler<T extends CollectionFilter> extends StatelessWidget {
       ),
       mosaicItemBuilder: (index, targetExtent) => DecoratedBox(
         decoration: BoxDecoration(
-          color: ThumbnailImage.computeLoadingBackgroundColor(index * 10, brightness).withAlpha((255.0 * .9).round()),
+          color: ThumbnailImage.computeLoadingBackgroundColor(index * 10, brightness).withValues(alpha: .9),
           border: Border.all(
             color: context.read<AvesColorsData>().neutral,
             width: AvesFilterChip.outlineWidth,

lib/widgets/navigation/drawer/app_drawer.dart

@@ -191,8 +191,9 @@ class _AppDrawerState extends State<AppDrawer> with WidgetsBindingObserver {
           data: OutlinedButtonThemeData(
             style: ButtonStyle(
               foregroundColor: WidgetStateProperty.all<Color>(onPrimary),
-              overlayColor: WidgetStateProperty.all<Color>(onPrimary.withAlpha((255.0 * .12).round())),
+              overlayColor: WidgetStateProperty.all<Color>(onPrimary.withValues(alpha: .12)),
-              side: WidgetStateProperty.all<BorderSide>(BorderSide(width: 1, color: onPrimary.withAlpha((255.0 * .24).round()))),
+              iconColor: WidgetStateProperty.all<Color>(onPrimary),
+              side: WidgetStateProperty.all<BorderSide>(BorderSide(width: 1, color: onPrimary.withValues(alpha: .24))),
             ),
           ),
           child: Column(

lib/widgets/navigation/drawer/collection_nav_tile.dart

@@ -35,7 +35,7 @@ class CollectionNavTile extends StatelessWidget {
         trailing: trailing != null
             ? Builder(
                 builder: (context) {
-                  final trailingColor = IconTheme.of(context).color!.withAlpha((255.0 * .6).round());
+                  final trailingColor = IconTheme.of(context).color!.withValues(alpha: .6);
                   return IconTheme.merge(
                     data: IconThemeData(color: trailingColor),
                     child: DefaultTextStyle.merge(

lib/widgets/navigation/drawer/page_nav_tile.dart

@@ -43,7 +43,7 @@ class PageNavTile extends StatelessWidget {
             ? Builder(
                 builder: (context) => DefaultTextStyle.merge(
                   style: TextStyle(
-                    color: IconTheme.of(context).color!.withAlpha((255.0 * .6).round()),
+                    color: IconTheme.of(context).color!.withValues(alpha: .6),
                   ),
                   child: trailing!,
                 ),

lib/widgets/settings/common/quick_actions/action_panel.dart

@@ -15,10 +15,10 @@ class ActionPanel extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final color = highlight ? theme.colorScheme.primary : Color.alphaBlend(theme.colorScheme.surfaceTint.withAlpha((255.0 * .2).round()), Themes.secondLayerColor(context));
+    final color = highlight ? theme.colorScheme.primary : Color.alphaBlend(theme.colorScheme.surfaceTint.withValues(alpha: .2), Themes.secondLayerColor(context));
     return AnimatedContainer(
       foregroundDecoration: BoxDecoration(
-        color: color.withAlpha((255.0 * .2).round()),
+        color: color.withValues(alpha: .2),
         border: Border.fromBorderSide(BorderSide(
           color: color,
           width: highlight ? 2 : 1,

lib/widgets/settings/common/quick_actions/editor_page.dart

@@ -287,7 +287,7 @@ class _QuickActionEditorBodyState<T extends Object> extends State<QuickActionEdi
                           effect: WormEffect(
                             dotWidth: 8,
                             dotHeight: 8,
-                            dotColor: colorScheme.onSurface.withAlpha((255.0 * .2).round()),
+                            dotColor: colorScheme.onSurface.withValues(alpha: .2),
                             activeDotColor: colorScheme.primary,
                           ),
                         ),

lib/widgets/settings/home_widget_settings_page.dart

@@ -48,8 +48,8 @@ class _HomeWidgetSettingsPageState extends State<HomeWidgetSettingsPage> {
     begin: gradient.begin,
     end: gradient.end,
     colors: gradient.colors.map((v) {
-      final l = (v.computeLuminance() * 0xFF).toInt();
+      final l = v.computeLuminance();
-      return Color.fromARGB(0xFF, l, l, l);
+      return Color.from(alpha: 1, red: l, green: l, blue: l);
     }).toList(),
     stops: gradient.stops,
     tileMode: gradient.tileMode,

lib/widgets/settings/thumbnails/overlay.dart

@@ -121,7 +121,7 @@ class ThumbnailOverlayPage extends StatelessWidget {
           icon,
           key: ValueKey(key),
           size: _getIconSize(context),
-          color: _getIconColor(context).withAlpha((255.0 * (disabled ? SettingsSwitchListTile.disabledOpacity : 1.0)).round()),
+          color: _getIconColor(context).withValues(alpha: disabled ? SettingsSwitchListTile.disabledOpacity : 1),
         ),
       ),
     );

lib/widgets/settings/video/subtitle_sample.dart

@@ -22,7 +22,7 @@ class SubtitleSample extends StatelessWidget {
       builder: (context, settings, child) {
         final textAlign = settings.subtitleTextAlignment;
         final textPosition = settings.subtitleTextPosition;
-        final outlineColor = Colors.black.withAlpha((255.0 * settings.subtitleTextColor.opacity).round());
+        final outlineColor = Colors.black.withValues(alpha: settings.subtitleTextColor.a);
         final shadows = [
           Shadow(
             color: outlineColor,

lib/widgets/settings/video/subtitle_theme.dart

@@ -62,23 +62,23 @@ class SubtitleThemePage extends StatelessWidget {
                       ),
                       ColorListTile(
                         title: context.l10n.settingsSubtitleThemeTextColor,
-                        value: settings.subtitleTextColor.withAlpha(255),
+                        value: settings.subtitleTextColor.withValues(alpha: 1),
-                        onChanged: (v) => settings.subtitleTextColor = v.withAlpha((255.0 * settings.subtitleTextColor.opacity).round()),
+                        onChanged: (v) => settings.subtitleTextColor = v.withValues(alpha: settings.subtitleTextColor.a),
                       ),
                       SliderListTile(
                         title: context.l10n.settingsSubtitleThemeTextOpacity,
-                        value: settings.subtitleTextColor.opacity,
+                        value: settings.subtitleTextColor.a,
-                        onChanged: (v) => settings.subtitleTextColor = settings.subtitleTextColor.withAlpha((255.0 * v).round()),
+                        onChanged: (v) => settings.subtitleTextColor = settings.subtitleTextColor.withValues(alpha: v),
                       ),
                       ColorListTile(
                         title: context.l10n.settingsSubtitleThemeBackgroundColor,
-                        value: settings.subtitleBackgroundColor.withAlpha(255),
+                        value: settings.subtitleBackgroundColor.withValues(alpha: 1),
-                        onChanged: (v) => settings.subtitleBackgroundColor = v.withAlpha((255.0 * settings.subtitleBackgroundColor.opacity).round()),
+                        onChanged: (v) => settings.subtitleBackgroundColor = v.withValues(alpha: settings.subtitleBackgroundColor.a),
                       ),
                       SliderListTile(
                         title: context.l10n.settingsSubtitleThemeBackgroundOpacity,
-                        value: settings.subtitleBackgroundColor.opacity,
+                        value: settings.subtitleBackgroundColor.a,
-                        onChanged: (v) => settings.subtitleBackgroundColor = settings.subtitleBackgroundColor.withAlpha((255.0 * v).round()),
+                        onChanged: (v) => settings.subtitleBackgroundColor = settings.subtitleBackgroundColor.withValues(alpha: v),
                       ),
                       SettingsSwitchListTile(
                         selector: (context, s) => s.subtitleShowOutline,

lib/widgets/stats/date/histogram.dart

@@ -198,7 +198,7 @@ class _HistogramState extends State<Histogram> with AutomaticKeepAliveClientMixi
     final colorScheme = Theme.of(context).colorScheme;
     final accentColor = colorScheme.primary;
     final axisColor = charts.ColorUtil.fromDartColor(drawPoints ? colorScheme.onSurface : Colors.transparent);
-    final measureLineColor = charts.ColorUtil.fromDartColor(drawPoints ? colorScheme.onSurface.withAlpha((255.0 * .1).round()) : Colors.transparent);
+    final measureLineColor = charts.ColorUtil.fromDartColor(drawPoints ? colorScheme.onSurface.withValues(alpha: .1) : Colors.transparent);
     final histogramLineColor = charts.ColorUtil.fromDartColor(drawLine ? accentColor : Colors.white);
     final histogramPointStrikeColor = charts.ColorUtil.fromDartColor(drawPoints ? colorScheme.onSurface : Colors.transparent);
     final histogramPointFillColor = charts.ColorUtil.fromDartColor(Themes.firstLayerColor(context));

lib/widgets/viewer/controls/cast.dart

@@ -127,7 +127,7 @@ mixin CastMixin {
   }
 }
 
-extension DLNADeviceExtra on DLNADevice {
+extension ExtraDLNADevice on DLNADevice {
   Future<String> requestCustom({
     required String serviceId,
     required String serviceType,

lib/widgets/viewer/entry_vertical_pager.dart

@@ -178,7 +178,7 @@ class _ViewerVerticalPageViewState extends State<ViewerVerticalPageView> {
           builder: (context, overlayOpacity, child) {
             final background = Theme.of(context).isDark ? Colors.black : Color.lerp(Colors.black, Colors.white, overlayOpacity)!;
             return Container(
-              color: background.withAlpha((255.0 * backgroundOpacity).round()),
+              color: background.withValues(alpha: backgroundOpacity),
               child: child,
             );
           },

lib/widgets/viewer/overlay/histogram.dart

@@ -126,19 +126,21 @@ class _HistogramPainter extends CustomPainter {
 
     final polyline = values.mapIndexed((i, v) => Offset(i * xFactor, size.height - v * yFactor)).toList();
     canvas.drawPoints(
-        PointMode.polygon,
+      PointMode.polygon,
-        polyline,
+      polyline,
-        Paint()
+      Paint()
-          ..style = PaintingStyle.stroke
+        ..style = PaintingStyle.stroke
-          ..color = color);
+        ..color = color,
+    );
 
     polyline.add(Offset(size.width, size.height));
     polyline.add(Offset(0, size.height));
     canvas.drawPath(
-        Path()..addPolygon(polyline, true),
+      Path()..addPolygon(polyline, true),
-        Paint()
+      Paint()
-          ..style = PaintingStyle.fill
+        ..style = PaintingStyle.fill
-          ..color = color.withAlpha((255.0 * .5).round()));
+        ..color = color.withValues(alpha: .5),
+    );
   }
 
   Color _getChannelColor(HistogramChannel channel) {

lib/widgets/viewer/overlay/video/progress_bar.dart

@@ -119,7 +119,7 @@ class _VideoProgressBarState extends State<VideoProgressBar> {
                                         if (!progress.isFinite) progress = 0.0;
                                         return LinearProgressIndicator(
                                           value: progress,
-                                          backgroundColor: theme.colorScheme.onSurface.withAlpha((255.0 * .2).round()),
+                                          backgroundColor: theme.colorScheme.onSurface.withValues(alpha: .2),
                                         );
                                       }),
                                 ),

lib/widgets/viewer/view/histogram.dart

@@ -3,6 +3,7 @@ import 'dart:ui';
 
 import 'package:aves/model/settings/settings.dart';
 import 'package:aves_model/aves_model.dart';
+import 'package:aves_utils/aves_utils.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -80,8 +81,8 @@ mixin HistogramMixin {
         final b = view[i + 2];
         // `Color.computeLuminance()` is more accurate, but slower
         // and photo software typically use the simpler formula
-        final luminance = (r * 0.3 + g * 0.59 + b * 0.11) / 255;
+        final l = ColorUtils.luma(r, g, b);
-        lumLevels[(luminance * normMax).round()]++;
+        lumLevels[(l * normMax).round()]++;
       }
     }
 

lib/widgets/viewer/visual/video/subtitle/ass_parser.dart

@@ -151,7 +151,7 @@ class AssParser {
                 // \c or \1c: fill color
                 final color = _parseColor(param);
                 if (color != null) {
-                  textStyle = textStyle.copyWith(color: color.withAlpha(textStyle.color?.alpha ?? 0xFF));
+                  textStyle = textStyle.copyWith(color: color.withValues(alpha: textStyle.color?.a ?? 1));
                 }
               }
             case '3c':
@@ -160,7 +160,7 @@ class AssParser {
                 final color = _parseColor(param);
                 if (color != null) {
                   extraStyle = extraStyle.copyWith(
-                    borderColor: color.withAlpha(extraStyle.borderColor?.alpha ?? 0xFF),
+                    borderColor: color.withValues(alpha: extraStyle.borderColor?.a ?? 1),
                   );
                 }
               }
@@ -172,7 +172,7 @@ class AssParser {
                   textStyle = textStyle.copyWith(
                       shadows: textStyle.shadows
                           ?.map((v) => Shadow(
-                                color: color.withAlpha(v.color.alpha),
+                                color: color.withValues(alpha: v.color.a),
                                 offset: v.offset,
                                 blurRadius: v.blurRadius,
                               ))

lib/widgets/viewer/visual/video/subtitle/subtitle.dart

@@ -44,7 +44,7 @@ class VideoSubtitles extends StatelessWidget {
               final baseTextAlign = settings.subtitleTextAlignment;
               final baseTextAlignY = settings.subtitleTextPosition.toTextAlignVertical();
               final baseOutlineWidth = settings.subtitleShowOutline ? 1 : 0;
-              final baseOutlineColor = Colors.black.withAlpha((255.0 * settings.subtitleTextColor.opacity).round());
+              final baseOutlineColor = Colors.black.withValues(alpha: settings.subtitleTextColor.a);
               final baseShadows = [
                 Shadow(
                   color: baseOutlineColor,

lib/widgets/viewer/visual/video/swipe_action.dart

@@ -43,9 +43,9 @@ class SwipeActionFeedback extends StatelessWidget {
   static const Radius radius = Radius.circular(width / 2);
   static const double borderWidth = 2;
   static const Color borderColor = Colors.white;
-  static final Color fillColor = Colors.white.withAlpha((255.0 * .8).round());
+  static final Color fillColor = Colors.white.withValues(alpha: .8);
-  static final Color backgroundColor = Colors.black.withAlpha((255.0 * .2).round());
+  static final Color backgroundColor = Colors.black.withValues(alpha: .2);
-  static final Color innerBorderColor = Colors.black.withAlpha((255.0 * .5).round());
+  static final Color innerBorderColor = Colors.black.withValues(alpha: .5);
   static const Color iconColor = Colors.white;
   static const Color shadowColor = Colors.black;
 

plugins/aves_magnifier/lib/src/controller/controller.dart

@@ -137,8 +137,6 @@ class AvesMagnifierController {
         return boundaries.clampScale(ScaleLevel.scaleForCovering(boundaries.viewportSize, boundaries.contentSize));
       case ScaleState.originalSize:
         return boundaries.clampScale(boundaries.originalScale);
-      default:
-        return null;
     }
   }
 }

plugins/aves_magnifier/lib/src/scale/scale_boundaries.dart

@@ -78,7 +78,6 @@ class ScaleBoundaries extends Equatable {
       case ScaleReference.covered:
         return factor * ScaleLevel.scaleForCovering(viewportSize, contentSize);
       case ScaleReference.absolute:
-      default:
         return factor;
     }
   }

plugins/aves_magnifier/pubspec.lock

@@ -1,135 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  aves_utils:
-    dependency: "direct main"
-    description:
-      path: "../aves_utils"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  leak_tracker:
-    dependency: "direct main"
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  provider:
-    dependency: "direct main"
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=1.16.0"

plugins/aves_magnifier/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_map/pubspec.lock

@@ -1,303 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.12.0"
-  aves_ui:
-    dependency: "direct main"
-    description:
-      path: "../aves_ui"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: "direct main"
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  custom_rounded_rectangle_border:
-    dependency: "direct main"
-    description:
-      name: custom_rounded_rectangle_border
-      sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
-  dart_earcut:
-    dependency: transitive
-    description:
-      name: dart_earcut
-      sha256: "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  fluster:
-    dependency: "direct main"
-    description:
-      name: fluster
-      sha256: "3807f5d088b7798f0416b8578498046338af98bb4fb922a70e2810b8293963f6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_map:
-    dependency: "direct main"
-    description:
-      name: flutter_map
-      sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.2"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  intl:
-    dependency: "direct main"
-    description:
-      name: intl
-      sha256: "00f33b908655e606b86d2ade4710a231b802eec6f11e87e4ea3783fd72077a50"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.1"
-  latlong2:
-    dependency: "direct main"
-    description:
-      name: latlong2
-      sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.1"
-  leak_tracker:
-    dependency: "direct main"
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lists:
-    dependency: transitive
-    description:
-      name: lists
-      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  mgrs_dart:
-    dependency: transitive
-    description:
-      name: mgrs_dart
-      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  polylabel:
-    dependency: transitive
-    description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  proj4dart:
-    dependency: transitive
-    description:
-      name: proj4dart
-      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  provider:
-    dependency: "direct main"
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  unicode:
-    dependency: transitive
-    description:
-      name: unicode
-      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  wkt_parser:
-    dependency: transitive
-    description:
-      name: wkt_parser
-      sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.10.0"

plugins/aves_map/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_model/lib/src/settings/keys.dart

@@ -119,8 +119,8 @@ class SettingKeys {
   static const subtitleTextAlignmentKey = 'subtitle_text_alignment';
   static const subtitleTextPositionKey = 'subtitle_text_position';
   static const subtitleShowOutlineKey = 'subtitle_show_outline';
-  static const subtitleTextColorKey = 'subtitle_text_color';
+  static const subtitleTextColorKey = 'subtitle_text_color_string';
-  static const subtitleBackgroundColorKey = 'subtitle_background_color';
+  static const subtitleBackgroundColorKey = 'subtitle_background_color_string';
 
   // info
   static const infoMapZoomKey = 'info_map_zoom';

plugins/aves_model/pubspec.lock

@@ -1,79 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: "direct main"
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  equatable:
-    dependency: "direct main"
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: "direct main"
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_model/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_platform_meta/pubspec.lock

@@ -1,79 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  plugin_platform_interface:
-    dependency: "direct main"
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_platform_meta/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_report/pubspec.lock

@@ -1,87 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: "direct main"
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  stack_trace:
-    dependency: "direct main"
-    description:
-      name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_report/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_report_console/pubspec.lock

@@ -1,94 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  aves_report:
-    dependency: "direct main"
-    description:
-      path: "../aves_report"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_report_console/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_report_crashlytics/pubspec.lock

@@ -1,281 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  _flutterfire_internals:
-    dependency: transitive
-    description:
-      name: _flutterfire_internals
-      sha256: eae3133cbb06de9205899b822e3897fc6a8bc278ad4c944b4ce612689369694b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.47"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  aves_report:
-    dependency: "direct main"
-    description:
-      path: "../aves_report"
-      relative: true
-    source: path
-    version: "0.0.1"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  firebase_core:
-    dependency: "direct main"
-    description:
-      name: firebase_core
-      sha256: fef81a53ba1ca618def1f8bef4361df07968434e62cb204c1fb90bb880a03da2
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.8.1"
-  firebase_core_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_core_platform_interface
-      sha256: b94b217e3ad745e784960603d33d99471621ecca151c99c670869b76e50ad2a6
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.3.1"
-  firebase_core_web:
-    dependency: transitive
-    description:
-      name: firebase_core_web
-      sha256: "9e69806bb3d905aeec3c1242e0e1475de6ea6d48f456af29d598fb229a2b4e5e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.18.2"
-  firebase_crashlytics:
-    dependency: "direct main"
-    description:
-      name: firebase_crashlytics
-      sha256: e235c8452d5622fc271404592388fde179e4b62c50e777ad3c8c3369296104ed
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.0"
-  firebase_crashlytics_platform_interface:
-    dependency: transitive
-    description:
-      name: firebase_crashlytics_platform_interface
-      sha256: "4ddadf44ed0a202f3acad053f12c083877940fa8cc1a9f747ae09e1ef4372160"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.7.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_test:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.5"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.5"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.16+1"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.0"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  stack_trace:
-    dependency: "direct main"
-    description:
-      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.2"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.2.5"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.22.0"

plugins/aves_report_crashlytics/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_screen_state/pubspec.lock

@@ -1,79 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  plugin_platform_interface:
-    dependency: "direct main"
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_screen_state/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_services/pubspec.lock

@@ -1,310 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.12.0"
-  aves_map:
-    dependency: "direct main"
-    description:
-      path: "../aves_map"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_ui:
-    dependency: transitive
-    description:
-      path: "../aves_ui"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  custom_rounded_rectangle_border:
-    dependency: transitive
-    description:
-      name: custom_rounded_rectangle_border
-      sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
-  dart_earcut:
-    dependency: transitive
-    description:
-      name: dart_earcut
-      sha256: "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  fluster:
-    dependency: transitive
-    description:
-      name: fluster
-      sha256: "3807f5d088b7798f0416b8578498046338af98bb4fb922a70e2810b8293963f6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_map:
-    dependency: transitive
-    description:
-      name: flutter_map
-      sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.2"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: "00f33b908655e606b86d2ade4710a231b802eec6f11e87e4ea3783fd72077a50"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.1"
-  latlong2:
-    dependency: "direct main"
-    description:
-      name: latlong2
-      sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lists:
-    dependency: transitive
-    description:
-      name: lists
-      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  mgrs_dart:
-    dependency: transitive
-    description:
-      name: mgrs_dart
-      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  polylabel:
-    dependency: transitive
-    description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  proj4dart:
-    dependency: transitive
-    description:
-      name: proj4dart
-      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  unicode:
-    dependency: transitive
-    description:
-      name: unicode
-      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  wkt_parser:
-    dependency: transitive
-    description:
-      name: wkt_parser
-      sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.10.0"

plugins/aves_services/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_services_google/pubspec.lock

@@ -1,497 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.12.0"
-  aves_map:
-    dependency: "direct main"
-    description:
-      path: "../aves_map"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_services:
-    dependency: "direct main"
-    description:
-      path: "../aves_services"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_ui:
-    dependency: transitive
-    description:
-      path: "../aves_ui"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_utils:
-    dependency: "direct main"
-    description:
-      path: "../aves_utils"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  csslib:
-    dependency: transitive
-    description:
-      name: csslib
-      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  custom_rounded_rectangle_border:
-    dependency: transitive
-    description:
-      name: custom_rounded_rectangle_border
-      sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
-  dart_earcut:
-    dependency: transitive
-    description:
-      name: dart_earcut
-      sha256: "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  device_info_plus:
-    dependency: "direct main"
-    description:
-      name: device_info_plus
-      sha256: f545ffbadee826f26f2e1a0f0cbd667ae9a6011cc0f77c0f8f00a969655e6e95
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.1.1"
-  device_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: device_info_plus_platform_interface
-      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  fluster:
-    dependency: transitive
-    description:
-      name: fluster
-      sha256: "3807f5d088b7798f0416b8578498046338af98bb4fb922a70e2810b8293963f6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_map:
-    dependency: transitive
-    description:
-      name: flutter_map
-      sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.2"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      sha256: "9b78450b89f059e96c9ebb355fa6b3df1d6b330436e0b885fb49594c41721398"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.23"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  google_api_availability:
-    dependency: "direct main"
-    description:
-      name: google_api_availability
-      sha256: "3e9548cfd991d983d11425a2436d5bd957d048c279cc9e145ffe3f36fd847385"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  google_api_availability_android:
-    dependency: transitive
-    description:
-      name: google_api_availability_android
-      sha256: d95429ae78083585c312de2c6578085e7d53d100a94656d691bce0bb0ce435be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  google_api_availability_platform_interface:
-    dependency: transitive
-    description:
-      name: google_api_availability_platform_interface
-      sha256: "65b7da62fe5b582bb3d508628ad827d36d890710ea274766a992a56fa5420da6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  google_maps:
-    dependency: transitive
-    description:
-      name: google_maps
-      sha256: "4d6e199c561ca06792c964fa24b2bac7197bf4b401c2e1d23e345e5f9939f531"
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.1"
-  google_maps_flutter:
-    dependency: "direct main"
-    description:
-      name: google_maps_flutter
-      sha256: "209856c8e5571626afba7182cf634b2910069dc567954e76ec3e3fb37f5e9db3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.10.0"
-  google_maps_flutter_android:
-    dependency: "direct main"
-    description:
-      name: google_maps_flutter_android
-      sha256: bccf64ccbb2ea672dc62a61177b315a340af86b0228564484b023657544a3fd5
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.14.11"
-  google_maps_flutter_ios:
-    dependency: transitive
-    description:
-      name: google_maps_flutter_ios
-      sha256: "6f798adb0aa1db5adf551f2e39e24bd06c8c0fbe4de912fb2d9b5b3f48147b02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.2"
-  google_maps_flutter_platform_interface:
-    dependency: "direct main"
-    description:
-      name: google_maps_flutter_platform_interface
-      sha256: a951981c22d790848efb9f114f81794945bc5c06bc566238a419a92f110af6cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.9.5"
-  google_maps_flutter_web:
-    dependency: transitive
-    description:
-      name: google_maps_flutter_web
-      sha256: ff39211bd25d7fad125d19f757eba85bd154460907cd4d135e07e3d0f98a4130
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.10"
-  html:
-    dependency: transitive
-    description:
-      name: html
-      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.15.5"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: "00f33b908655e606b86d2ade4710a231b802eec6f11e87e4ea3783fd72077a50"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.1"
-  latlong2:
-    dependency: "direct main"
-    description:
-      name: latlong2
-      sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lists:
-    dependency: transitive
-    description:
-      name: lists
-      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  mgrs_dart:
-    dependency: transitive
-    description:
-      name: mgrs_dart
-      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  polylabel:
-    dependency: transitive
-    description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  proj4dart:
-    dependency: transitive
-    description:
-      name: proj4dart
-      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  provider:
-    dependency: "direct main"
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  sanitize_html:
-    dependency: transitive
-    description:
-      name: sanitize_html
-      sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  stream_transform:
-    dependency: transitive
-    description:
-      name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  unicode:
-    dependency: transitive
-    description:
-      name: unicode
-      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.9.0"
-  win32_registry:
-    dependency: transitive
-    description:
-      name: win32_registry
-      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.5"
-  wkt_parser:
-    dependency: transitive
-    description:
-      name: wkt_parser
-      sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.24.0"

plugins/aves_services_google/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_services_none/pubspec.lock

@@ -1,317 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.12.0"
-  aves_map:
-    dependency: "direct main"
-    description:
-      path: "../aves_map"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_services:
-    dependency: "direct main"
-    description:
-      path: "../aves_services"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_ui:
-    dependency: transitive
-    description:
-      path: "../aves_ui"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  custom_rounded_rectangle_border:
-    dependency: transitive
-    description:
-      name: custom_rounded_rectangle_border
-      sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.0"
-  dart_earcut:
-    dependency: transitive
-    description:
-      name: dart_earcut
-      sha256: "41b493147e30a051efb2da1e3acb7f38fe0db60afba24ac1ea5684cee272721e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  fluster:
-    dependency: transitive
-    description:
-      name: fluster
-      sha256: "3807f5d088b7798f0416b8578498046338af98bb4fb922a70e2810b8293963f6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_map:
-    dependency: transitive
-    description:
-      name: flutter_map
-      sha256: "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.2"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  intl:
-    dependency: transitive
-    description:
-      name: intl
-      sha256: "00f33b908655e606b86d2ade4710a231b802eec6f11e87e4ea3783fd72077a50"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.20.1"
-  latlong2:
-    dependency: "direct main"
-    description:
-      name: latlong2
-      sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lists:
-    dependency: transitive
-    description:
-      name: lists
-      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  mgrs_dart:
-    dependency: transitive
-    description:
-      name: mgrs_dart
-      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  nested:
-    dependency: transitive
-    description:
-      name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  polylabel:
-    dependency: transitive
-    description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  proj4dart:
-    dependency: transitive
-    description:
-      name: proj4dart
-      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  provider:
-    dependency: transitive
-    description:
-      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  unicode:
-    dependency: transitive
-    description:
-      name: unicode
-      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  wkt_parser:
-    dependency: transitive
-    description:
-      name: wkt_parser
-      sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.10.0"

plugins/aves_services_none/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_ui/pubspec.lock

@@ -1,71 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_ui/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_utils/lib/src/colors.dart

@@ -1,5 +1,8 @@
+import 'dart:convert';
 import 'dart:ui';
 
+import 'package:flutter/foundation.dart';
+
 class ColorUtils {
   // `Color(0x00FFFFFF)` is different from `Color(0x00000000)` (or `Colors.transparent`)
   // when used in gradients or lerping to it
@@ -7,7 +10,63 @@ class ColorUtils {
   static const transparentBlack = Color(0x00000000);
 
   static Color textColorOn(Color background) {
-    final yiq = (background.red * 299 + background.green * 587 + background.blue * 114) / 1000;
+    final l = luma(
-    return Color(yiq >= 128 ? 0xFF000000 : 0xFFFFFFFF);
+      background.intRed,
+      background.intGreen,
+      background.intBlue,
+    );
+    return Color(l >= .5 ? 0xFF000000 : 0xFFFFFFFF);
+  }
+
+  // quick computation of luma (Y component of YUV or YIQ) from RGB
+  // cf https://en.wikipedia.org/wiki/Y%E2%80%B2UV
+  // cf https://en.wikipedia.org/wiki/YIQ
+  // `Color.computeLuminance()` is more accurate, but slower
+  // r, g, b in [0, 255], luma in [0, 1]
+  static double luma(int r, int g, int b) {
+    return (r * .299 + g * .587 + b * .114) / 255;
+  }
+}
+
+extension ExtraColor on Color {
+  int get intRed => (r * 255).round(); // sRGB red component
+  int get intGreen => (g * 255).round(); // sRGB green component
+  int get intBlue => (b * 255).round(); // sRGB blue component
+
+  // serialization
+
+  String toJson() => jsonEncode(_toMap());
+
+  static Color? fromJson(String? jsonString) {
+    if (jsonString == null || jsonString.isEmpty) return null;
+
+    try {
+      final jsonMap = jsonDecode(jsonString);
+      if (jsonMap is Map<String, dynamic>) {
+        return _fromMap(jsonMap);
+      }
+      debugPrint('failed to parse color from json=$jsonString');
+    } catch (error, stack) {
+      debugPrint('failed to parse color from json=$jsonString error=$error\n$stack');
+    }
+    return null;
+  }
+
+  Map<String, dynamic> _toMap() => {
+        'a': a,
+        'r': r,
+        'g': g,
+        'b': b,
+        'colorSpace': colorSpace.name,
+      };
+
+  static Color _fromMap(Map<String, dynamic> map) {
+    return Color.from(
+      alpha: map['a'] as double,
+      red: map['r'] as double,
+      green: map['g'] as double,
+      blue: map['b'] as double,
+      colorSpace: ColorSpace.values.byName(map['colorSpace'] as String),
+    );
   }
 }

plugins/aves_utils/pubspec.lock

@@ -1,71 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: "direct main"
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_utils/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_video/lib/src/settings/subtitles.dart

@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:aves_model/aves_model.dart';
+import 'package:aves_utils/aves_utils.dart';
 import 'package:aves_video/src/settings/defaults.dart';
 
 mixin SubtitlesSettings on SettingsAccess {
@@ -20,11 +21,11 @@ mixin SubtitlesSettings on SettingsAccess {
 
   set subtitleShowOutline(bool newValue) => set(SettingKeys.subtitleShowOutlineKey, newValue);
 
-  Color get subtitleTextColor => Color(getInt(SettingKeys.subtitleTextColorKey) ?? SettingsDefaults.subtitleTextColor.value);
+  Color get subtitleTextColor => ExtraColor.fromJson(getString(SettingKeys.subtitleTextColorKey)) ?? SettingsDefaults.subtitleTextColor;
 
-  set subtitleTextColor(Color newValue) => set(SettingKeys.subtitleTextColorKey, newValue.value);
+  set subtitleTextColor(Color newValue) => set(SettingKeys.subtitleTextColorKey, newValue.toJson());
 
-  Color get subtitleBackgroundColor => Color(getInt(SettingKeys.subtitleBackgroundColorKey) ?? SettingsDefaults.subtitleBackgroundColor.value);
+  Color get subtitleBackgroundColor => ExtraColor.fromJson(getString(SettingKeys.subtitleBackgroundColorKey)) ?? SettingsDefaults.subtitleBackgroundColor;
 
-  set subtitleBackgroundColor(Color newValue) => set(SettingKeys.subtitleBackgroundColorKey, newValue.value);
+  set subtitleBackgroundColor(Color newValue) => set(SettingKeys.subtitleBackgroundColorKey, newValue.toJson());
 }

plugins/aves_video/pubspec.lock

@@ -1,125 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  aves_model:
-    dependency: "direct main"
-    description:
-      path: "../aves_model"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_utils:
-    dependency: "direct main"
-    description:
-      path: "../aves_utils"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  leak_tracker:
-    dependency: "direct main"
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-sdks:
-  dart: ">=3.5.0 <4.0.0"

plugins/aves_video/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_video_ffmpeg/pubspec.lock

@@ -1,158 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  aves_model:
-    dependency: "direct main"
-    description:
-      path: "../aves_model"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_utils:
-    dependency: transitive
-    description:
-      path: "../aves_utils"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_video:
-    dependency: "direct main"
-    description:
-      path: "../aves_video"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  ffmpeg_kit_flutter:
-    dependency: "direct main"
-    description:
-      path: "flutter/flutter"
-      ref: background-lts
-      resolved-ref: "24213bd2334265cfc240525fb9a218b85ad4d872"
-      url: "https://github.com/deckerst/ffmpeg-kit.git"
-    source: git
-    version: "6.0.3"
-  ffmpeg_kit_flutter_platform_interface:
-    dependency: transitive
-    description:
-      name: ffmpeg_kit_flutter_platform_interface
-      sha256: addf046ae44e190ad0101b2fde2ad909a3cd08a2a109f6106d2f7048b7abedee
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=2.0.0"

plugins/aves_video_ffmpeg/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:

plugins/aves_video_mpv/pubspec.lock

@@ -1,460 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.6.1"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.0"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.12.0"
-  aves_model:
-    dependency: "direct main"
-    description:
-      path: "../aves_model"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_utils:
-    dependency: "direct main"
-    description:
-      path: "../aves_utils"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_video:
-    dependency: "direct main"
-    description:
-      path: "../aves_video"
-      relative: true
-    source: path
-    version: "0.0.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: "direct main"
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.6"
-  dbus:
-    dependency: transitive
-    description:
-      name: dbus
-      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.10"
-  equatable:
-    dependency: transitive
-    description:
-      name: equatable
-      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.7"
-  ffi:
-    dependency: transitive
-    description:
-      name: ffi
-      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_web_plugins:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  http:
-    dependency: transitive
-    description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  image:
-    dependency: transitive
-    description:
-      name: image
-      sha256: f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.3.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.8"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  media_kit:
-    dependency: "direct main"
-    description:
-      path: media_kit
-      ref: d094ba83715b0ac893e546781b2862e855d34502
-      resolved-ref: d094ba83715b0ac893e546781b2862e855d34502
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
-    version: "1.1.11"
-  media_kit_libs_android_video:
-    dependency: "direct main"
-    description:
-      name: media_kit_libs_android_video
-      sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.6"
-  media_kit_video:
-    dependency: "direct main"
-    description:
-      path: media_kit_video
-      ref: d094ba83715b0ac893e546781b2862e855d34502
-      resolved-ref: d094ba83715b0ac893e546781b2862e855d34502
-      url: "https://github.com/media-kit/media-kit.git"
-    source: git
-    version: "1.2.5"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  package_info_plus:
-    dependency: transitive
-    description:
-      name: package_info_plus
-      sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.1"
-  package_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: package_info_plus_platform_interface
-      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  path:
-    dependency: "direct main"
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  safe_local_storage:
-    dependency: transitive
-    description:
-      name: safe_local_storage
-      sha256: e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  screen_brightness:
-    dependency: transitive
-    description:
-      name: screen_brightness
-      sha256: a9a98666045ad4ea0d82bca09fe5f007b8440e315075dc948c1507a9b72ee41f
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  screen_brightness_android:
-    dependency: transitive
-    description:
-      name: screen_brightness_android
-      sha256: "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  screen_brightness_ios:
-    dependency: transitive
-    description:
-      name: screen_brightness_ios
-      sha256: caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  screen_brightness_macos:
-    dependency: transitive
-    description:
-      name: screen_brightness_macos
-      sha256: "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  screen_brightness_platform_interface:
-    dependency: transitive
-    description:
-      name: screen_brightness_platform_interface
-      sha256: "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  screen_brightness_windows:
-    dependency: transitive
-    description:
-      name: screen_brightness_windows
-      sha256: "5edbfb1dcaedf960f6858efac8ca45d6c18faae17df86e2c03137d3a563ea155"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  sprintf:
-    dependency: transitive
-    description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  synchronized:
-    dependency: transitive
-    description:
-      name: synchronized
-      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.0+3"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  universal_platform:
-    dependency: transitive
-    description:
-      name: universal_platform
-      sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  uri_parser:
-    dependency: transitive
-    description:
-      name: uri_parser
-      sha256: ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.0"
-  uuid:
-    dependency: transitive
-    description:
-      name: uuid
-      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.5.1"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.1"
-  volume_controller:
-    dependency: transitive
-    description:
-      name: volume_controller
-      sha256: c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.8"
-  wakelock_plus:
-    dependency: transitive
-    description:
-      name: wakelock_plus
-      sha256: bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.8"
-  wakelock_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: wakelock_plus_platform_interface
-      sha256: "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.9.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.5.0"
-sdks:
-  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.19.0"

plugins/aves_video_mpv/pubspec.yaml

@@ -3,7 +3,8 @@ version: 0.0.1
 publish_to: none
 
 environment:
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+resolution: workspace
 
 dependencies:
   flutter:
@@ -20,18 +21,6 @@ dependencies:
   media_kit_video:
   path:
 
-dependency_overrides:
-  media_kit:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      ref: d094ba83715b0ac893e546781b2862e855d34502
-      path: media_kit
-  media_kit_video:
-    git:
-      url: https://github.com/media-kit/media-kit.git
-      ref: d094ba83715b0ac893e546781b2862e855d34502
-      path: media_kit_video
-
 dev_dependencies:
   flutter_lints:
 

pubspec.lock

@@ -5,10 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
+    version: "76.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
@@ -21,15 +21,15 @@ packages:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.11.0"
   archive:
     dependency: transitive
     description:
@@ -54,97 +54,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
-  aves_magnifier:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_magnifier"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_map:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_map"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_model:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_model"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_report:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_report"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_report_platform:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_report_crashlytics"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_screen_state:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_screen_state"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_services:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_services"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_services_platform:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_services_google"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_ui:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_ui"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_utils:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_utils"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_video:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_video"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_video_ffmpeg:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_video_ffmpeg"
-      relative: true
-    source: path
-    version: "0.0.1"
-  aves_video_mpv:
-    dependency: "direct main"
-    description:
-      path: "plugins/aves_video_mpv"
-      relative: true
-    source: path
-    version: "0.0.1"
   barcode:
     dependency: transitive
     description:
@@ -207,18 +116,18 @@ packages:
     dependency: "direct main"
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
   connectivity_plus:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "876849631b0c7dc20f8b471a2a03142841b482438e3b707955464f5ffca3e4c3"
+      sha256: e0817759ec6d2d8e57eb234e6e57d2173931367a865850c7acea40d4b4f9c27d
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.1.1"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -303,18 +212,18 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: f545ffbadee826f26f2e1a0f0cbd667ae9a6011cc0f77c0f8f00a969655e6e95
+      sha256: "4fa68e53e26ab17b70ca39f072c285562cfc1589df5bb1e9295db90f6645f431"
       url: "https://pub.dev"
     source: hosted
-    version: "11.1.1"
+    version: "11.2.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba"
+      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.2"
   dlna_dart:
     dependency: "direct main"
     description:
@@ -537,7 +446,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "3ce50168ea196acc8d18e09377a3e88bb13cb125"
+      resolved-ref: "6a8c14bceaefd00e703ad517fd2a32fa2081b5de"
       url: "https://github.com/deckerst/flutter_localizations_plus.git"
     source: git
     version: "0.0.1"
@@ -600,10 +509,10 @@ packages:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: c49895c1ecb0ee2a0ec568d39de882e2c299ba26355aa6744ab1001f98cebd15
+      sha256: f126a3e286b7f5b578bf436d5592968706c4c1de28a228b870ce375d9f743103
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.2"
+    version: "8.0.3"
   glob:
     dependency: transitive
     description:
@@ -720,10 +629,10 @@ packages:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.1"
   image:
     dependency: transitive
     description:
@@ -768,18 +677,18 @@ packages:
     dependency: "direct main"
     description:
       name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.5"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -792,10 +701,10 @@ packages:
     dependency: transitive
     description:
       name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
+      sha256: "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
   lists:
     dependency: transitive
     description:
@@ -824,10 +733,10 @@ packages:
     dependency: transitive
     description:
       name: local_auth_darwin
-      sha256: "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c"
+      sha256: "5c5127061107278ab4cafa1ac51b3b6760282bf1a2abf011270908a429d1634b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   local_auth_platform_interface:
     dependency: transitive
     description:
@@ -864,10 +773,10 @@ packages:
     dependency: transitive
     description:
       name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.2-main.4"
+    version: "0.1.3-main.0"
   markdown:
     dependency: transitive
     description:
@@ -971,18 +880,18 @@ packages:
     dependency: "direct main"
     description:
       name: network_info_plus
-      sha256: bf9e39e523e9951d741868dc33ac386b0bc24301e9b7c8a7d60dbc34879150a8
+      sha256: "936e9dc9d78ba84f84147c28aa044722057e2eeb7777fa3d66e77f918c0e3b5b"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.1"
+    version: "6.1.2"
   network_info_plus_platform_interface:
     dependency: transitive
     description:
       name: network_info_plus_platform_interface
-      sha256: b7f35f4a7baef511159e524499f3c15464a49faa5ec10e92ee0bce265e664906
+      sha256: "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   nm:
     dependency: transitive
     description:
@@ -1011,26 +920,26 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: da8d9ac8c4b1df253d1a328b7bf01ae77ef132833479ab40763334db13b91cce
+      sha256: "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.1"
+    version: "8.1.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66
+      sha256: a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.2"
   palette_generator:
     dependency: "direct main"
     description:
@@ -1284,10 +1193,10 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
   qr:
     dependency: transitive
     description:
@@ -1372,18 +1281,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549"
+      sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.4"
+    version: "2.4.0"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d"
+      sha256: "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.3"
+    version: "2.5.4"
   shared_preferences_linux:
     dependency: transitive
     description:
@@ -1420,10 +1329,10 @@ packages:
     dependency: "direct main"
     description:
       name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
+      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.2"
   shelf_packages_handler:
     dependency: transitive
     description:
@@ -1452,7 +1361,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   smooth_page_indicator:
     dependency: "direct main"
     description:
@@ -1473,10 +1382,10 @@ packages:
     dependency: transitive
     description:
       name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      sha256: "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.12"
+    version: "0.10.13"
   source_span:
     dependency: transitive
     description:
@@ -1537,10 +1446,10 @@ packages:
     dependency: "direct main"
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -1570,10 +1479,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   sync_http:
     dependency: transitive
     description:
@@ -1602,26 +1511,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
+      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
       url: "https://pub.dev"
     source: hosted
-    version: "1.25.7"
+    version: "1.25.8"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
+      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   transparent_image:
     dependency: "direct main"
     description:
@@ -1770,10 +1679,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.5"
+    version: "14.3.0"
   volume_controller:
     dependency: "direct main"
     description:
@@ -1834,10 +1743,10 @@ packages:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
+      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.4"
   webkit_inspection_protocol:
     dependency: transitive
     description:
@@ -1895,5 +1804,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
-  flutter: ">=3.24.5"
+  flutter: ">=3.27.0"

pubspec.yaml

@@ -13,8 +13,23 @@ publish_to: none
 environment:
   # this project bundles Flutter SDK via `flutter_wrapper`
   # cf https://github.com/passsy/flutter_wrapper
-  flutter: 3.24.5
+  flutter: 3.27.0
-  sdk: '>=3.5.0 <4.0.0'
+  sdk: ^3.6.0
+workspace:
+  - plugins/aves_magnifier
+  - plugins/aves_map
+  - plugins/aves_model
+  - plugins/aves_platform_meta
+  - plugins/aves_report
+  - plugins/aves_report_crashlytics
+  - plugins/aves_screen_state
+  - plugins/aves_services
+  - plugins/aves_services_google
+  - plugins/aves_ui
+  - plugins/aves_utils
+  - plugins/aves_video
+  - plugins/aves_video_ffmpeg
+  - plugins/aves_video_mpv
 
 # use `scripts/apply_flavor_{flavor}.sh` to set the right dependencies for the flavor
 dependencies:

scripts/pub_get_all.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-if [ ! -d "scripts" ]; then
-  cd ..
-fi
-
-./flutterw pub get
-
-cd plugins || exit
-for plugin in $(ls -d *); do
-  cd $plugin
-  ../../flutterw pub get
-  cd ..
-done
-cd ..

scripts/pub_upgrade_all.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-if [ ! -d "scripts" ]; then
-  cd ..
-fi
-
-./flutterw pub upgrade
-
-cd plugins || exit
-for plugin in $(ls -d *); do
-  cd $plugin
-  ../../flutterw pub upgrade
-  cd ..
-done
-cd ..