Upgrade flutter version to 3.13

archethic-foundation · Aug 17, 2023 · 672f987 · 672f987
1 parent 49fb53f
commit 672f987
Show file tree

Hide file tree

Showing 23 changed files with 164 additions and 111 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -12,8 +12,8 @@ analyzer:
     - test/.test_coverage.dart
     - lib/localization.dart
     - lib/l10n/*
-    - '**/*.freezed.dart'
-    - '**/*.g.dart'
+    - "**/*.freezed.dart"
+    - "**/*.g.dart"
 
 language:
   strict-casts: true
@@ -76,6 +76,7 @@ linter:
     - cancel_subscriptions
     - cascade_invocations
     - cast_nullable_to_non_nullable
+    - collection_methods_unrelated_type
     - comment_references
     - conditional_uri_does_not_exist
     - constant_identifier_names
@@ -92,14 +93,12 @@ linter:
     - flutter_style_todos
     - hash_and_equals
     - implementation_imports
-    - iterable_contains_unrelated_type
     - join_return_with_assignment
     - leading_newlines_in_multiline_strings
     - library_names
     - library_prefixes
     - library_private_types_in_public_api
     # - lines_longer_than_80_chars
-    - list_remove_unrelated_type
     - literal_only_boolean_expressions
     - missing_whitespace_between_adjacent_strings
     - no_adjacent_strings_in_list
@@ -207,6 +206,5 @@ linter:
     - use_to_and_as_if_applicable
     - valid_regexps
     - void_checks
-
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
diff --git a/lib/application/websites.dart b/lib/application/websites.dart
@@ -54,12 +54,11 @@ class WebsitesRepository {
 
               var genesisAddress = '';
               // Get genesis address
-              final response = await sl
-                  .get<ArchethicDAppClient>()
-                  .keychainDeriveAddress({
+              final response =
+                  await sl.get<ArchethicDAppClient>().keychainDeriveAddress({
                 'serviceName': 'aeweb-$name',
                 'index': 0,
-                'pathSuffix': ''
+                'pathSuffix': '',
               });
               response.when(
                 failure: (failure) {},

diff --git a/lib/domain/usecases/website/add_website.dart b/lib/domain/usecases/website/add_website.dart
@@ -238,7 +238,7 @@ class AddWebsiteUseCases
         <Transaction>[
           transactionTransfer,
           ...transactionsList,
-          transactionReference
+          transactionReference,
         ],
       );
 

diff --git a/lib/domain/usecases/website/update_website_sync.dart b/lib/domain/usecases/website/update_website_sync.dart
@@ -311,7 +311,7 @@ class UpdateWebsiteSyncUseCases with FileMixin, TransactionAEWebMixin {
         <Transaction>[
           transactionTransfer,
           ...transactionsList,
-          transactionReference
+          transactionReference,
         ],
       );
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -153,7 +153,7 @@ class MyApp extends ConsumerWidget {
         AppLocalizations.delegate,
         GlobalMaterialLocalizations.delegate,
         GlobalCupertinoLocalizations.delegate,
-        GlobalWidgetsLocalizations.delegate
+        GlobalWidgetsLocalizations.delegate,
       ],
     );
   }

diff --git a/lib/navigation_drawer_section.dart b/lib/navigation_drawer_section.dart
@@ -263,7 +263,7 @@ class _NavigationDrawerSectionState
         const Padding(
           padding: EdgeInsets.all(10),
           child: ConnectionToWalletStatus(),
-        )
+        ),
       ],
     );
   }

diff --git a/lib/ui/views/add_website/layouts/components/add_website_steps.dart b/lib/ui/views/add_website/layouts/components/add_website_steps.dart
@@ -257,7 +257,7 @@ class AddWebsiteSteps extends ConsumerWidget {
             icon,
             color: Colors.green,
             size: 14,
-          )
+          ),
         ],
       ),
     );
@@ -286,7 +286,7 @@ class AddWebsiteSteps extends ConsumerWidget {
             icon,
             color: Colors.red,
             size: 14,
-          )
+          ),
         ],
       ),
     );

diff --git a/lib/ui/views/display_website/explorer_files.dart b/lib/ui/views/display_website/explorer_files.dart
@@ -224,7 +224,7 @@ class ExplorerFilesScreenState extends ConsumerState<ExplorerFilesScreen> {
                               node,
                             ),
                           ),
-                        )
+                        ),
                       ],
                     ),
                   );

diff --git a/lib/ui/views/main_screen.dart b/lib/ui/views/main_screen.dart
@@ -58,7 +58,7 @@ class MainScreenState extends ConsumerState<MainScreen> {
               if (session.isConnected)
                 ref.watch(
                   MainScreenThirdPartProviders.mainScreenThirdPartProvider,
-                )
+                ),
             ],
           ),
         ),

