Update ci flutter version (#1062)

* Update CI flutter versions * Fix easy mistakes * Fix analyze * Upgrade pubspec.lock * Upgrade version * [BOT] Applying pod update. * Upgrade gradle version to 7.4.0 * Upgrade gradle version to 7.4.1 * Test lstar fix --------- Co-authored-by: XavierPaquet-Rapold <[email protected]>
ApplETS · Oct 25, 2024 · 9dce5f5 · 9dce5f5
1 parent 0ffb479
commit 9dce5f5
Show file tree

Hide file tree

Showing 29 changed files with 133 additions and 116 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -42,15 +42,11 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
-        checkDependencies true
-    }
 
     defaultConfig {
         applicationId "ca.etsmtl.applets.etsmobile"
-        minSdkVersion 21
-        targetSdkVersion 34
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
@@ -85,6 +81,11 @@ android {
             ext.alwaysUpdateBuildId = false
         }
     }
+    namespace 'ca.etsmtl.applets.etsmobile'
+    lint {
+        checkDependencies true
+        disable 'InvalidPackage'
+    }
 }
 
 flutter {

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ca.etsmtl.applets.etsmobile">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ca.etsmtl.applets.etsmobile">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide

diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ca.etsmtl.applets.etsmobile">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/android/build.gradle b/android/build.gradle
@@ -6,9 +6,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.gms:google-services:4.4.2'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
     }
 
@@ -22,6 +22,13 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+subprojects {
+    afterEvaluate {
+        android {
+            compileSdkVersion 34
+        }
+    }
+}
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -185,7 +185,7 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
   - SwiftyXMLParser (5.5.0)
@@ -194,6 +194,7 @@ PODS:
     - Flutter
   - webview_flutter_wkwebview (0.0.1):
     - Flutter
+    - FlutterMacOS
 
 DEPENDENCIES:
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/darwin`)
@@ -214,10 +215,10 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - SwiftyXMLParser (from `https://github.com/yahoojapan/SwiftyXMLParser.git`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/darwin`)
 
 SPEC REPOS:
   trunk:
@@ -279,14 +280,14 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   SwiftyXMLParser:
     :git: https://github.com/yahoojapan/SwiftyXMLParser.git
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   webview_flutter_wkwebview:
-    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
 
 CHECKOUT OPTIONS:
   SwiftyXMLParser:
@@ -331,11 +332,11 @@ SPEC CHECKSUMS:
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
+  sqflite_darwin: a553b1fd6fe66f53bbb0fe5b4f5bab93f08d7a13
   SwiftyXMLParser: 027d9e6fb54a38d95dccec025bcea9693f699c47
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
-  webview_flutter_wkwebview: 2a23822e9039b7b1bc52e5add778e5d89ad488d1
+  webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
 
 PODFILE CHECKSUM: 18f1615a0bcd417392c9107b3e8dc59c76a68dac
 

diff --git a/lib/features/app/error/outage/outage_view.dart b/lib/features/app/error/outage/outage_view.dart
@@ -2,15 +2,15 @@
 import 'package:flutter/material.dart';
 
 // Package imports:
-import 'package:notredame/features/app/error/outage/widgets/outage_image_section.dart';
-import 'package:notredame/features/app/error/outage/widgets/outage_social_section.dart';
-import 'package:notredame/features/app/error/outage/widgets/outage_text_section.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
-import 'package:notredame/utils/utils.dart';
 import 'package:notredame/features/app/error/outage/outage_viewmodel.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_image_section.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_social_section.dart';
+import 'package:notredame/features/app/error/outage/widgets/outage_text_section.dart';
 import 'package:notredame/utils/app_theme.dart';
