chore: upgrade 7 major dependencies with API migrations (#194)

ericgriffin · web-flow · commit 52444a23835e · 2026-04-11T12:27:17.000-04:00
* chore: upgrade 66 package dependencies and fix null-aware element lints

Ran flutter pub upgrade to bring all packages to latest within existing
semver constraints (e.g. riverpod 3.1-&gt;3.3, drift 2.30-&gt;2.31,
go_router 17.0-&gt;17.2, lints 6.0-&gt;6.1). Fixed use_null_aware_elements
lint violations surfaced by lints 6.1.0 upgrade.

* fix: pin device_info_plus to 12.3.0 to fix iOS build

v12.4.0 calls NSProcessInfo.isiOSAppOnVision which is unavailable in
Xcode 16.2's SDK, causing a compile error on iOS. Pin back to 12.3.0
via dependency_overrides until upstream fixes the availability guard.

* feat: upgrade 7 direct dependencies with breaking API migrations

Upgrade major versions:
- file_picker 10.x -&gt; 11.x (FilePicker.platform removed, use static methods)
- flutter_local_notifications 18.x -&gt; 21.x (positional -&gt; named params)
- flutter_contacts 1.x -&gt; 2.x (static -&gt; sub-API pattern)
- desktop_drop 0.4.x -&gt; 0.7.x (XFile -&gt; DropItem)
- googleapis 15.x -&gt; 16.x
- native_exif 0.6.x -&gt; 0.7.x
- timezone 0.10.x -&gt; 0.11.x

* fix: bump desugar_jdk_libs to 2.1.4 for flutter_local_notifications 21.x

flutter_local_notifications 21.x requires desugar_jdk_libs &gt;= 2.1.4
but the project had 2.0.4, causing Android build failure.

* test: add coverage for FilePicker API migration and rename test helper

Add MockFilePickerPlatform to exercise FilePicker.saveFile/pickFiles
code paths across CSV, Excel, KML, and file_export_utils services.
Rename _xFileFromBytes to _dropItemFromBytes in drop target test to
match the desktop_drop 0.7.x DropItem type.

* refactor: centralise FilePickerPlatform src/ import in mock helper

Re-export FilePickerPlatform from mock_file_picker_platform.dart so
test files avoid direct dependency on file_picker's internal src/ path.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -66,6 +66,6 @@ flutter {
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
     implementation("androidx.exifinterface:exifinterface:1.3.7")
 }
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -271,8 +271,8 @@ SPEC CHECKSUMS:
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_contacts: 5383945387e7ca37cf963d4be57c21f2fc15ca9f
-  flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
+  flutter_contacts: 2ec1d6b62ca2869c3bbb3871bd74d4e3ef157135
+  flutter_local_notifications: 643a3eda1ce1c0599413ca31672536d423dee214
   flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   gal: baecd024ebfd13c441269ca7404792a7152fde89
   geocoding_ios: 33776c9ebb98d037b5e025bb0e7537f6dd19646e
