Upgrade to Flutter 3.10 and Dart 3

analysis_options.yaml

@@ -1,9 +1,9 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:

example/book_store/analysis_options.yaml

@@ -1,9 +1,9 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: true
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:

example/book_store/lib/main.dart

@@ -36,7 +36,7 @@ RouteMap _buildRouteMap(BuildContext context) {
           body: Center(
             child: Text(
               "Couldn't find page '$path'",
-              style: Theme.of(context).textTheme.headline3,
+              style: Theme.of(context).textTheme.displaySmall,
             ),
           ),
         ),
@@ -146,8 +146,7 @@ class BookStoreApp extends StatelessWidget {
           primaryColor: Color(0xFF131921),
           elevatedButtonTheme: ElevatedButtonThemeData(
             style: ElevatedButton.styleFrom(
-              primary: Color(0xfffebd68),
-              onPrimary: Color(0xff333333),
+              foregroundColor: Color(0xff333333), backgroundColor: Color(0xfffebd68),
             ),
           ),
           platform: TargetPlatform.macOS,

example/book_store/lib/search_page.dart

@@ -94,7 +94,7 @@ class SearchPage extends StatelessWidget {
           if (categoryMatches.isNotEmpty) ...[
             Text(
               'Categories',
-              style: Theme.of(context).textTheme.headline5,
+              style: Theme.of(context).textTheme.headlineSmall,
             ),
             for (final category in categoryMatches) ...[
               Text(category.displayName),
@@ -110,7 +110,7 @@ class SearchPage extends StatelessWidget {
           ],
           Text(
             'Books',
-            style: Theme.of(context).textTheme.headline5,
+            style: Theme.of(context).textTheme.headlineSmall,
           ),
           if (books.isEmpty)
             Padding(

example/book_store/lib/wishlist_page.dart

@@ -36,7 +36,7 @@ class WishlistHomePage extends StatelessWidget {
                 children: [
                   Text(
                     wishlist.title,
-                    style: Theme.of(context).textTheme.headline6,
+                    style: Theme.of(context).textTheme.titleLarge,
                   ),
                   Text('Share: ${wishlist.shareUrl}'),
                 ],
@@ -89,7 +89,7 @@ class WishlistPage extends StatelessWidget {
         children: [
           Text(
             'Wishlist ${wishList.title}',
-            style: Theme.of(context).textTheme.headline4,
+            style: Theme.of(context).textTheme.headlineMedium,
           ),
           Text('Share this wishlist! ${wishList.shareUrl}'),
           for (final bookId in wishList.bookIds)

example/book_store/pubspec.yaml

@@ -6,7 +6,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flutter:

example/book_store/test/helpers.dart

@@ -11,23 +11,32 @@ class SystemUrlTracker {
 
 /// Records changes in URL
 Future<void> recordUrlChanges(
-    Future Function(SystemUrlTracker url) callback) async {
+    Future<dynamic> Function(SystemUrlTracker url) callback) async {
   try {
     final tracker = SystemUrlTracker();
     final stackTraces = <StackTrace>[];
 
-    SystemChannels.navigation.setMockMethodCallHandler((call) async {
-      if (call.method == 'routeInformationUpdated') {
-        final location = call.arguments['location'] as String;
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(
+      SystemChannels.navigation,
+      (call) async {
+        if (call.method == 'routeInformationUpdated') {
+          final args = call.arguments as Map;
+          final location = args.containsKey('uri')
+              ? args['uri'] as String
+              : args['location'] as String;
 
-        tracker.current = location;
-        stackTraces.add(StackTrace.current);
-      }
-    });
+          tracker.current = location;
+          stackTraces.add(StackTrace.current);
+        }
+        return null;
+      },
+    );
 
     await callback(tracker);
   } finally {
-    SystemChannels.navigation.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(SystemChannels.navigation, null);
   }
 }
 

example/deep_linking/lib/article_page.dart

@@ -50,7 +50,7 @@ class _ArticlePageState extends State<ArticlePage> {
         children: [
           Text(
             'Article ${widget.id}',
-            style: Theme.of(context).textTheme.headline3,
+            style: Theme.of(context).textTheme.displaySmall,
           ),
           SizedBox(height: 20),
           Text('Hello this is article ${widget.id}'),

example/deep_linking/lib/main.dart

@@ -142,7 +142,7 @@ class HomePage extends StatelessWidget {
         children: [
           Text(
             'Home page',
-            style: Theme.of(context).textTheme.headline3,
+            style: Theme.of(context).textTheme.displaySmall,
           ),
           SizedBox(height: 20),
           ElevatedButton(

example/deep_linking/pubspec.yaml

@@ -5,7 +5,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flutter:

example/mobile_app/analysis_options.yaml

@@ -1,9 +1,9 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: true
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:

example/mobile_app/lib/main.dart

@@ -23,7 +23,7 @@ void main() {
 /// This shows in a browser tab's title.
 class TitleObserver extends RoutemasterObserver {
   @override
-  void didChangeRoute(RouteData routeData, Page page) {
+  void didChangeRoute(RouteData routeData, Page<dynamic> page) {
     if (page.name != null) {
       SystemChrome.setApplicationSwitcherDescription(
         ApplicationSwitcherDescription(
@@ -201,13 +201,13 @@ RouteMap _buildRouteMap(AppState appState) {
 }
 
 // For custom animations, just use the existing Flutter [Page] and [Route] objects
-class FancyAnimationPage extends Page {
+class FancyAnimationPage<T> extends Page<T> {
   final Widget child;
 
   FancyAnimationPage({required this.child});
 
   @override
-  Route createRoute(BuildContext context) {
+  Route<T> createRoute(BuildContext context) {
     return PageRouteBuilder(
       settings: this,
       pageBuilder: (context, animation, animation2) {

example/mobile_app/lib/pages/bottom_sheet.dart

@@ -20,7 +20,7 @@ class PageBasedMaterialWithModalsPageRoute<T>
     required MaterialPage<T> page,
   }) : super(page: page);
 
-  ModalBottomSheetRoute? _nextModalRoute;
+  ModalSheetRoute<dynamic>? _nextModalRoute;
 
   @override
   bool canTransitionTo(TransitionRoute<dynamic> nextRoute) {
@@ -29,23 +29,18 @@ class PageBasedMaterialWithModalsPageRoute<T>
         (nextRoute is CupertinoPageRoute && !nextRoute.fullscreenDialog) ||
         (nextRoute is MaterialWithModalsPageRoute &&
             !nextRoute.fullscreenDialog) ||
-        (nextRoute is ModalBottomSheetRoute);
+        (nextRoute is ModalSheetRoute);
   }
 
   @override
-  void didChangeNext(Route? nextRoute) {
-    if (nextRoute is ModalBottomSheetRoute) {
+  void didChangeNext(Route<dynamic>? nextRoute) {
+    if (nextRoute is ModalSheetRoute) {
       _nextModalRoute = nextRoute;
     }
 
     super.didChangeNext(nextRoute);
   }
 
-  @override
-  void didPopNext(Route nextRoute) {
-    super.didPopNext(nextRoute);
-  }
-
   @override
   bool didPop(T? result) {
     _nextModalRoute = null;

example/mobile_app/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flutter:
@@ -13,7 +13,7 @@ dependencies:
     path: ../../
   provider: ^5.0.0
   cupertino_icons: ^1.0.0
-  modal_bottom_sheet: ^2.0.1
+  modal_bottom_sheet: ^3.0.0-pre
 
 dev_dependencies:
   flutter_test:

example/mobile_app/test/bottom_navigation_test.dart

@@ -6,7 +6,7 @@ import 'package:mobile_app/pages/home_page.dart';
 import 'package:mobile_app/pages/notifications_page.dart';
 import 'helpers.dart';
 
-Future pumpBottomNavigationPage(WidgetTester tester) async {
+Future<void> pumpBottomNavigationPage(WidgetTester tester) async {
   await tester.pumpWidget(MyApp());
   await tester.tap(find.text('Log in'));
   await tester.pump();

example/mobile_app/test/feed_test.dart

@@ -5,7 +5,7 @@ import 'package:mobile_app/main.dart';
 import 'package:mobile_app/pages/feed_page.dart';
 import 'helpers.dart';
 
-Future pumpFeedPage(WidgetTester tester) async {
+Future<void> pumpFeedPage(WidgetTester tester) async {
   await tester.pumpWidget(MyApp());
   await tester.tap(find.text('Log in'));
   await tester.pump();

example/mobile_app/test/helpers.dart

@@ -8,23 +8,29 @@ class SystemUrlTracker {
 
 /// Records changes in URL
 Future<void> recordUrlChanges(
-    Future Function(SystemUrlTracker url) callback) async {
+    Future<void> Function(SystemUrlTracker url) callback) async {
   try {
     final tracker = SystemUrlTracker();
     final stackTraces = <StackTrace>[];
 
-    SystemChannels.navigation.setMockMethodCallHandler((call) async {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(SystemChannels.navigation, (call) async {
       if (call.method == 'routeInformationUpdated') {
-        final location = call.arguments['location'] as String;
+        final args = call.arguments as Map;
+        final location = args.containsKey('uri')
+            ? args['uri'] as String
+            : args['location'] as String;
 
         tracker.current = location;
         stackTraces.add(StackTrace.current);
       }
+      return null;
     });
 
     await callback(tracker);
   } finally {
-    SystemChannels.navigation.setMockMethodCallHandler(null);
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(SystemChannels.navigation, null);
   }
 }
 

example/mobile_app/test/replace_test.dart

@@ -4,7 +4,7 @@ import 'package:mobile_app/main.dart';
 import 'package:mobile_app/pages/feed_page.dart';
 import 'helpers.dart';
 
-Future pumpBottomNavigationPage(WidgetTester tester) async {
+Future<void> pumpBottomNavigationPage(WidgetTester tester) async {
   await tester.pumpWidget(MyApp());
   await tester.tap(find.text('Log in'));
   await tester.pump();

example/navigation_bar/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flutter:

example/simple_example/analysis_options.yaml

@@ -1,9 +1,9 @@
 include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: true
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:

example/simple_example/pubspec.yaml

@@ -4,7 +4,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=2.18.0 <4.0.0"
 
 dependencies:
   flutter:

integration_test_app/analysis_options.yaml

@@ -1,7 +1,7 @@
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: true
+  language:
+    strict-casts: true
+    strict-raw-types: true
 
 linter:
   rules:

integration_test_app/integration_test/navigation_hash_test.dart

@@ -7,7 +7,15 @@ void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   replaceTests(
     expectUrl: (expected) {
-      expect(window.location.hash, '#$expected');
+      // Flutter after 3.10 has empty URLs for home route
+      final hashUrl = '#$expected';
+      final allowEmpty = hashUrl == '#/';
+
+      expect(
+        window.location.hash == hashUrl ||
+            (allowEmpty && window.location.hash.isEmpty),
+        isTrue,
+      );
     },
   );
 }

integration_test_app/macos/Podfile

@@ -1,4 +1,4 @@
-platform :osx, '10.11'
+platform :osx, '10.14'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

integration_test_app/macos/Podfile.lock

@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral
 
 SPEC CHECKSUMS:
-  FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424
+  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
 
-PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c
+PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.12.1