chore: Migration to Flutter 3.19 (#5154)

* Migration to Flutter 3.19.x * Fix warnings about `(context).mounted`
openfoodfacts · Apr 15, 2024 · 6a2722f · 6a2722f
1 parent 2ee3cd8
commit 6a2722f
Show file tree

Hide file tree

Showing 24 changed files with 74 additions and 51 deletions.
diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@
 
 - Make sure you have installed flutter and all the requirements
   - [Official flutter installation guide](https://docs.flutter.dev/get-started/install)
-- Currently, the app uses the latest stable version of Flutter (3.16.7).
+- Currently, the app uses the latest stable version of Flutter (3.19.x).
 
 
 We have predefined run configurations for Android Studio and Visual Studio Code

diff --git a/flutter-version.txt b/flutter-version.txt
@@ -1 +1 @@
-3.16.7
+3.19.5
diff --git a/packages/app_store/apple_app_store/pubspec.yaml b/packages/app_store/apple_app_store/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/app_store/google_play/pubspec.yaml b/packages/app_store/google_play/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/app_store/shared/pubspec.yaml b/packages/app_store/shared/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/app_store/uri_store/pubspec.yaml b/packages/app_store/uri_store/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.0.1
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/scanner/ml_kit/pubspec.yaml b/packages/scanner/ml_kit/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/scanner/shared/pubspec.yaml b/packages/scanner/shared/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/scanner/zxing/pubspec.yaml b/packages/scanner/zxing/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=3.1.0 <4.0.0'
+  sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
   flutter:

diff --git a/packages/smooth_app/lib/cards/product_cards/smooth_product_card_loading.dart b/packages/smooth_app/lib/cards/product_cards/smooth_product_card_loading.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

diff --git a/packages/smooth_app/lib/pages/crop_page.dart b/packages/smooth_app/lib/pages/crop_page.dart
@@ -340,7 +340,7 @@ class _CropPageState extends State<CropPage> {
         sequenceNumber,
       );
       final Rect cropRect = _getLocalCropRect();
-      if (context.mounted) {
+      if (mounted) {
         await BackgroundTaskImage.addTask(
           widget.barcode,
           language: widget.language,
@@ -361,7 +361,7 @@ class _CropPageState extends State<CropPage> {
       // issue here (we're cropping from an allegedly already privacy compliant
       // picture).
       final Rect cropRect = _getServerCropRect();
-      if (context.mounted) {
+      if (mounted) {
         await BackgroundTaskCrop.addTask(
           widget.barcode,
           language: widget.language,

diff --git a/packages/smooth_app/lib/pages/offline_data_page.dart b/packages/smooth_app/lib/pages/offline_data_page.dart
@@ -86,7 +86,7 @@ class _OfflineDataPageState extends State<OfflineDataPage> {
               onTap: () async {
                 final int totalProductsDeleted = await daoProduct.deleteAll();
                 await daoProductLastAccess.deleteAll();
-                if (mounted) {
+                if (context.mounted) {
                   ScaffoldMessenger.of(context).showSnackBar(
                     SnackBar(
                       content: Text(

diff --git a/packages/smooth_app/lib/pages/personalized_ranking_page.dart b/packages/smooth_app/lib/pages/personalized_ranking_page.dart
@@ -60,7 +60,7 @@ class _PersonalizedRankingPageState extends State<PersonalizedRankingPage>
       context,
       widget.barcodes.toSet(),
     );
-    if (!mounted) {
+    if (!context.mounted) {
       return;
     }
     if (added != null && added) {

diff --git a/packages/smooth_app/lib/pages/preferences/user_preferences_languages_list.dart b/packages/smooth_app/lib/pages/preferences/user_preferences_languages_list.dart
@@ -199,11 +199,11 @@ class Languages {
   List<OpenFoodFactsLanguage> getSupportedLanguagesNameInEnglish() {
     final List<OpenFoodFactsLanguage> languages = <OpenFoodFactsLanguage>[];
 
-    _namesInLanguage.forEach(
-      (OpenFoodFactsLanguage lc, String _) => <void>{
-        if (_delegate.isSupported(Locale(lc.code))) <void>{languages.add(lc)}
-      },
-    );
+    _namesInLanguage.forEach((OpenFoodFactsLanguage lc, String _) {
+      if (_delegate.isSupported(Locale(lc.code))) {
+        languages.add(lc);
+      }
+    });
 
     return languages;
   }

diff --git a/packages/smooth_app/lib/pages/product/add_basic_details_page.dart b/packages/smooth_app/lib/pages/product/add_basic_details_page.dart
@@ -244,7 +244,7 @@ class _AddBasicDetailsPageState extends State<AddBasicDetailsPage> {
       return false;
     }
 
-    if (!context.mounted) {
+    if (!mounted) {
       return false;
     }
 

diff --git a/packages/smooth_app/lib/pages/product/common/product_list_page.dart b/packages/smooth_app/lib/pages/product/common/product_list_page.dart
@@ -466,7 +466,7 @@ class _ProductListPageState extends State<ProductListPage>
         setState(() {});
         return;
       case false:
-        if (context.mounted) {
+        if (mounted) {
           LoadingDialog.error(context: context);
         }
         return;

diff --git a/packages/smooth_app/lib/pages/product/edit_ocr_page.dart b/packages/smooth_app/lib/pages/product/edit_ocr_page.dart
@@ -100,7 +100,7 @@ class _EditOcrPageState extends State<EditOcrPage> with UpToDateMixin {
     )) {
       return;
     }
-    if (!context.mounted) {
+    if (!mounted) {
       return;
     }
     AnalyticsHelper.trackProductEdit(

diff --git a/packages/smooth_app/lib/pages/product/edit_product_page.dart b/packages/smooth_app/lib/pages/product/edit_product_page.dart
@@ -292,7 +292,7 @@ class _EditProductPageState extends State<EditProductPage> with UpToDateMixin {
         )) {
           return;
         }
-        if (!context.mounted) {
+        if (!mounted) {
           return;
         }
         AnalyticsHelper.trackProductEdit(

diff --git a/packages/smooth_app/lib/pages/product_list_user_dialog_helper.dart b/packages/smooth_app/lib/pages/product_list_user_dialog_helper.dart
@@ -370,7 +370,7 @@ class _UserEmptyListsState extends State<_UserEmptyLists> {
               await ProductListUserDialogHelper(widget.daoProductList)
                   .showCreateUserListDialog(context);
 
-          if (productList != null && mounted) {
+          if (productList != null && context.mounted) {
             Navigator.pop<bool>(context, true);
           }
         },

diff --git a/packages/smooth_app/lib/pages/scan/scan_header.dart b/packages/smooth_app/lib/pages/scan/scan_header.dart
@@ -82,7 +82,7 @@ class _ScanHeaderState extends State<ScanHeader> {
                                 final ContinuousScanModel model =
                                     context.read<ContinuousScanModel>();
                                 await model.refreshProductList();
-                                if (!mounted) {
+                                if (!context.mounted) {
                                   return;
                                 }
                                 await Navigator.push<void>(

diff --git a/packages/smooth_app/lib/pages/user_management/login_page.dart b/packages/smooth_app/lib/pages/user_management/login_page.dart
@@ -56,7 +56,7 @@ class _LoginPageState extends State<LoginPage> with TraceableClientMixin {
         password: passwordController.text,
       ),
     );
-    if (!mounted) {
+    if (!context.mounted) {
       return;
     }
     setState(() => _runningQuery = false);
@@ -67,7 +67,7 @@ class _LoginPageState extends State<LoginPage> with TraceableClientMixin {
 
     AnalyticsHelper.trackEvent(AnalyticsEvent.loginAction);
     await _showInAppReviewIfNecessary(context);
-    if (!mounted) {
+    if (!context.mounted) {
       return;
     }
     Navigator.pop(context);
@@ -297,7 +297,7 @@ class _LoginPageState extends State<LoginPage> with TraceableClientMixin {
                               ),
                             );
                             if (registered == true) {
-                              if (!mounted) {
+                              if (!context.mounted) {
                                 return;
                               }
                               Navigator.of(context).pop();

diff --git a/packages/smooth_app/lib/pages/user_management/sign_up_page.dart b/packages/smooth_app/lib/pages/user_management/sign_up_page.dart
@@ -394,7 +394,7 @@ class _SignUpPageState extends State<SignUpPage> with TraceableClientMixin {
         }
       }
 
-      if (context.mounted) {
+      if (mounted) {
         await LoadingDialog.error(
           context: context,
           title: errorMessage,
@@ -408,7 +408,7 @@ class _SignUpPageState extends State<SignUpPage> with TraceableClientMixin {
       return;
     }
     await context.read<UserManagementProvider>().putUser(user);
-    if (!context.mounted) {
+    if (!mounted) {
       return;
     }
     await showDialog<void>(

diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
@@ -465,10 +465,10 @@ packages:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   file_selector_linux:
     dependency: transitive
     description:
@@ -984,6 +984,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -1020,18 +1044,18 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   matomo_tracker:
     dependency: "direct main"
     description:
@@ -1052,10 +1076,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   mgrs_dart:
     dependency: transitive
     description:
@@ -1149,10 +1173,10 @@ packages:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -1285,10 +1309,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: "direct dev"
     description:
@@ -1317,10 +1341,10 @@ packages:
     dependency: transitive
     description:
       name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.4"
+    version: "5.0.2"
   proj4dart:
     dependency: transitive
     description:
@@ -1759,10 +1783,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
       url: "https://pub.dev"
     source: hosted
-    version: "11.10.0"
+    version: "13.0.0"
   watcher:
     dependency: transitive
     description:
@@ -1783,10 +1807,10 @@ packages:
     dependency: transitive
     description:
       name: webdriver
-      sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
+      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   webview_flutter:
     dependency: "direct main"
     description:
@@ -1868,5 +1892,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.2.3 <4.0.0"
+  dart: ">=3.3.3 <4.0.0"
   flutter: ">=3.16.0"