+import 'package:notredame/utils/utils.dart';
 
 class OutageView extends StatelessWidget {
   @override

diff --git a/lib/features/app/error/outage/outage_viewmodel.dart b/lib/features/app/error/outage/outage_viewmodel.dart
@@ -1,6 +1,7 @@
-// Flutter imports:
+// Dart imports:
 import 'dart:async';
 
+// Flutter imports:
 import 'package:flutter/material.dart';
 
 // Package imports:

diff --git a/lib/features/app/error/outage/widgets/outage_text_section.dart b/lib/features/app/error/outage/widgets/outage_text_section.dart
@@ -1,4 +1,7 @@
+// Flutter imports:
 import 'package:flutter/material.dart';
+
+// Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 class OutageTextSection extends StatelessWidget {

diff --git a/lib/features/app/widgets/base_scaffold.dart b/lib/features/app/widgets/base_scaffold.dart
@@ -10,8 +10,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 // Project imports:
 import 'package:notredame/features/app/integration/networking_service.dart';
-import 'package:notredame/features/app/widgets/navigation_rail.dart';
 import 'package:notredame/features/app/widgets/bottom_bar.dart';
+import 'package:notredame/features/app/widgets/navigation_rail.dart';
 import 'package:notredame/utils/app_theme.dart';
 import 'package:notredame/utils/loading.dart';
 import 'package:notredame/utils/locator.dart';

diff --git a/lib/features/dashboard/dashboard_view.dart b/lib/features/dashboard/dashboard_view.dart
@@ -7,7 +7,6 @@ import 'package:auto_size_text/auto_size_text.dart';
 import 'package:feature_discovery_fork/feature_discovery.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:notredame/features/app/signets-api/models/course.dart';
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:stacked/stacked.dart';
 
@@ -18,6 +17,7 @@ import 'package:notredame/constants/urls.dart';
 import 'package:notredame/features/app/analytics/analytics_service.dart';
 import 'package:notredame/features/app/navigation/navigation_service.dart';
 import 'package:notredame/features/app/navigation/router_paths.dart';
+import 'package:notredame/features/app/signets-api/models/course.dart';
 import 'package:notredame/features/app/signets-api/models/course_activity.dart';
 import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/features/app/widgets/dismissible_card.dart';

diff --git a/lib/features/dashboard/widgets/course_activity_tile.dart b/lib/features/dashboard/widgets/course_activity_tile.dart
@@ -3,10 +3,10 @@ import 'package:flutter/material.dart';
 
 // Package imports:
 import 'package:intl/intl.dart';
+import 'package:skeletonizer/skeletonizer.dart';
 
 // Project imports:
 import 'package:notredame/features/app/signets-api/models/course_activity.dart';
-import 'package:skeletonizer/skeletonizer.dart';
 
 class CourseActivityTile extends StatelessWidget {
   /// Course to display

diff --git a/lib/features/ets/events/author/author_view.dart b/lib/features/ets/events/author/author_view.dart
@@ -182,9 +182,6 @@ class _AuthorViewState extends State<AuthorView> {
                       IconButton(
                         onPressed: () async {
                           await showModalBottomSheet(
-                            isDismissible: true,
-                            enableDrag: true,
-                            isScrollControlled: true,
                             context: context,
                             shape: const RoundedRectangleBorder(
                               borderRadius: BorderRadius.only(
@@ -207,12 +204,12 @@ class _AuthorViewState extends State<AuthorView> {
                         ),
                         style: ButtonStyle(
                           shape:
-                              MaterialStateProperty.all<RoundedRectangleBorder>(
+                              WidgetStateProperty.all<RoundedRectangleBorder>(
                             RoundedRectangleBorder(
                               borderRadius: BorderRadius.circular(8),
                             ),
                           ),
-                          backgroundColor: MaterialStateProperty.all<Color>(
+                          backgroundColor: WidgetStateProperty.all<Color>(
                             Utils.getColorByBrightness(
                               context,
                               AppTheme.lightThemeBackground,

diff --git a/lib/features/ets/events/news/news-details/news_details_view.dart b/lib/features/ets/events/news/news-details/news_details_view.dart
@@ -180,9 +180,6 @@ class _NewsDetailsViewState extends State<NewsDetailsView> {
         );
       case Menu.report:
         showModalBottomSheet(
-            isDismissible: true,
-            enableDrag: true,
-            isScrollControlled: true,
             context: context,
             shape: const RoundedRectangleBorder(
                 borderRadius: BorderRadius.only(

diff --git a/lib/features/ets/events/report-news/report_news_widget.dart b/lib/features/ets/events/report-news/report_news_widget.dart
@@ -192,9 +192,9 @@ class _ReportNewsState extends State<ReportNews> {
                   const SizedBox(height: 24),
                   ElevatedButton(
                     style: ButtonStyle(
-                      backgroundColor: MaterialStateProperty.all<Color>(
-                          AppTheme.etsLightRed),
-                      shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+                      backgroundColor:
+                          WidgetStateProperty.all<Color>(AppTheme.etsLightRed),
+                      shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                         RoundedRectangleBorder(
                           borderRadius: BorderRadius.circular(8.0),
                         ),

diff --git a/lib/features/ets/quick-link/widgets/security-info/emergency_view.dart b/lib/features/ets/quick-link/widgets/security-info/emergency_view.dart
@@ -5,9 +5,9 @@ import 'package:flutter/services.dart';
 // Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
-import 'package:notredame/features/app/widgets/base_scaffold.dart';
 
 // Project imports:
+import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/utils/app_theme.dart';
 import 'package:notredame/utils/utils.dart';
 
@@ -30,13 +30,14 @@ class _EmergencyViewState extends State<EmergencyView> {
       fabPosition: FloatingActionButtonLocation.centerFloat,
       fab: FloatingActionButton.extended(
         onPressed: () {
-          Utils.launchURL(
-                  'tel:${AppIntl.of(context)!.security_emergency_number}',
-                  AppIntl.of(context)!)
-              .catchError((error) {
+          try {
+            Utils.launchURL(
+                'tel:${AppIntl.of(context)!.security_emergency_number}',
+                AppIntl.of(context)!);
+          } catch (e) {
             ScaffoldMessenger.of(context)
-                .showSnackBar(SnackBar(content: Text(error.toString())));
-          });
+                .showSnackBar(SnackBar(content: Text(e.toString())));
+          }
         },
         label: Text(
           AppIntl.of(context)!.security_reach_security,

diff --git a/lib/features/ets/quick-link/widgets/security-info/security_view.dart b/lib/features/ets/quick-link/widgets/security-info/security_view.dart
@@ -6,10 +6,10 @@ import 'package:flutter/material.dart';
 // Package imports:
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
-import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
+import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/features/ets/quick-link/widgets/security-info/emergency_view.dart';
 import 'package:notredame/features/ets/quick-link/widgets/security-info/security_viewmodel.dart';
 import 'package:notredame/utils/app_theme.dart';
@@ -79,13 +79,16 @@ class _SecurityViewState extends State<SecurityView> {
               child: InkWell(
                 borderRadius: const BorderRadius.all(Radius.circular(10)),
                 splashColor: Colors.red.withAlpha(50),
-                onTap: () => Utils.launchURL(
+                onTap: () {
+                  try {
+                    Utils.launchURL(
                         'tel:${AppIntl.of(context)!.security_emergency_number}',
-                        AppIntl.of(context)!)
-                    .catchError((error) {
-                  ScaffoldMessenger.of(context)
-                      .showSnackBar(SnackBar(content: Text(error.toString())));
-                }),
+                        AppIntl.of(context)!);
+                  } catch (e) {
+                    ScaffoldMessenger.of(context)
+                        .showSnackBar(SnackBar(content: Text(e.toString())));
+                  }
+                },
                 child: ListTile(
                   leading: const Icon(Icons.phone, size: 30),
                   title: Text(AppIntl.of(context)!.security_emergency_call),

diff --git a/lib/features/more/faq/faq_view.dart b/lib/features/more/faq/faq_view.dart
@@ -7,10 +7,10 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:stacked/stacked.dart';
 
 // Project imports:
+import 'package:notredame/features/app/widgets/base_scaffold.dart';
 import 'package:notredame/features/more/faq/faq_viewmodel.dart';
 import 'package:notredame/features/more/faq/models/faq.dart';
 import 'package:notredame/features/more/faq/models/faq_actions.dart';
-import 'package:notredame/features/app/widgets/base_scaffold.dart';
 
 class FaqView extends StatefulWidget {
   final Color? backgroundColor;
@@ -190,8 +190,8 @@ class _FaqViewState extends State<FaqView> {
           }
         },
         style: ButtonStyle(
-            elevation: MaterialStateProperty.all<double>(8.0),
-            shape: MaterialStateProperty.all<RoundedRectangleBorder>(
+            elevation: WidgetStateProperty.all<double>(8.0),
+            shape: WidgetStateProperty.all<RoundedRectangleBorder>(
               RoundedRectangleBorder(
                 borderRadius: BorderRadius.circular(8.0),
               ),

diff --git a/lib/features/more/feedback/feedback_view.dart b/lib/features/more/feedback/feedback_view.dart
@@ -37,15 +37,14 @@ class _FeedbackViewState extends State<FeedbackView> {
                   padding: const EdgeInsets.all(8.0),
                   child: ElevatedButton(
                     onPressed: () {
-                      BetterFeedback.of(context).show((feedback) {
-                        model
-                            .sendFeedback(feedback, FeedbackType.bug)
-                            .then((value) => BetterFeedback.of(context).hide());
+                      BetterFeedback.of(context).show((feedback) async {
+                        await model.sendFeedback(feedback, FeedbackType.bug);
+                        if (!context.mounted) return;
+                        BetterFeedback.of(context).hide();
                       });
                     },
                     style: ButtonStyle(
-                        shape:
-                            MaterialStateProperty.all<RoundedRectangleBorder>(
+                        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                       RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(8.0),
                       ),
@@ -65,15 +64,15 @@ class _FeedbackViewState extends State<FeedbackView> {
                   padding: const EdgeInsets.only(left: 8.0, right: 8.0),
                   child: ElevatedButton(
                     onPressed: () {
-                      BetterFeedback.of(context).show((feedback) {
-                        model
-                            .sendFeedback(feedback, FeedbackType.enhancement)
-                            .then((value) => BetterFeedback.of(context).hide());
+                      BetterFeedback.of(context).show((feedback) async {
+                        await model.sendFeedback(
+                            feedback, FeedbackType.enhancement);
+                        if (!context.mounted) return;
+                        BetterFeedback.of(context).hide();
                       });
                     },
                     style: ButtonStyle(
-                        shape:
-                            MaterialStateProperty.all<RoundedRectangleBorder>(
+                        shape: WidgetStateProperty.all<RoundedRectangleBorder>(
                       RoundedRectangleBorder(
                         borderRadius: BorderRadius.circular(8.0),
                       ),