Merge branch 'main' into fix-10029

.github/workflows/codeql-analysis.yml

@@ -33,7 +33,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba
+      uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@0b21cf2492b6b02c465a3e5d7c473717ad7721ba
+      uses: github/codeql-action/autobuild@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -58,4 +58,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba
+      uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923

.github/workflows/scorecards-analysis.yml

@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba
+        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
         with:
           sarif_file: results.sarif

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.3-slim-bookworm@sha256:7e2843d936fd2ea084b36f99ff252822bedb6b656ae868f5b08e68cc9b63e8b6 as base
+FROM ruby:3.2.3-slim-bookworm@sha256:97fccffe954d1e0c7fa6634020379417d67435a7f9a7c10b6ef3f49e498307e6 as base
 
 ENV TZ=US/Pacific
 RUN apt-get update && apt-get install -yq --no-install-recommends \

Gemfile.lock

@@ -14,7 +14,7 @@ GEM
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     base64 (0.2.0)
-    bigdecimal (3.1.5)
+    bigdecimal (3.1.6)
     colorator (1.1.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
@@ -28,7 +28,7 @@ GEM
       forwardable-extended (~> 2.5)
     ffi (1.16.3)
     forwardable-extended (2.6.0)
-    google-protobuf (3.25.1)
+    google-protobuf (3.25.2)
     http_parser.rb (0.8.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -70,9 +70,9 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     mini_portile2 (2.8.5)
-    minitest (5.21.1)
+    minitest (5.21.2)
     mutex_m (0.2.0)
-    nokogiri (1.15.5)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     pathutil (0.16.2)
@@ -87,8 +87,8 @@ GEM
     rouge (4.2.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
-    sass-embedded (1.69.5)
-      google-protobuf (~> 3.23)
+    sass-embedded (1.70.0)
+      google-protobuf (~> 3.25)
       rake (>= 13.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -110,4 +110,4 @@ DEPENDENCIES
   webrick
 
 BUNDLED WITH
-   2.5.3
+   2.5.5

firebase.json

@@ -123,6 +123,7 @@
       { "source": "/ios-14", "destination": "/platform-integration/ios/ios-debugging", "type": 301 },
       { "source": "/ios-project-migration", "destination": "/platform-integration/ios", "type": 301 },
       { "source": "/layout", "destination": "/ui/layout", "type": 301 },
+      { "source": "/material-3-migration", "destination": "/release/breaking-changes/material-3-migration", "type": 301 },
       { "source": "/packages-and-plugins/androidx-compatibility", "destination": "/platform-integration/android/androidx-migration", "type": 301 },
       { "source": "/packages-and-plugins/c-interop", "destination": "/platform-integration/android/c-interop", "type": 301 },
       { "source": "/packages-and-plugins/plugins-in-tests", "destination": "/testing/plugins-in-tests", "type": 301 },
@@ -541,6 +542,7 @@
       { "source": "/go/synchronized-widgettester", "destination": "https://docs.google.com/document/d/1VumsuG6dEFUVpPQLqqKJnhI0CoIS9fCAMN-NFHIPmo0/edit", "type": 301 },
       { "source": "/go/system-mouse-cursor", "destination": "https://docs.google.com/document/d/1bJLRy6flZ0wDCbpl2QA8SURUWXIvRJKMRRemxlOo1cA/edit", "type": 301 },
       { "source": "/go/table-view", "destination": "https://docs.google.com/document/d/15ecTZE1g3WeswLGFWrnEgMP6SyL6jDRdxOgPsczOcV0/edit?usp=sharing&resourcekey=0-yNd_qFhiPjz6z2TgezWc0A", "type": 301 },
+      { "source": "/go/table-view-merged-cells", "destination": "https://docs.google.com/document/d/1UekXjG_VKmWYbsxDEzMqTb7F-6oUr05v998n5IqtVWs/edit?usp=sharing", "type": 301 },
       { "source": "/go/tabs-and-text-fields", "destination": "https://docs.google.com/document/d/1aHucsI0NWGWu2Dm_XFsBLxiTgJRM8h2XBB7PVAnVxlU/edit?usp=sharing&resourcekey=0-zLbXFlP_A2e_Yoi43vdiiw", "type": 301 },
       { "source": "/go/take-flutter-home", "destination": "https://github.com/flutter/put-flutter-to-work", "type": 301 },
       { "source": "/go/table-development", "destination": "https://docs.google.com/document/d/1fCE-zQNql0nnqJXhycpg902lhL7jrOOz-6sT8s8tv5c/edit?usp=sharing", "type": 301 },

src/_data/catalog/index.json

@@ -8,7 +8,7 @@
   {
     "name": "Material components",
     "description": "Visual, behavioral, and motion-rich widgets implementing the <a href=\"https://m3.material.io/get-started\">Material 3</a> design specification.<br /><br />Material 3 is the default Flutter interface as of Flutter 3.16. To learn more about this transition, check out <a href=\"https://m3.material.io/develop/flutter\">Flutter support for Material 3</a>.",
-    "pagecontent": "Eventually, Material 2 will be deprecated, but in the short term, you can opt out of Material 3 by setting the <a href=\"https://api.flutter.dev/flutter/material/ThemeData/useMaterial3.html\"><code>useMaterial3</code></a> flag to <code>false</code> in your theme.<br /><br />To catch these widgets in action, check out our live Material 3 <a href=\"https://flutter.github.io/samples/web/material_3_demo\" target=\"_blank\" rel=\"noopener noreferrer\">demo app</a>.<br /><br />You can still check out our legacy <a href=\"/ui/widgets/material2\">Material 2 widgets</a> over at their catalog page.",
+    "pagecontent": "Eventually, Material 2 will be deprecated, but in the short term, you can opt out of Material 3 by setting the <a href=\"https://api.flutter.dev/flutter/material/ThemeData/useMaterial3.html\"><code>useMaterial3</code></a> flag to <code>false</code> in your theme.<br /><br />To migrate your widgets to Material 3, check out the <a href=\"/release/breaking-changes/material-3-migration\">migration guide.</a><br /><br />To catch these widgets in action, check out our live Material 3 <a href=\"https://flutter.github.io/samples/web/material_3_demo\" target=\"_blank\" rel=\"noopener noreferrer\">demo app</a>.<br /><br />You can still check out our legacy <a href=\"/ui/widgets/material2\">Material 2 widgets</a> over at their catalog page.",
     "subcategories": [
       {
         "name": "Actions",

src/_data/sidenav.yml

@@ -151,6 +151,8 @@
       permalink: /cookbook/design/themes
     - title: Material design
       permalink: /ui/design/material
+    - title: Migrate to Material 3
+      permalink: /release/breaking-changes/material-3-migration
     - title: Text
       permalink: /ui/design/text
       children:

src/codelabs/index.md

@@ -273,13 +273,6 @@ Learn how to test your Flutter application.
 Learn how to write code that's targeted for specific platforms,
 like iOS, Android, desktop, or the web.
 
-* [Building a Cupertino app with Flutter][]<br>
-  Build a version of the Shrine shopping app
-  (used in the Material Design codelabs) using the
-  Cupertino package to create an iOS style look and feel.
-  Create multiple tabs and navigate between them.
-  Use the [provider][] package to manage state between screens.
-
 * [How to write a Flutter plugin][]<br>
   Learn how to write a plugin by creating a music plugin
   for iOS and Android that processes audio on the host platform.
@@ -303,7 +296,6 @@ like iOS, Android, desktop, or the web.
   on iOS. This applies to your home screen, lock screen, or the
   today view.
 
-[Building a Cupertino app with Flutter]: {{site.codelabs}}/codelabs/flutter-cupertino
 [home-screen]: {{site.codelabs}}/flutter-home-screen-widgets
 [How to write a Flutter plugin]: {{site.codelabs}}/codelabs/write-flutter-plugin
 [provider]: {{site.pub-pkg}}/provider

src/cookbook/design/tabs.md

@@ -13,11 +13,6 @@ Material Design guidelines.
 Flutter includes a convenient way to create tab layouts as part of
 the [material library][].
 
-{{site.alert.note}}
-  To create tabs in a Cupertino app, see the
-  [Building a Cupertino app with Flutter][] codelab.
-{{site.alert.end}}
-
 This recipe creates a tabbed example using the following steps;
 
   1. Create a `TabController`.
@@ -147,7 +142,6 @@ class TabBarDemo extends StatelessWidget {
 
 
 [`AppBar`]: {{site.api}}/flutter/material/AppBar-class.html
-[Building a Cupertino app with Flutter]: {{site.codelabs}}/codelabs/flutter-cupertino
 [`DefaultTabController`]: {{site.api}}/flutter/material/DefaultTabController-class.html
 [material library]: {{site.api}}/flutter/material/material-library.html
 [`Tab`]: {{site.api}}/flutter/material/Tab-class.html

src/perf/deferred-components.md

@@ -14,34 +14,31 @@ features and assets when needed by the user.
 
 We refer to each uniquely downloadable bundle of Dart
 libraries and assets as a "deferred component".
-This is achieved by using Dart's deferred imports,
-which can be compiled into split AOT shared libraries.
+To load these components, use [Dart's deferred imports][dart-def-import].
+They can be compiled into split AOT and JavaScript shared libraries.
 
 {{site.alert.note}}
-  This feature is currently only available on Android,
-  taking advantage of Android and Google Play Stores'
-  [dynamic feature modules][] to deliver the
+  Flutter supports deferred, or "lazy", loading on Android and the web.
+  The implementations differ.
+  Android's [dynamic feature modules][] deliver the
   deferred components packaged as Android modules.
-  Deferred code does not impact other platforms,
+  The web creates these components as separate `*.js` files.
+  Deferred code doesn't impact other platforms,
   which continue to build as normal with all deferred
   components and assets included at initial install time.
-
-  Also, note that this is an advanced feature.
 {{site.alert.end}}
 
-Though modules can be defer loaded,
-the entire application must be completely built and
-uploaded as a single Android App Bundle.
-Dispatching partial updates without re-uploading
-new Android App Bundles for the entire application
-is not supported.
+Though you can defer loading modules,
+you must build the entire app and upload that app as a single
+[Android App Bundle][android-app-bundle] (`*.aab`).
+Flutter doesn't support dispatching partial updates without re-uploading
+new Android App Bundles for the entire application.
 
-Deferred loading is only performed when the app
-is compiled to [release or profile mode][].
-In debug mode, all deferred components are treated
-as regular imports, so they are present
-at launch and load immediately. Therefore,
-debug builds can still hot reload.
+Flutter performs deferred loading when you compile your app
+in [release or profile mode][].
+Debug mode treats all deferred components as regular imports.
+The components are present at launch and load immediately.
+This allows debug builds to hot reload.
 
 For a deeper dive into the technical details of
 how this feature works, see [Deferred Components][]
@@ -604,3 +601,6 @@ Play store's delivery feature.
 [lazily loading a library]: {{site.dart-site}}/language/libraries#lazily-loading-a-library
 [release or profile mode]: {{site.url}}/testing/build-modes
 [step 3.3]: #step-3.3
+[android-app-bundle]: {{site.android-dev}}/guide/app-bundle
+[dart-def-import]: https://dart.dev/language/libraries#lazily-loading-a-library
+

src/release/breaking-changes/index.md

@@ -51,6 +51,7 @@ release, and listed in alphabetical order:
 
 ### Released in Flutter 3.16
 
+* [Migrating to Material 3][]
 * [Migrate ShortcutActivator and ShortcutManager to KeyEvent system][]
 * [The `ThemeData.useMaterial3` property is now set to true by default][]
 * [Deprecated API removed after v3.13][]
@@ -64,6 +65,7 @@ release, and listed in alphabetical order:
 * [Windows: External windows should notify Flutter engine of lifecycle changes][]
 * [Windows build path changed to add the target architecture][]
 
+[Migrating to Material 3]: {{site.url}}/release/breaking-changes/material-3-migration
 [Migrate ShortcutActivator and ShortcutManager to KeyEvent system]: {{site.url}}/release/breaking-changes/shortcut-key-event-migration
 [The `ThemeData.useMaterial3` property is now set to true by default]: {{site.url}}/release/breaking-changes/material-3-default
 [Deprecated API removed after v3.13]: {{site.url}}/release/breaking-changes/3-13-deprecations