Update for Flutter 3.10 beta (#1746)

## Pre-launch Checklist - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [x] I read the [Contributors Guide]. - [x] I updated/added relevant documentation (doc comments with `///`). - [ ] All existing and new tests are passing. --------- Co-authored-by: David Iglesias <[email protected]> Co-authored-by: Mark Thompson <[email protected]> Co-authored-by: John Ryan <[email protected]>
flutter · May 10, 2023 · 36e7a6a · 36e7a6a
1 parent 474756c
commit 36e7a6a
Show file tree

Hide file tree

Showing 188 changed files with 1,777 additions and 1,966 deletions.
diff --git a/analysis_defaults/lib/flutter.yaml b/analysis_defaults/lib/flutter.yaml
@@ -17,5 +17,6 @@ linter:
     test_types_in_equals: true
     throw_in_finally: true
     unawaited_futures: true
+    unnecessary_breaks: true
     unnecessary_statements: true
     use_super_parameters: true
diff --git a/analysis_defaults/pubspec.yaml b/analysis_defaults/pubspec.yaml
@@ -3,7 +3,7 @@ description: Analysis defaults for flutter/samples
 publish_to: none
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 # NOTE: Code is not allowed in this package. Do not add dependencies.
 dependencies:

diff --git a/android_splash_screen/pubspec.yaml b/android_splash_screen/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 dependencies:
   flutter:

diff --git a/animations/.metadata b/animations/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled.
 
 version:
-  revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+  revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
   channel: beta
 
 project_type: app
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
     - platform: android
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
     - platform: ios
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
     - platform: linux
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
     - platform: macos
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
     - platform: web
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
     - platform: windows
-      create_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
-      base_revision: f732038a8cf4562ce38a1d7debb30209ae3da896
+      create_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
+      base_revision: d11aff97d2df15a076d285f6ad18da75c0d75ddd
 
   # User provided section
 

diff --git a/animations/android/app/build.gradle b/animations/android/app/build.gradle
@@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace "dev.flutter.animations"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 

diff --git a/animations/android/app/src/debug/AndroidManifest.xml b/animations/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.animations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/animations/android/app/src/main/AndroidManifest.xml b/animations/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.animations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:label="animations"
         android:name="${applicationName}"

diff --git a/animations/android/app/src/profile/AndroidManifest.xml b/animations/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.flutter.animations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.

diff --git a/animations/android/build.gradle b/animations/android/build.gradle
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/animations/lib/src/basics/animated_builder.dart b/animations/lib/src/basics/animated_builder.dart
@@ -54,10 +54,11 @@ class _AnimatedBuilderDemoState extends State<AnimatedBuilderDemo>
               ),
               child: child,
               onPressed: () {
-                if (controller.status == AnimationStatus.completed) {
-                  controller.reverse();
-                } else {
-                  controller.forward();
+                switch (controller.status) {
+                  case AnimationStatus.completed:
+                    controller.reverse();
+                  default:
+                    controller.forward();
                 }
               },
             );

