Merge branch 'main' into webview-scroll-listener

.ci/flutter_master.version

@@ -1 +1 @@
-97190973d6f502e264a330d252ca0c709071f11d
+eb5d0a434ef13d34b532aa8c53a7be64b88963c2

.ci/flutter_stable.version

@@ -1 +1 @@
-b0366e0a3f089e15fd89c97604ab402fe26b724c
+41456452f29d64e8deb623a3c927524bcf9f111b

.ci/legacy_project/README.md

@@ -37,3 +37,5 @@ and then deleting everything but `android/` from it:
 - Added license boilerplate.
 - Replaced `jcenter` in build.gradle with `mavenCentral`, due to the
   jcenter.bintray.com shutdown.
+- Update `compileSdkVersion` from 30 to 33 to maintain compatibility
+  with plugins that use API 34.

.ci/legacy_project/all_packages/android/app/build.gradle

@@ -25,7 +25,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.example.all_packages"

.ci/scripts/analyze_legacy.sh

@@ -9,12 +9,12 @@ set -e
 # work in legacy versions.
 #
 # This requires the --lib-only flag below.
-./script/tool_runner.sh remove-dev-dependencies
+.ci/scripts/tool_runner.sh remove-dev-dependencies
 
 # This uses --run-on-dirty-packages rather than --packages-for-branch
 # since only the packages changed by 'make-deps-path-based' need to be
 # re-checked.
-./script/tool_runner.sh analyze --lib-only \
+.ci/scripts/tool_runner.sh analyze --lib-only \
     --skip-if-not-supporting-flutter-version="$CHANNEL" \
     --custom-analysis=script/configs/custom_analysis.yaml
 

.ci/scripts/analyze_pathified.sh

@@ -6,7 +6,7 @@ set -e
 
 # Pathify the dependencies on changed packages (excluding major version
 # changes, which won't affect clients).
-./script/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
+.ci/scripts/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
 # This uses --run-on-dirty-packages rather than --packages-for-branch
 # since only the packages changed by 'make-deps-path-based' need to be
 # re-checked.

.ci/scripts/check_federated_safety.sh

@@ -7,5 +7,5 @@ set -e
 if [[ $LUCI_PR == "" ]]; then
   echo "This check is only run in presubmit"
 else
-  ./script/tool_runner.sh federation-safety-check
+  .ci/scripts/tool_runner.sh federation-safety-check
 fi

.ci/scripts/check_version.sh

@@ -10,7 +10,7 @@ set -e
 # missing version/CHANGELOG detection since PR-level overrides aren't available
 # in post-submit.
 if [[ $LUCI_PR == "" ]]; then
-  ./script/tool_runner.sh version-check --ignore-platform-interface-breaks
+  .ci/scripts/tool_runner.sh version-check --ignore-platform-interface-breaks
 else
-  ./script/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$PR_OVERRIDE_LABELS"
+  .ci/scripts/tool_runner.sh version-check --check-for-missing-changes --pr-labels="$PR_OVERRIDE_LABELS"
 fi

.ci/scripts/create_simulator.sh

@@ -9,7 +9,7 @@ set -o pipefail
 # The name here must match remove_simulator.sh
 readonly DEVICE_NAME=Flutter-iPhone
 readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-14
-readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-4
+readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-17-0
 
 # Delete any existing devices named Flutter-iPhone. Having more than one may
 # cause issues when builds target the device.

.ci/scripts/dart_unit_tests_pathified.sh

@@ -6,7 +6,7 @@ set -e
 
 # Pathify the dependencies on changed packages (excluding major version
 # changes, which won't affect clients).
-./script/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
+.ci/scripts/tool_runner.sh make-deps-path-based --target-dependencies-with-non-breaking-updates
 # This uses --run-on-dirty-packages rather than --packages-for-branch
 # since only the packages changed by 'make-deps-path-based' need to be
 # re-checked.

