Merge branch 'main' into iap_sk2_userCancelled

Author: LongCatIsLooong

.ci.yaml

@@ -325,21 +325,21 @@ targets:
     timeout: 30
     properties:
       target_file: analyze_legacy.yaml
-      channel: "3.29.3"
+      channel: "3.32.8"
       env_variables: >-
         {
-          "CHANNEL": "3.29.3"
+          "CHANNEL": "3.32.8"
         }
 
   - name: Linux analyze_legacy N-2
     recipe: packages/packages
     timeout: 30
     properties:
       target_file: analyze_legacy.yaml
-      channel: "3.27.4"
+      channel: "3.29.3"
       env_variables: >-
         {
-          "CHANNEL": "3.27.4"
+          "CHANNEL": "3.29.3"
         }
 
   - name: Linux_android custom_package_tests master

.ci/flutter_master.version

@@ -1 +1 @@
-34c2a3b158b2b395cd31351c1e8a94ed4d9892b4
+c65f01dc373c6641d2efdac51d4ef376e05a2da2

.ci/flutter_stable.version

@@ -1 +1 @@
-edada7c56edf4a183c1735310e123c7f923584f1
+05db9689081f091050f01aed79f04dce0c750154

.gemini/styleguide.md

@@ -21,3 +21,20 @@ auto-formatter, for each language, as described in
 - PR descriptions should include the Pre-Review Checklist from
   [the PR template](https://github.com/flutter/packages/blob/main/.github/PULL_REQUEST_TEMPLATE.md),
   with all of the steps completed.
+
+## Review Agent Guidelines
+
+When providing a summary, the review agent must adhere to the following principles:
+- **Be Objective:** Focus on a neutral, descriptive summary of the changes. Avoid subjective value judgments
+  like "good," "bad," "positive," or "negative." The goal is to report what the code does, not to evaluate it.
+- **Use Code as the Source of Truth:** Base all summaries on the code diff. Do not trust or rephrase the PR
+  description, which may be outdated or inaccurate. A summary must reflect the actual changes in the code.
+- **Be Concise:** Generate summaries that are brief and to the point. Focus on the most significant changes,
+  and avoid unnecessary details or verbose explanations. This ensures the feedback is easy to scan and understand.
+
+### Temporary dependency_overrides
+
+It is normal practice for PRs that affect multiple packages in a federated plugin to contain a temporary
+`dependency_overrides` section during initial review. The review agent should not comment about
+`dependency_overrides` sections in `pubspec.yaml` files that have a comment starting with:
+"FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE."

.github/dependabot.yml

@@ -117,6 +117,7 @@ updates:
       gradle-plugin:
         patterns:
           - "org.jetbrains.kotlin:kotlin-gradle-plugin"
+          - "com.android.tools.build:gradle"
       androidx:
         patterns:
           - "androidx.annotation:annotation"

.github/labeler.yml

@@ -38,11 +38,6 @@
     - any-glob-to-any-file:
       - packages/flutter_lints/**/*
 
-'p: flutter_migrate':
-  - changed-files:
-    - any-glob-to-any-file:
-      - packages/flutter_migrate/**/*
-
 'p: flutter_plugin_android_lifecycle':
   - changed-files:
     - any-glob-to-any-file:

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
       # the change if it doesn't.
       run: |
         cd $HOME
-        git clone https://github.com/flutter/flutter.git --depth 1 -b 3.32.0 _flutter
+        git clone https://github.com/flutter/flutter.git --depth 1 -b 3.35.0 _flutter
         echo "$HOME/_flutter/bin" >> $GITHUB_PATH
         cd $GITHUB_WORKSPACE
     # Checks out a copy of the repo.

CODEOWNERS

@@ -10,7 +10,6 @@ packages/cross_file/**                                   @ditman
 packages/extension_google_sign_in_as_googleapis_auth/**  @ditman
 packages/file_selector/**                                @stuartmorgan-g
 packages/flutter_lints/**                                @chunhtai
-packages/flutter_migrate/**                              @stuartmorgan-g
 packages/flutter_template_images/**                      @stuartmorgan-g
 packages/go_router/**                                    @chunhtai
 packages/go_router_builder/**                            @chunhtai

packages/animations/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## NEXT
 
-* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
+* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 
 ## 2.0.11
 

packages/animations/example/lib/container_transition.dart

@@ -55,9 +55,9 @@ class _OpenContainerTransformDemoState
 
   void _showMarkedAsDoneSnackbar(bool? isMarkedAsDone) {
     if (isMarkedAsDone ?? false) {
-      ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
-        content: Text('Marked as done!'),
-      ));
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(const SnackBar(content: Text('Marked as done!')));
     }
   }
 
@@ -84,9 +84,10 @@ class _OpenContainerTransformDemoState
                     onPressed: (int index) {
                       setModalState(() {
                         setState(() {
-                          _transitionType = index == 0
-                              ? ContainerTransitionType.fade
-                              : ContainerTransitionType.fadeThrough;
+                          _transitionType =
+                              index == 0
+                                  ? ContainerTransitionType.fade
+                                  : ContainerTransitionType.fadeThrough;
                         });
                       });
                     },
@@ -229,10 +230,7 @@ class _OpenContainerTransformDemoState
               closedElevation: 0.0,
               closedBuilder: (BuildContext _, VoidCallback openContainer) {
                 return ListTile(
-                  leading: Image.asset(
-                    'assets/avatar_logo.png',
-                    width: 40,
-                  ),
+                  leading: Image.asset('assets/avatar_logo.png', width: 40),
                   onTap: openContainer,
                   title: Text('List item ${index + 1}'),
                   subtitle: const Text('Secondary text'),
@@ -245,15 +243,11 @@ class _OpenContainerTransformDemoState
       floatingActionButton: OpenContainer(
         transitionType: _transitionType,
         openBuilder: (BuildContext context, VoidCallback _) {
-          return const _DetailsPage(
-            includeMarkAsDoneButton: false,
-          );
+          return const _DetailsPage(includeMarkAsDoneButton: false);
         },
         closedElevation: 6.0,
         closedShape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(
-            Radius.circular(_fabDimension / 2),
-          ),
+          borderRadius: BorderRadius.all(Radius.circular(_fabDimension / 2)),
         ),
         closedColor: Theme.of(context).colorScheme.secondary,
         closedBuilder: (BuildContext context, VoidCallback openContainer) {
@@ -315,10 +309,7 @@ class _ExampleCard extends StatelessWidget {
             child: ColoredBox(
               color: Colors.black38,
               child: Center(
-                child: Image.asset(
-                  'assets/placeholder_image.png',
-                  width: 100,
-                ),
+                child: Image.asset('assets/placeholder_image.png', width: 100),
               ),
             ),
           ),
@@ -335,10 +326,9 @@ class _ExampleCard extends StatelessWidget {
             child: Text(
               'Lorem ipsum dolor sit amet, consectetur '
               'adipiscing elit, sed do eiusmod tempor.',
-              style: Theme.of(context)
-                  .textTheme
-                  .bodyMedium!
-                  .copyWith(color: Colors.black54),
+              style: Theme.of(
+                context,
+              ).textTheme.bodyMedium!.copyWith(color: Colors.black54),
             ),
           ),
         ],
@@ -348,10 +338,7 @@ class _ExampleCard extends StatelessWidget {
 }
 
 class _SmallerCard extends StatelessWidget {
-  const _SmallerCard({
-    required this.openContainer,
-    required this.subtitle,
-  });
+  const _SmallerCard({required this.openContainer, required this.subtitle});
 
   final VoidCallback openContainer;
   final String subtitle;
@@ -368,10 +355,7 @@ class _SmallerCard extends StatelessWidget {
             color: Colors.black38,
             height: 150,
             child: Center(
-              child: Image.asset(
-                'assets/placeholder_image.png',
-                width: 80,
-              ),
+              child: Image.asset('assets/placeholder_image.png', width: 80),
             ),
           ),
           Expanded(
@@ -381,15 +365,9 @@ class _SmallerCard extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.center,
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  Text(
-                    'Title',
-                    style: Theme.of(context).textTheme.titleLarge,
-                  ),
+                  Text('Title', style: Theme.of(context).textTheme.titleLarge),
                   const SizedBox(height: 4),
-                  Text(
-                    subtitle,
-                    style: Theme.of(context).textTheme.bodySmall,
-                  ),
+                  Text(subtitle, style: Theme.of(context).textTheme.bodySmall),
                 ],
               ),
             ),
@@ -419,10 +397,7 @@ class _ExampleSingleTile extends StatelessWidget {
             height: height,
             width: height,
             child: Center(
-              child: Image.asset(
-                'assets/placeholder_image.png',
-                width: 60,
-              ),
+              child: Image.asset('assets/placeholder_image.png', width: 60),
             ),
           ),
           Expanded(
@@ -431,15 +406,13 @@ class _ExampleSingleTile extends StatelessWidget {
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: <Widget>[
-                  Text(
-                    'Title',
-                    style: Theme.of(context).textTheme.titleMedium,
-                  ),
+                  Text('Title', style: Theme.of(context).textTheme.titleMedium),
                   const SizedBox(height: 8),
                   Text(
-                      'Lorem ipsum dolor sit amet, consectetur '
-                      'adipiscing elit,',
-                      style: Theme.of(context).textTheme.bodySmall),
+                    'Lorem ipsum dolor sit amet, consectetur '
+                    'adipiscing elit,',
+                    style: Theme.of(context).textTheme.bodySmall,
+                  ),
                 ],
               ),
             ),
@@ -451,11 +424,7 @@ class _ExampleSingleTile extends StatelessWidget {
 }
 
 class _InkWellOverlay extends StatelessWidget {
-  const _InkWellOverlay({
-    this.openContainer,
-    this.height,
-    this.child,
-  });
+  const _InkWellOverlay({this.openContainer, this.height, this.child});
 
   final VoidCallback? openContainer;
   final double? height;
@@ -465,10 +434,7 @@ class _InkWellOverlay extends StatelessWidget {
   Widget build(BuildContext context) {
     return SizedBox(
       height: height,
-      child: InkWell(
-        onTap: openContainer,
-        child: child,
-      ),
+      child: InkWell(onTap: openContainer, child: child),
     );
   }
 }
@@ -489,7 +455,7 @@ class _DetailsPage extends StatelessWidget {
               icon: const Icon(Icons.done),
               onPressed: () => Navigator.pop(context, true),
               tooltip: 'Mark as done',
-            )
+            ),
         ],
       ),
       body: ListView(
@@ -499,9 +465,7 @@ class _DetailsPage extends StatelessWidget {
             height: 250,
             child: Padding(
               padding: const EdgeInsets.all(70.0),
-              child: Image.asset(
-                'assets/placeholder_image.png',
-              ),
+              child: Image.asset('assets/placeholder_image.png'),
             ),
           ),
           Padding(
@@ -512,18 +476,18 @@ class _DetailsPage extends StatelessWidget {
                 Text(
                   'Title',
                   style: Theme.of(context).textTheme.headlineSmall!.copyWith(
-                        color: Colors.black54,
-                        fontSize: 30.0,
-                      ),
+                    color: Colors.black54,
+                    fontSize: 30.0,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Text(
                   _loremIpsumParagraph,
                   style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                        color: Colors.black54,
-                        height: 1.5,
-                        fontSize: 16.0,
-                      ),
+                    color: Colors.black54,
+                    height: 1.5,
+                    fontSize: 16.0,
+                  ),
                 ),
               ],
             ),