diff --git a/lib/ui/views/unpublish_website/layouts/components/unpublish_website_bottom_bar.dart b/lib/ui/views/unpublish_website/layouts/components/unpublish_website_bottom_bar.dart
@@ -142,7 +142,7 @@ class UnpublishWebsiteBottomBar extends ConsumerWidget {
                                                 );
                                               }
                                             },
-                                          )
+                                          ),
                                         ],
                                       ),
                                     ),
@@ -156,7 +156,7 @@ class UnpublishWebsiteBottomBar extends ConsumerWidget {
                     },
                   );
                 },
-              )
+              ),
         ],
       ),
     );

diff --git a/lib/ui/views/unpublish_website/layouts/components/unpublish_website_steps.dart b/lib/ui/views/unpublish_website/layouts/components/unpublish_website_steps.dart
@@ -229,7 +229,7 @@ class UnpublishWebsiteSteps extends ConsumerWidget {
             icon,
             color: Colors.green,
             size: 14,
-          )
+          ),
         ],
       ),
     );
@@ -258,7 +258,7 @@ class UnpublishWebsiteSteps extends ConsumerWidget {
             icon,
             color: Colors.red,
             size: 14,
-          )
+          ),
         ],
       ),
     );

diff --git a/lib/ui/views/update_certificate/layouts/components/update_certificate_steps.dart b/lib/ui/views/update_certificate/layouts/components/update_certificate_steps.dart
@@ -232,7 +232,7 @@ class UpdateCertificateSteps extends ConsumerWidget {
             icon,
             color: Colors.green,
             size: 14,
-          )
+          ),
         ],
       ),
     );
@@ -261,7 +261,7 @@ class UpdateCertificateSteps extends ConsumerWidget {
             icon,
             color: Colors.red,
             size: 14,
-          )
+          ),
         ],
       ),
     );

diff --git a/lib/ui/views/update_website_sync/layouts/components/update_website_sync_bottom_bar.dart b/lib/ui/views/update_website_sync/layouts/components/update_website_sync_bottom_bar.dart
@@ -76,7 +76,7 @@ class UpdateWebsiteSyncBottomBar extends ConsumerWidget {
                       );
                       await updateWebsiteSyncNotifier.update(context, ref);
                     },
-                  )
+                  ),
             ],
           ),
         ],

diff --git a/lib/ui/views/update_website_sync/layouts/components/update_website_sync_steps.dart b/lib/ui/views/update_website_sync/layouts/components/update_website_sync_steps.dart
@@ -259,7 +259,7 @@ class UpdateWebsiteSyncSteps extends ConsumerWidget {
             icon,
             color: Colors.green,
             size: 14,
-          )
+          ),
         ],
       ),
     );
@@ -288,7 +288,7 @@ class UpdateWebsiteSyncSteps extends ConsumerWidget {
             icon,
             color: Colors.red,
             size: 14,
-          )
+          ),
         ],
       ),
     );

diff --git a/lib/ui/views/util/choose_path_sync_popup.dart b/lib/ui/views/util/choose_path_sync_popup.dart
@@ -111,7 +111,7 @@ class PathSyncPopup with FileMixin {
                                               allowedExtensions: [
                                                 'zip',
                                                 '7z',
-                                                'rar'
+                                                'rar',
                                               ],
                                             );
                                             if (result != null) {

diff --git a/lib/ui/views/util/components/app_text_field.dart b/lib/ui/views/util/components/app_text_field.dart
@@ -204,7 +204,7 @@ class _AppTextFieldState extends ConsumerState<AppTextField> {
                               : CrossFadeState.showSecond,
                         )
                       else
-                        widget.suffixButton ?? const SizedBox()
+                        widget.suffixButton ?? const SizedBox(),
                     ],
                   ),
                 ],

diff --git a/lib/ui/views/util/components/upload_file.dart b/lib/ui/views/util/components/upload_file.dart
@@ -120,7 +120,7 @@ class UploadFile extends ConsumerWidget {
                       extensionsLabel!,
                       style: textTheme.labelSmall!
                           .copyWith(fontWeight: FontWeight.w300),
-                    )
+                    ),
                 ],
               ),
             ),

diff --git a/lib/ui/views/util/header.dart b/lib/ui/views/util/header.dart
@@ -68,7 +68,7 @@ class Header extends StatelessWidget {
               height: 60,
               child: ConnectionToWalletStatus(),
             ),
-          )
+          ),
       ],
     );
   }

diff --git a/lib/util/external/ignore.dart b/lib/util/external/ignore.dart
@@ -268,7 +268,7 @@ class Ignore {
     // Do a depth first tree-search starting at [beneath].
     // toVisit is a stack containing all items that are waiting to be processed.
     final toVisit = [
-      [beneath]
+      [beneath],
     ];
     while (toVisit.isNotEmpty) {
       final topOfStack = toVisit.last;

diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
@@ -203,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"