diff --git a/animations/lib/src/basics/animation_controller.dart b/animations/lib/src/basics/animation_controller.dart
@@ -72,10 +72,11 @@ class _AnimationControllerDemoState extends State<AnimationControllerDemo>
             ElevatedButton(
               child: const Text('animate'),
               onPressed: () {
-                if (controller.status == AnimationStatus.completed) {
-                  controller.reverse();
-                } else {
-                  controller.forward();
+                switch (controller.status) {
+                  case AnimationStatus.completed:
+                    controller.reverse();
+                  default:
+                    controller.forward();
                 }
               },
             )

diff --git a/animations/lib/src/basics/tweens.dart b/animations/lib/src/basics/tweens.dart
@@ -54,15 +54,19 @@ class _TweenDemoState extends State<TweenDemo>
             ),
             ElevatedButton(
               child: Text(
-                controller.status == AnimationStatus.completed
-                    ? 'Buy a Mansion'
-                    : 'Win Lottery',
+                switch (controller.status) {
+                  AnimationStatus.completed => 'Buy a Mansion',
+                  AnimationStatus.forward => 'Accruing...',
+                  AnimationStatus.reverse => 'Spending...',
+                  _ => 'Win the lottery',
+                },
               ),
               onPressed: () {
-                if (controller.status == AnimationStatus.completed) {
-                  controller.reverse();
-                } else {
-                  controller.forward();
+                switch (controller.status) {
+                  case AnimationStatus.completed:
+                    controller.reverse();
+                  default:
+                    controller.forward();
                 }
               },
             )

diff --git a/animations/macos/Runner/MainFlutterWindow.swift b/animations/macos/Runner/MainFlutterWindow.swift
@@ -3,7 +3,7 @@ import FlutterMacOS
 
 class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
-    let flutterViewController = FlutterViewController.init()
+    let flutterViewController = FlutterViewController()
     let windowFrame = self.frame
     self.contentViewController = flutterViewController
     self.setFrame(windowFrame, display: true)

diff --git a/animations/pubspec.yaml b/animations/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0+1
 publish_to: none
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 dependencies:
   flutter:

diff --git a/background_isolate_channels/lib/simple_database.dart b/background_isolate_channels/lib/simple_database.dart
@@ -132,16 +132,12 @@ class SimpleDatabase {
         RootIsolateToken rootIsolateToken = RootIsolateToken.instance!;
         _sendPort
             .send(_Command(_Codes.init, arg0: _path, arg1: rootIsolateToken));
-        break;
       case _Codes.ack:
         _completers.removeLast().complete();
-        break;
       case _Codes.result:
         _resultsStream.last.add(command.arg0 as String);
-        break;
       case _Codes.done:
         _resultsStream.removeLast().close();
-        break;
       default:
         debugPrint('SimpleDatabase unrecognized command: ${command.code}');
     }
@@ -198,13 +194,10 @@ class _SimpleDatabaseServer {
         // ----------------------------------------------------------------------
         BackgroundIsolateBinaryMessenger.ensureInitialized(rootIsolateToken);
         _sendPort.send(const _Command(_Codes.ack, arg0: null));
-        break;
       case _Codes.add:
         _doAddEntry(command.arg0 as String);
-        break;
       case _Codes.query:
         _doFind(command.arg0 as String);
-        break;
       default:
         debugPrint(
             '_SimpleDatabaseServer unrecognized command ${command.code}');

diff --git a/background_isolate_channels/pubspec.yaml b/background_isolate_channels/pubspec.yaml
@@ -6,7 +6,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 dependencies:
   cupertino_icons: ^1.0.2

diff --git a/code_sharing/client/lib/main.dart b/code_sharing/client/lib/main.dart
@@ -109,9 +109,9 @@ class _MyHomePageState extends State<MyHomePage> {
             ),
             if (isWriting) ...[
               const SizedBox(height: 10),
-              Row(
+              const Row(
                 mainAxisAlignment: MainAxisAlignment.center,
-                children: const <Widget>[
+                children: <Widget>[
                   Text(
                     'Communicating with server...',
                     style: TextStyle(fontSize: 32, color: Colors.blue),

diff --git a/code_sharing/client/pubspec.yaml b/code_sharing/client/pubspec.yaml
@@ -4,7 +4,7 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 dependencies:
   cupertino_icons: ^1.0.2

diff --git a/code_sharing/server/pubspec.yaml b/code_sharing/server/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.0.0
 publish_to: "none"
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 dependencies:
   args: ^2.0.0

diff --git a/code_sharing/shared/pubspec.yaml b/code_sharing/shared/pubspec.yaml
@@ -3,7 +3,7 @@ description: Common data models required by our client and server
 version: 1.0.0
 
 environment:
-  sdk: '>=2.19.5 <4.0.0'
+  sdk: ^3.0.0-0
 
 dependencies:
   freezed_annotation: ^2.1.0

diff --git a/deeplink_store_example/lib/main.dart b/deeplink_store_example/lib/main.dart
@@ -30,14 +30,18 @@ class MyApp extends StatelessWidget {
       debugShowCheckedModeBanner: false,
       routerConfig: GoRouter(
         routes: [
-          GoRoute(path: '/', builder: (_, __) => const ProductList(),
+          GoRoute(
+            path: '/',
+            builder: (_, __) => const ProductList(),
             routes: [
               GoRoute(path: ':id', builder: (_, __) => const ProductDetails()),
             ],
           ),
-          GoRoute(path: '/category/:category', builder: (_, __) => const ProductCategoryList()),
+          GoRoute(
+              path: '/category/:category',
+              builder: (_, __) => const ProductCategoryList()),
         ],
       ),
     );
   }
-}
+}
diff --git a/deeplink_store_example/lib/model/products_repository.dart b/deeplink_store_example/lib/model/products_repository.dart
@@ -264,18 +264,12 @@ class ProductsRepository {
   }
 }
 
-String getCategoryTitle(Category category) {
-  switch(category) {
-    case Category.all:
-      return 'All';
-    case Category.accessories:
-      return 'Accessories';
-    case Category.clothing:
-      return 'Clothing';
-    case Category.home:
-      return 'Home Decorations';
-  }
-}
+String getCategoryTitle(Category category) => switch (category) {
+      Category.all => 'All',
+      Category.accessories => 'Accessories',
+      Category.clothing => 'Clothing',
+      Category.home => 'Home Decorations'
+    };
 
 class Product {
   const Product({

diff --git a/deeplink_store_example/lib/product_category_list.dart b/deeplink_store_example/lib/product_category_list.dart
@@ -26,18 +26,21 @@ class ProductCategoryList extends StatelessWidget {
   Widget build(BuildContext context) {
     final GoRouterState state = GoRouterState.of(context);
     final Category category = Category.values.firstWhere(
-      (Category value) => value.toString().contains(state.params['category']!),
+      (Category value) =>
+          value.toString().contains(state.pathParameters['category']!),
       orElse: () => Category.all,
     );
-    final List<Widget> children = ProductsRepository.loadProducts(category: category)
-        .map<Widget>((Product p) => RowItem(product: p))
-        .toList();
+    final List<Widget> children =
+        ProductsRepository.loadProducts(category: category)
+            .map<Widget>((Product p) => RowItem(product: p))
+            .toList();
     return Scaffold(
       backgroundColor: Styles.scaffoldBackground,
       body: CustomScrollView(
         slivers: <Widget>[
           SliverAppBar(
-            title: Text(getCategoryTitle(category), style: Styles.productListTitle),
+            title: Text(getCategoryTitle(category),
+                style: Styles.productListTitle),
             backgroundColor: Styles.scaffoldAppBarBackground,
             pinned: true,
           ),

diff --git a/deeplink_store_example/lib/product_details.dart b/deeplink_store_example/lib/product_details.dart
@@ -23,8 +23,9 @@ class ProductDetails extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final String currentId = GoRouterState.of(context).params['id']!;
-    final Product product = ProductsRepository.loadProduct(id: int.parse(currentId));
+    final String currentId = GoRouterState.of(context).pathParameters['id']!;
+    final Product product =
+        ProductsRepository.loadProduct(id: int.parse(currentId));
     return Scaffold(
       body: ListView(
         children: <Widget>[
@@ -40,7 +41,7 @@ class ProductDetails extends StatelessWidget {
   }
 }
 
-class ProductPicture extends StatelessWidget{
+class ProductPicture extends StatelessWidget {
   const ProductPicture({super.key, required this.product});
 
   final Product product;
@@ -63,4 +64,4 @@ class ProductPicture extends StatelessWidget{
       ],
     );
   }
-}
+}
diff --git a/deeplink_store_example/lib/product_list.dart b/deeplink_store_example/lib/product_list.dart
@@ -24,8 +24,8 @@ class ProductList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final List<Widget> children = ProductsRepository.loadProducts()
-      .map<Widget>((Product p) => RowItem(product: p))
-      .toList();
+        .map<Widget>((Product p) => RowItem(product: p))
+        .toList();
     return Scaffold(
       backgroundColor: Styles.scaffoldBackground,
       body: CustomScrollView(

diff --git a/deeplink_store_example/pubspec.yaml b/deeplink_store_example/pubspec.yaml
@@ -19,7 +19,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=3.0.0-290.0.dev <4.0.0'
+  sdk: ^3.0.0-0
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -36,7 +36,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
   shrine_images: ^2.0.2
-  go_router: ^6.5.5
+  go_router: ^7.0.0
 
 dev_dependencies:
   flutter_test: