[mob][auth] Flutter upgrade to 3.27.2 (#4799)

## Description ## Tests
ente-io · Jan 21, 2025 · 45e8006 · 45e8006
2 parents 17ab295 + 39a54a0
commit 45e8006
Show file tree

Hide file tree

Showing 40 changed files with 126 additions and 205 deletions.
diff --git a/.github/workflows/auth-internal-release.yml b/.github/workflows/auth-internal-release.yml
@@ -4,7 +4,7 @@ on:
     workflow_dispatch: # Allow manually running the action
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.2"
 
 jobs:
     build:

diff --git a/.github/workflows/auth-lint.yml b/.github/workflows/auth-lint.yml
@@ -8,7 +8,7 @@ on:
             - ".github/workflows/auth-lint.yml"
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.2"
 
 jobs:
     lint:

diff --git a/.github/workflows/auth-release.yml b/.github/workflows/auth-release.yml
@@ -29,7 +29,7 @@ on:
             - "auth-v*"
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.2"
 
 jobs:
     build-ubuntu:

diff --git a/.github/workflows/mobile-internal-release.yml b/.github/workflows/mobile-internal-release.yml
@@ -4,7 +4,7 @@ on:
     workflow_dispatch: # Allow manually running the action
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.2"
 
 jobs:
     build:

diff --git a/.github/workflows/mobile-lint.yml b/.github/workflows/mobile-lint.yml
@@ -9,7 +9,7 @@ on:
 
 env:
 
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.2"
 
 jobs:
     lint:

diff --git a/.github/workflows/mobile-release.yml b/.github/workflows/mobile-release.yml
@@ -9,7 +9,7 @@ on:
             - "photos-v*"
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.2"
 
 jobs:
     build:

diff --git a/auth/flutter b/auth/flutter
diff --git a/auth/lib/models/account/two_factor.dart b/auth/lib/models/account/two_factor.dart
@@ -7,7 +7,5 @@ String twoFactorTypeToString(TwoFactorType type) {
       return "totp";
     case TwoFactorType.passkey:
       return "passkey";
-    default:
-      return type.name;
   }
 }