diff --git a/lib/core/services/database_location_service.dart b/lib/core/services/database_location_service.dart
@@ -139,7 +139,7 @@ class DatabaseLocationService {
 
     // On other platforms, use file_picker
     try {
-      final result = await FilePicker.platform.getDirectoryPath(
+      final result = await FilePicker.getDirectoryPath(
         dialogTitle: 'Choose Database Storage Location',
         lockParentWindow: true,
       );
diff --git a/lib/core/services/export/csv/csv_export_service.dart b/lib/core/services/export/csv/csv_export_service.dart
@@ -280,7 +280,7 @@ class CsvExportService {
     final dateStr = _dateFormat.format(DateTime.now());
     final fileName = 'dives_export_$dateStr.csv';
 
-    final result = await FilePicker.platform.saveFile(
+    final result = await FilePicker.saveFile(
       dialogTitle: 'Save Dives CSV',
       fileName: fileName,
       type: FileType.custom,
@@ -304,7 +304,7 @@ class CsvExportService {
     final dateStr = _dateFormat.format(DateTime.now());
     final fileName = 'sites_export_$dateStr.csv';
 
-    final result = await FilePicker.platform.saveFile(
+    final result = await FilePicker.saveFile(
       dialogTitle: 'Save Sites CSV',
       fileName: fileName,
       type: FileType.custom,
@@ -328,7 +328,7 @@ class CsvExportService {
     final dateStr = _dateFormat.format(DateTime.now());
     final fileName = 'equipment_export_$dateStr.csv';
 
-    final result = await FilePicker.platform.saveFile(
+    final result = await FilePicker.saveFile(
       dialogTitle: 'Save Equipment CSV',
       fileName: fileName,
       type: FileType.custom,
diff --git a/lib/core/services/export/excel/excel_export_service.dart b/lib/core/services/export/excel/excel_export_service.dart
@@ -124,7 +124,7 @@ class ExcelExportService {
     final dateStr = _dateFormat.format(DateTime.now());
     final fileName = 'submersion_export_$dateStr.xlsx';
 
-    final result = await FilePicker.platform.saveFile(
+    final result = await FilePicker.saveFile(
       dialogTitle: 'Save Excel File',
       fileName: fileName,
       type: FileType.custom,
diff --git a/lib/core/services/export/kml/kml_export_service.dart b/lib/core/services/export/kml/kml_export_service.dart
@@ -79,7 +79,7 @@ class KmlExportService {
     final dateStr = _dateFormat.format(DateTime.now());
     final fileName = 'submersion_sites_$dateStr.kml';
 
-    final result = await FilePicker.platform.saveFile(
+    final result = await FilePicker.saveFile(
       dialogTitle: 'Save KML File',
       fileName: fileName,
       type: FileType.custom,
diff --git a/lib/core/services/export/pdf/pdf_export_service.dart b/lib/core/services/export/pdf/pdf_export_service.dart
@@ -198,7 +198,7 @@ class PdfExportService {
       allSightings: allSightings,
     );
 
-    final saveResult = await FilePicker.platform.saveFile(
+    final saveResult = await FilePicker.saveFile(
       dialogTitle: 'Save PDF File',
       fileName: result.fileName,
       type: FileType.custom,
diff --git a/lib/core/services/export/shared/file_export_utils.dart b/lib/core/services/export/shared/file_export_utils.dart
@@ -83,7 +83,7 @@ Future<String> saveImageToPhotos(List<int> pngBytes, String fileName) async {
 /// Opens a file picker dialog allowing the user to choose where to save.
 /// Returns the saved file path, or null if the user cancelled.
 Future<String?> saveImageToFile(List<int> pngBytes, String fileName) async {
-  final result = await FilePicker.platform.saveFile(
+  final result = await FilePicker.saveFile(
     dialogTitle: 'Save Profile Image',
     fileName: fileName,
     type: FileType.image,
@@ -111,7 +111,7 @@ Future<String> sharePdfBytes(List<int> pdfBytes, String fileName) async {
 /// Opens a file picker dialog allowing the user to choose where to save.
 /// Returns the saved file path, or null if the user cancelled.
 Future<String?> savePdfToFile(List<int> pdfBytes, String fileName) async {
-  final result = await FilePicker.platform.saveFile(
+  final result = await FilePicker.saveFile(
     dialogTitle: 'Save PDF',
     fileName: fileName,
     type: FileType.custom,
diff --git a/lib/core/services/export/uddf/uddf_full_export_service.dart b/lib/core/services/export/uddf/uddf_full_export_service.dart
@@ -532,7 +532,7 @@ class UddfFullExportService {
     final fileName =
         'submersion_backup_${_dateFormat.format(DateTime.now())}.uddf';
 
-    final result = await FilePicker.platform.saveFile(
+    final result = await FilePicker.saveFile(
       dialogTitle: 'Save UDDF File',
       fileName: fileName,
       type: FileType.custom,
diff --git a/lib/core/services/notification_service.dart b/lib/core/services/notification_service.dart
@@ -64,7 +64,7 @@ class NotificationService {
     );
 
     await _plugin.initialize(
-      initSettings,
+      settings: initSettings,
       onDidReceiveNotificationResponse: _onNotificationTapped,
     );
 
@@ -166,15 +166,13 @@ class NotificationService {
     final scheduledTz = tz.TZDateTime.from(scheduledDate, tz.local);
 
     await _plugin.zonedSchedule(
-      notificationId,
-      title,
-      body,
-      scheduledTz,
-      details,
+      id: notificationId,
+      title: title,
+      body: body,
+      scheduledDate: scheduledTz,
+      notificationDetails: details,
       payload: equipmentId,
       androidScheduleMode: AndroidScheduleMode.inexactAllowWhileIdle,
-      uiLocalNotificationDateInterpretation:
-          UILocalNotificationDateInterpretation.absoluteTime,
     );
 
     _log.info(
@@ -222,15 +220,20 @@ class NotificationService {
     // Use a fixed ID so repeated backup notifications replace each other
     const backupNotificationId = 99000;
 
-    await _plugin.show(backupNotificationId, title, body, details);
+    await _plugin.show(
+      id: backupNotificationId,
+      title: title,
+      body: body,
+      notificationDetails: details,
+    );
 
     _log.info('Showed backup notification (success: $success)');
   }
 
   /// Cancel a specific notification
   Future<void> cancelNotification(int notificationId) async {
     if (!_isMobilePlatform) return;
-    await _plugin.cancel(notificationId);
+    await _plugin.cancel(id: notificationId);
     _log.info('Cancelled notification $notificationId');
   }
 
diff --git a/lib/features/backup/presentation/pages/backup_settings_page.dart b/lib/features/backup/presentation/pages/backup_settings_page.dart
@@ -167,7 +167,7 @@ class BackupSettingsPage extends ConsumerWidget {
     ExportBottomSheet.show(
       context,
       onSaveToFile: () async {
-        final result = await FilePicker.platform.saveFile(
+        final result = await FilePicker.saveFile(
           dialogTitle: context.l10n.backup_export_title,
           fileName: _generateDefaultFilename(),
           allowedExtensions: ['db', 'sqlite'],
@@ -204,7 +204,7 @@ class BackupSettingsPage extends ConsumerWidget {
   Future<void> _handleImport(BuildContext context, WidgetRef ref) async {
     final FilePickerResult? result;
     try {
-      result = await FilePicker.platform.pickFiles(type: FileType.any);
+      result = await FilePicker.pickFiles(type: FileType.any);
     } on Exception catch (e) {
       if (context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
@@ -431,7 +431,7 @@ class BackupSettingsPage extends ConsumerWidget {
           ),
           trailing: TextButton(
             onPressed: () async {
-              final path = await FilePicker.platform.getDirectoryPath(
+              final path = await FilePicker.getDirectoryPath(
                 dialogTitle: context.l10n.backup_location_title,
               );
               if (path != null) {
diff --git a/lib/features/buddies/presentation/widgets/buddy_list_content.dart b/lib/features/buddies/presentation/widgets/buddy_list_content.dart
@@ -299,23 +299,26 @@ class _BuddyListContentState extends ConsumerState<BuddyListContent> {
     }
 
     try {
-      if (!await FlutterContacts.requestPermission(readonly: true)) {
-        if (context.mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(
-                context.l10n.buddies_message_contactPermissionRequired,
+      if (!await FlutterContacts.permissions.has(PermissionType.read)) {
+        await FlutterContacts.permissions.request(PermissionType.read);
+        if (!await FlutterContacts.permissions.has(PermissionType.read)) {
+          if (context.mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  context.l10n.buddies_message_contactPermissionRequired,
+                ),
               ),
-            ),
-          );
+            );
+          }
+          return;
         }
-        return;
       }
 
-      final contact = await FlutterContacts.openExternalPick();
-      if (contact == null) return;
+      final contactId = await FlutterContacts.native.showPicker();
+      if (contactId == null) return;
 
-      final fullContact = await FlutterContacts.getContact(contact.id);
+      final fullContact = await FlutterContacts.get(contactId);
       if (fullContact == null) {
         if (context.mounted) {
           ScaffoldMessenger.of(context).showSnackBar(
diff --git a/lib/features/dive_import/presentation/providers/uddf_import_providers.dart b/lib/features/dive_import/presentation/providers/uddf_import_providers.dart
@@ -241,7 +241,7 @@ class UddfImportNotifier extends StateNotifier<UddfImportState> {
     try {
       // Use FileType.any on iOS/macOS since custom extensions don't work
       // reliably in sandboxed apps.
-      final result = await FilePicker.platform.pickFiles(
+      final result = await FilePicker.pickFiles(
         type: FileType.any,
         allowMultiple: false,
       );
diff --git a/lib/features/settings/presentation/providers/debug_log_providers.dart b/lib/features/settings/presentation/providers/debug_log_providers.dart
@@ -147,7 +147,7 @@ Future<String?> saveLogFile(LogFileService service) async {
   if (!file.existsSync()) return null;
 
   final bytes = await file.readAsBytes();
-  final result = await FilePicker.platform.saveFile(
+  final result = await FilePicker.saveFile(
     dialogTitle: 'Save Debug Logs',
     fileName: 'submersion-debug-logs.txt',
     type: FileType.custom,
diff --git a/lib/features/settings/presentation/providers/export_providers.dart b/lib/features/settings/presentation/providers/export_providers.dart
@@ -1037,7 +1037,7 @@ class ExportNotifier extends StateNotifier<ExportState> {
       await DatabaseService.instance.backup(tempBackupPath);
 
       // Let user choose where to save the file
-      final savePath = await FilePicker.platform.saveFile(
+      final savePath = await FilePicker.saveFile(
         dialogTitle: 'Save Backup',
         fileName: fileName,
         type: FileType.any,
@@ -1085,7 +1085,7 @@ class ExportNotifier extends StateNotifier<ExportState> {
     try {
       // Use FileType.any on iOS/macOS since custom extensions don't work reliably
       final useAnyType = Platform.isIOS || Platform.isMacOS;
-      final result = await FilePicker.platform.pickFiles(
+      final result = await FilePicker.pickFiles(
         type: useAnyType ? FileType.any : FileType.custom,
         allowedExtensions: useAnyType ? null : ['db'],
         allowMultiple: false,
diff --git a/lib/features/universal_import/presentation/providers/universal_import_providers.dart b/lib/features/universal_import/presentation/providers/universal_import_providers.dart
@@ -157,7 +157,7 @@ class UniversalImportNotifier extends StateNotifier<UniversalImportState> {
     );
 
     try {
-      final result = await FilePicker.platform.pickFiles(
+      final result = await FilePicker.pickFiles(
         type: FileType.any,
         allowMultiple: false,
       );
@@ -286,7 +286,7 @@ class UniversalImportNotifier extends StateNotifier<UniversalImportState> {
     state = state.copyWith(isLoading: true, clearError: true);
 
     try {
-      final result = await FilePicker.platform.pickFiles(
+      final result = await FilePicker.pickFiles(
         type: FileType.any,
         allowMultiple: false,
       );
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -10,6 +10,7 @@ import desktop_drop
 import device_info_plus
 import file_picker
 import file_selector_macos
+import flutter_contacts
 import flutter_local_notifications
 import flutter_secure_storage_darwin
 import gal
@@ -33,6 +34,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FlutterContactsPlugin.register(with: registry.registrar(forPlugin: "FlutterContactsPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
   GalPlugin.register(with: registry.registrar(forPlugin: "GalPlugin"))
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -20,6 +20,8 @@ PODS:
     - FlutterMacOS
   - file_selector_macos (0.0.1):
     - FlutterMacOS
+  - flutter_contacts (0.0.1):
+    - FlutterMacOS
   - flutter_local_notifications (0.0.1):
     - FlutterMacOS
   - flutter_secure_storage_darwin (10.0.0):
@@ -119,6 +121,7 @@ DEPENDENCIES:
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
   - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
+  - flutter_contacts (from `Flutter/ephemeral/.symlinks/plugins/flutter_contacts/macos`)
   - flutter_local_notifications (from `Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos`)
   - flutter_secure_storage_darwin (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
   - FlutterMacOS (from `Flutter/ephemeral`)
@@ -161,6 +164,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
   file_selector_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
+  flutter_contacts:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_contacts/macos
   flutter_local_notifications:
     :path: Flutter/ephemeral/.symlinks/plugins/flutter_local_notifications/macos
   flutter_secure_storage_darwin:
@@ -200,11 +205,12 @@ SPEC CHECKSUMS:
   AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063
   AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
   auto_updater_macos: 3a42f1a06be6981f1a18be37e6e7bf86aa732118
-  desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43
+  desktop_drop: 10a3e6a7fa9dbe350541f2574092fecfa345a07b
   device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
   file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
   file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7
-  flutter_local_notifications: 13862b132e32eb858dea558a86d45d08daeacfe7
+  flutter_contacts: 6f45cdf49f4fb2241793263546f823f7e812668e
+  flutter_local_notifications: 1fc7ffb10a83d6a2eeeeddb152d43f1944b0aad0
   flutter_secure_storage_darwin: acdb3f316ed05a3e68f856e0353b133eec373a23
   FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
   gal: baecd024ebfd13c441269ca7404792a7152fde89
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
diff --git a/test/core/services/export/csv/csv_export_service_test.dart b/test/core/services/export/csv/csv_export_service_test.dart
diff --git a/test/core/services/export/file_picker_save_test.dart b/test/core/services/export/file_picker_save_test.dart
diff --git a/test/helpers/mock_file_picker_platform.dart b/test/helpers/mock_file_picker_platform.dart
diff --git a/test/shared/widgets/global_drop_target_test.dart b/test/shared/widgets/global_drop_target_test.dart
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ flutter {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`dependencies {`
`69`		`- coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")`
	`69`	`+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")`
`70`	`70`	`implementation("androidx.exifinterface:exifinterface:1.3.7")`
`71`	`71`	`}`