script/tool_runner.sh → .ci/scripts/tool_runner.sh

@@ -5,12 +5,14 @@
 
 set -e
 
-# WARNING! Do not remove this script, or change its behavior, unless you have
-# verified that it will not break the flutter/flutter analysis run of this
-# repository: https://github.com/flutter/flutter/blob/master/dev/bots/test.dart
+# This file runs the repo tooling (see TOOL_PATH) in a configuration that's
+# common to almost all of the CI usage, avoiding the need to pass the same
+# flags (e.g., --packages-for-branch) in every CI invocation.
+#
+# For local use, directly run `dart run <tool path>`.
 
 readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
-readonly REPO_DIR="$(dirname "$SCRIPT_DIR")"
+readonly REPO_DIR="$(dirname "$(dirname "$SCRIPT_DIR")")"
 readonly TOOL_PATH="$REPO_DIR/script/tool/bin/flutter_plugin_tools.dart"
 
 # Ensure that the tool dependencies have been fetched.
@@ -19,5 +21,5 @@ readonly TOOL_PATH="$REPO_DIR/script/tool/bin/flutter_plugin_tools.dart"
 # The tool expects to be run from the repo root.
 cd "$REPO_DIR"
 # Run from the in-tree source.
-# PACKAGE_SHARDING is (optionally) set from Cirrus. See .cirrus.yml
+# PACKAGE_SHARDING is (optionally) set in CI configuration. See .ci.yaml
 dart run "$TOOL_PATH" "$@" --packages-for-branch --log-timing $PACKAGE_SHARDING

.ci/scripts/xvfb_tool_runner.sh

@@ -4,4 +4,4 @@
 # found in the LICENSE file.
 set -e
 
-xvfb-run ./script/tool_runner.sh "$@"
+xvfb-run .ci/scripts/tool_runner.sh "$@"

.ci/targets/analyze.yaml

@@ -5,11 +5,11 @@ tasks:
   - name: analyze repo tools
     script: .ci/scripts/analyze_repo_tools.sh
   - name: download Dart deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["fetch-deps"]
     infra_step: true
   - name: analyze
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     # DO NOT change the custom-analysis argument here without changing the Dart repo.
     # See the comment in script/configs/custom_analysis.yaml for details.
     args: ["analyze", "--custom-analysis=script/configs/custom_analysis.yaml"]

.ci/targets/analyze_downgraded.yaml

@@ -6,5 +6,5 @@ tasks:
   # new APIs but forget to update minimum versions of dependencies to where
   # those APIs are introduced.
   - name: analyze - downgraded
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["analyze", "--downgrade", "--custom-analysis=script/configs/custom_analysis.yaml"]

.ci/targets/android_device_tests.yaml

@@ -3,11 +3,11 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and Android deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     infra_step: true
     args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
   - name: Firebase Test Lab
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args:
       - "firebase-test-lab"
       - "--device"

.ci/targets/android_legacy_emulator_tests.yaml

@@ -3,14 +3,14 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and Android deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     infra_step: true
     args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml"]
   # Only these two tests are run because they are the only ones that use the
   # emulator. Other tests would just duplicate android_platform_test.yaml tests.
   - name: native integration tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml"]
   - name: drive examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android_legacy_emulator.yaml,script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]

.ci/targets/android_platform_tests.yaml

@@ -3,25 +3,25 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and Android deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     infra_step: true
     args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: build examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: lint
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   # Native unit and native integration are split into two steps to allow for
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
   - name: native unit tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
   - name: native integration tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
   - name: drive examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]

.ci/targets/android_platform_tests_api_33_avd.yaml

