Merge branch 'main' into fix/block-then-reentrance

Author: chunhtai

.ci/flutter_master.version

@@ -1 +1 @@
-b31548feb941947afb7c0c4b2be9f6584fe1a41c
+d117642c18e0d5e3a96ae00d4340b1b0724de24c

.ci/flutter_stable.version

@@ -1 +1 @@
-90673a4eef275d1a6692c26ac80d6d746d41a73a
+2c9eb20739dfec95e2c74bd3dfa4601b0a8a36aa

.ci/scripts/create_all_packages_app.sh

@@ -10,10 +10,11 @@ exclusions=("script/configs/exclude_all_packages_app.yaml")
 # Add a wasm-specific exclusion file if "--wasm" is specified.
 if [[ "$1" == "--wasm" ]]; then
   exclusions+=",script/configs/exclude_all_packages_app_wasm.yaml"
+  shift 1
 fi
 
 # Delete ./all_packages if it exists already
 rm -rf ./all_packages
 
 dart ./script/tool/bin/flutter_plugin_tools.dart create-all-packages-app \
-    --output-dir=. --exclude "$exclusions"
+    --output-dir=. --exclude "$exclusions" "$@"

.ci/scripts/enable_swift_package_manager.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+set -e
+
+flutter config --enable-swift-package-manager

.ci/targets/ios_build_all_packages.yaml

@@ -2,12 +2,11 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: download Dart and iOS deps
-    script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"]
-    infra_step: true
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    # build-examples builds with Swift Package Manager, so run build-all without
+    # it to test both modes in CI.
+    args: ["--no-swift-package-manager"]
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for iOS debug
     script: .ci/scripts/build_all_packages_app.sh

.ci/targets/ios_platform_tests.yaml

@@ -2,12 +2,16 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: enable Swift Package Manager
+    # For consistency between stable and master channels, enable SwiftPM.
+    # TODO(stuartmorgan): Remove this step once it's the default on stable.
+    script: .ci/scripts/enable_swift_package_manager.sh
   - name: create simulator
     script: .ci/scripts/create_simulator.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and iOS deps
     script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--ios", "--supporting-target-platforms-only", "--swift-package-manager"]
     infra_step: true
   - name: build examples
     script: .ci/scripts/tool_runner.sh

.ci/targets/macos_build_all_packages.yaml

@@ -2,12 +2,11 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
-  - name: download Dart and macOS deps
-    script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"]
-    infra_step: true
   - name: create all_packages app
     script: .ci/scripts/create_all_packages_app.sh
+    # build-examples builds with Swift Package Manager, so run build-all without
+    # it to test both modes in CI.
+    args: ["--no-swift-package-manager"]
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: build all_packages for macOS debug
     script: .ci/scripts/build_all_packages_app.sh

.ci/targets/macos_platform_tests.yaml

@@ -2,9 +2,13 @@ tasks:
   - name: prepare tool
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: enable Swift Package Manager
+    # For consistency between stable and master channels, enable SwiftPM.
+    # TODO(stuartmorgan): Remove this step once it's the default on stable.
+    script: .ci/scripts/enable_swift_package_manager.sh
   - name: download Dart and macOS deps
     script: .ci/scripts/tool_runner.sh
-    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"]
+    args: ["fetch-deps", "--macos", "--supporting-target-platforms-only", "--swift-package-manager"]
     infra_step: true
   - name: build examples
     script: .ci/scripts/tool_runner.sh

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,6 +5,7 @@
 ## Pre-Review Checklist
 
 - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
+- [ ] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools.
 - [ ] I read the [Tree Hygiene] page, which explains my responsibilities.
 - [ ] I read and followed the [relevant style guides] and ran [the auto-formatter].
 - [ ] I signed the [CLA].
@@ -23,6 +24,7 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 
 <!-- Links -->
 [Contributor Guide]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md
+[AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
 [Tree Hygiene]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
 [relevant style guides]: https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style
 [the auto-formatter]: https://github.com/flutter/packages/blob/main/script/tool/README.md#format-code

AUTHORS

@@ -82,3 +82,7 @@ Ricardo Dalarme <ricardodalarme@outlook.com>
 Andrei Kabylin <sys.int64@gmail.com>
 Ernesto Ramirez <neartox@outlook.com>
 Rui Craveiro <ruicraveiro@squarealfa.com>
+LeanCode <contribution@leancode.pl>
+Piotr Denert <pdenert09@gmail.com>
+Marcin Chudy <marcinchudy94@gmail.com>
+Paweł Jakubowski <pawel.jakubowski@leancode.pl>