diff --git a/auth/lib/ui/components/menu_item_widget.dart b/auth/lib/ui/components/menu_item_widget.dart
@@ -210,7 +210,7 @@ class _MenuItemWidgetState extends State<MenuItemWidget> {
 
   Future<void> _onTap() async {
     if (executionStateNotifier.value == ExecutionState.inProgress ||
-        executionStateNotifier.value == ExecutionState.successful) return;
+        executionStateNotifier.value == ExecutionState.successful) {return;}
     _debouncer.run(
       () => Future(
         () {
@@ -247,7 +247,7 @@ class _MenuItemWidgetState extends State<MenuItemWidget> {
 
   void _onTapDown(details) {
     if (executionStateNotifier.value == ExecutionState.inProgress ||
-        executionStateNotifier.value == ExecutionState.successful) return;
+        executionStateNotifier.value == ExecutionState.successful) {return;}
     setState(() {
       if (widget.pressedColor == null) {
         hasPassedGestureCallbacks()
@@ -265,7 +265,7 @@ class _MenuItemWidgetState extends State<MenuItemWidget> {
 
   void _onTapUp(details) {
     if (executionStateNotifier.value == ExecutionState.inProgress ||
-        executionStateNotifier.value == ExecutionState.successful) return;
+        executionStateNotifier.value == ExecutionState.successful) {return;}
     Future.delayed(
       const Duration(milliseconds: 100),
       () => setState(() {
@@ -276,7 +276,7 @@ class _MenuItemWidgetState extends State<MenuItemWidget> {
 
   void _onCancel() {
     if (executionStateNotifier.value == ExecutionState.inProgress ||
-        executionStateNotifier.value == ExecutionState.successful) return;
+        executionStateNotifier.value == ExecutionState.successful) {return;}
     setState(() {
       menuItemColor = widget.menuItemColor;
     });

diff --git a/auth/lib/ui/home_page.dart b/auth/lib/ui/home_page.dart
@@ -274,7 +274,6 @@ class _HomePageState extends State<HomePage> {
         );
         break;
       case CodeSortKey.manual:
-      default:
         codes.sort((a, b) => a.display.position.compareTo(b.display.position));
         break;
     }

diff --git a/auth/linux/flutter/generated_plugin_registrant.cc b/auth/linux/flutter/generated_plugin_registrant.cc
@@ -10,6 +10,7 @@
 #include <flutter_local_authentication/flutter_local_authentication_plugin.h>
 #include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
 #include <gtk/gtk_plugin.h>
+#include <rive_common/rive_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
 #include <sentry_flutter/sentry_flutter_plugin.h>
 #include <sodium_libs/sodium_libs_plugin.h>
@@ -31,6 +32,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) gtk_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
   gtk_plugin_register_with_registrar(gtk_registrar);
+  g_autoptr(FlPluginRegistrar) rive_common_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "RivePlugin");
+  rive_plugin_register_with_registrar(rive_common_registrar);
   g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
   screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);

diff --git a/auth/linux/flutter/generated_plugins.cmake b/auth/linux/flutter/generated_plugins.cmake
@@ -7,6 +7,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_local_authentication
   flutter_secure_storage_linux
   gtk
+  rive_common
   screen_retriever
   sentry_flutter
   sodium_libs

diff --git a/auth/macos/Flutter/GeneratedPluginRegistrant.swift b/auth/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -16,6 +16,7 @@ import flutter_secure_storage_macos
 import local_auth_darwin
 import package_info_plus
 import path_provider_foundation
+import rive_common
 import screen_retriever
 import sentry_flutter
 import share_plus
@@ -39,6 +40,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
+  RivePlugin.register(with: registry.registrar(forPlugin: "RivePlugin"))
   ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
   SentryFlutterPlugin.register(with: registry.registrar(forPlugin: "SentryFlutterPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))

diff --git a/auth/macos/Podfile.lock b/auth/macos/Podfile.lock
@@ -27,6 +27,8 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - rive_common (0.0.1):
+    - FlutterMacOS
   - screen_retriever (0.0.1):
     - FlutterMacOS
   - Sentry/HybridSDK (8.36.0)
@@ -82,6 +84,7 @@ DEPENDENCIES:
   - local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
+  - rive_common (from `Flutter/ephemeral/.symlinks/plugins/rive_common/macos`)
   - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
   - sentry_flutter (from `Flutter/ephemeral/.symlinks/plugins/sentry_flutter/macos`)
   - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
@@ -124,6 +127,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
   path_provider_foundation:
     :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
+  rive_common:
+    :path: Flutter/ephemeral/.symlinks/plugins/rive_common/macos
   screen_retriever:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
   sentry_flutter:
@@ -159,6 +164,7 @@ SPEC CHECKSUMS:
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  rive_common: 9580b9f1f08a8c85006083078e80479edf3db26a
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
   Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
   sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe

diff --git a/auth/pubspec.lock b/auth/pubspec.lock
@@ -5,15 +5,15 @@ 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"
   _macros:
     dependency: transitive
     description: dart
     source: sdk
-    version: "0.3.2"
+    version: "0.3.3"
   adaptive_theme:
     dependency: "direct main"
     description:
@@ -26,10 +26,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.11.0"
   ansicolor:
     dependency: transitive
     description:
@@ -250,10 +250,10 @@ 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"
   confetti:
     dependency: "direct main"
     description:
@@ -434,11 +434,12 @@ packages:
   figma_squircle:
     dependency: "direct main"
     description:
-      name: figma_squircle
-      sha256: "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.5.3"
+      path: "."
+      ref: HEAD
+      resolved-ref: "5f1ad5aaccdf31fc398fc141979ea845a0f45383"
+      url: "https://github.com/Ax0elz/figma_squircle.git"
+    source: git
+    version: "0.5.5"
   file:
     dependency: transitive
     description:
@@ -913,18 +914,18 @@ packages:
     dependency: transitive
     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:
@@ -993,10 +994,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"
   matcher:
     dependency: transitive
     description:
@@ -1449,7 +1450,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   sodium:
     dependency: transitive
     description:
@@ -1543,10 +1544,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   steam_totp:
     dependency: "direct main"
     description:
@@ -1583,10 +1584,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"
   styled_text:
     dependency: "direct main"
     description:
@@ -1615,10 +1616,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
   timezone:
     dependency: transitive
     description:
@@ -1783,10 +1784,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"
   watcher:
     dependency: transitive
     description:

diff --git a/auth/pubspec.yaml b/auth/pubspec.yaml
@@ -32,7 +32,9 @@ dependencies:
   expandable: ^5.0.1
   expansion_tile_card: ^3.0.0
   ffi: ^2.1.0
-  figma_squircle: ^0.5.3
+  figma_squircle: 
+    git:
+      url: https://github.com/Ax0elz/figma_squircle.git
   file_picker: ^8.1.7
   # https://github.com/incrediblezayed/file_saver/issues/86
   file_saver: ^0.2.11

diff --git a/auth/windows/flutter/generated_plugin_registrant.cc b/auth/windows/flutter/generated_plugin_registrant.cc
@@ -13,6 +13,7 @@
 #include <flutter_local_authentication/flutter_local_authentication_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <local_auth_windows/local_auth_plugin.h>
+#include <rive_common/rive_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <sodium_libs/sodium_libs_plugin_c_api.h>
@@ -36,6 +37,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
   LocalAuthPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("LocalAuthPlugin"));
+  RivePluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("RivePlugin"));
   ScreenRetrieverPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(

diff --git a/auth/windows/flutter/generated_plugins.cmake b/auth/windows/flutter/generated_plugins.cmake
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_local_authentication
   flutter_secure_storage_windows
   local_auth_windows
+  rive_common
   screen_retriever
   share_plus
   sodium_libs

diff --git a/mobile/README.md b/mobile/README.md
@@ -46,7 +46,7 @@ You can alternatively install the build from PlayStore or F-Droid.
 
 ## 🧑‍💻 Building from source
 
-1. [Install Flutter v3.24.3](https://flutter.dev/docs/get-started/install).
+1. [Install Flutter v3.27.2](https://flutter.dev/docs/get-started/install).
 
 2. Pull in all submodules with `git submodule update --init --recursive`
 

diff --git a/mobile/analysis_options.yaml b/mobile/analysis_options.yaml
@@ -61,6 +61,7 @@ analyzer:
     unnecessary_const: error
     cancel_subscriptions: error
     unrelated_type_equality_checks: error
+    unnecessary_cast: info
 
 
     unawaited_futures: warning # convert to warning after fixing existing issues
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ on: @@
         workflow_dispatch: # Allow manually running the action
     env:
-        FLUTTER_VERSION: "3.24.3"
+        FLUTTER_VERSION: "3.27.2"
     jobs:
         build:
@@ Expand Down @@