@@ -5,26 +5,25 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and Android deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     infra_step: true
     args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: build examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["build-examples", "--apk", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: lint
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["lint-android", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   # Native unit and native integration are split into two steps to allow for
   # different exclusions.
   # TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
   # these steps.
   - name: native unit tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: native integration tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--android", "--no-unit", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
   - name: drive examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml", "--filter-packages-to=script/configs/still_requires_api_33_avd.yaml"]
-

.ci/targets/dart_unit_tests.yaml

@@ -3,7 +3,7 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: Dart unit tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["dart-test", "--exclude=script/configs/dart_unit_tests_exceptions.yaml", "--platform=vm"]
     # Re-run tests with path-based dependencies to ensure that publishing
     # the changes won't break tests of other packages in the respository

.ci/targets/ios_platform_tests.yaml

@@ -6,23 +6,23 @@ tasks:
     script: .ci/scripts/create_simulator.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and iOS deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["fetch-deps", "--ios", "--supporting-target-platforms-only"]
     infra_step: true
   - name: build examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["build-examples", "--ios"]
   - name: xcode analyze
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["xcode-analyze", "--ios"]
   - name: xcode analyze deprecation
     # Ensure we don't accidentally introduce deprecated code.
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
   - name: native test
-    script: script/tool_runner.sh
-    # Simulator name must match name in create_simulator.sh
-    args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=16.4"]
+    script: .ci/scripts/tool_runner.sh
+    # Simulator name and version must match name and version in create_simulator.sh
+    args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=Flutter-iPhone,OS=17.0"]
   - name: boot simulator
     # Ensure simulator is still booted
     script: .ci/scripts/boot_simulator.sh
@@ -31,7 +31,7 @@ tasks:
     # `drive-examples` contains integration tests, which changes the UI of the application.
     # This UI change sometimes affects `xctest`.
     # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["drive-examples", "--ios", "--exclude=script/configs/exclude_integration_ios.yaml"]
   - name: remove simulator
     script: .ci/scripts/remove_simulator.sh

.ci/targets/linux_custom_package_tests.yaml

@@ -3,5 +3,5 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: custom tests
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["custom-test"]

.ci/targets/linux_platform_tests.yaml

@@ -5,11 +5,11 @@ tasks:
     script: .ci/scripts/set_default_linux_apps.sh
     infra_step: true
   - name: download Dart deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["fetch-deps", "--linux", "--supporting-target-platforms-only"]
     infra_step: true
   - name: build examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["build-examples", "--linux"]
   - name: native test
     script: .ci/scripts/xvfb_tool_runner.sh

.ci/targets/macos_platform_tests.yaml

@@ -3,22 +3,22 @@ tasks:
     script: .ci/scripts/prepare_tool.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
   - name: download Dart and macOS deps
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["fetch-deps", "--macos", "--supporting-target-platforms-only"]
     infra_step: true
   - name: build examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["build-examples", "--macos"]
   - name: xcode analyze
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["xcode-analyze", "--macos"]
   - name: xcode analyze deprecation
     # Ensure we don't accidentally introduce deprecated code.
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["xcode-analyze", "--macos", "--macos-min-version=12.3"]
   - name: native test
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["native-test", "--macos"]
   - name: drive examples
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["drive-examples", "--macos", "--exclude=script/configs/exclude_integration_macos.yaml"]

.ci/targets/macos_check_podspecs.yaml → .ci/targets/macos_repo_checks.yaml

@@ -5,6 +5,13 @@ tasks:
   - name: update pods repo
     script: .ci/scripts/update_pods.sh
     infra_step: true # Note infra steps failing prevents "always" from running.
+  - name: Swift format
+    script: .ci/scripts/tool_runner.sh
+    # Non-Swift languages are formatted on Linux builders.
+    # Skip them on Mac builder to avoid duplication.
+    args: ["format", "--fail-on-change", "--no-dart", "--no-clang-format", "--no-kotlin", "--no-java" ]
+    always: true
   - name: validate iOS and macOS podspecs
-    script: script/tool_runner.sh
+    script: .ci/scripts/tool_runner.sh
     args: ["podspec-check"]
+    always: true