Merge branch 'main' into webview_patchedv5

.ci/flutter_master.version

@@ -1 +1 @@
-f2f80059ff87be34f773de33400af52a00c81a1a
+23f5582ea654d01f9462f04158cf2c2a188708ec

.ci/flutter_stable.version

@@ -1 +1 @@
-c07f7888888435fd9df505aa2efc38d3cf65681b
+2ad6cd72c040113b47ee9055e722606a490ef0da

.ci/scripts/create_simulator.sh

@@ -3,8 +3,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-device=com.apple.CoreSimulator.SimDeviceType.iPhone-13
-os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
+# The name here must match remove_simulator.sh
+readonly DEVICE_NAME=Flutter-iPhone
+readonly DEVICE=com.apple.CoreSimulator.SimDeviceType.iPhone-13
+readonly OS=com.apple.CoreSimulator.SimRuntime.iOS-16-0
 
 xcrun simctl list
-xcrun simctl create Flutter-iPhone "$device" "$os" | xargs xcrun simctl boot
+xcrun simctl create "$DEVICE_NAME" "$DEVICE" "$OS" | xargs xcrun simctl boot

.ci/scripts/remove_simulator.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# The name here must match create_simulator.sh
+readonly DEVICE_NAME=Flutter-iPhone
+
+xcrun simctl shutdown "$DEVICE_NAME"
+xcrun simctl delete "$DEVICE_NAME"
+xcrun simctl list

.ci/targets/ios_platform_tests.yaml

@@ -22,3 +22,5 @@ tasks:
     # So we run `drive-examples` after `native-test`; changing the order will result ci failure.
     script: script/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/macos_custom_package_tests.yaml

@@ -5,3 +5,5 @@ tasks:
     script: .ci/scripts/create_simulator.sh
   - name: custom package tests
     script: .ci/scripts/custom_package_tests.sh
+  - name: remove simulator
+    script: .ci/scripts/remove_simulator.sh

.cirrus.yml

@@ -97,7 +97,7 @@ task:
         license_script: $PLUGIN_TOOL_COMMAND license-check
         # The major and minor version here should match the lowest version
         # analyzed in legacy_version_analyze.
-        pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.0.0
+        pubspec_script: ./script/tool_runner.sh pubspec-check --min-min-flutter-version=3.0.0 --allow-dependencies=script/configs/allowed_unpinned_deps.yaml --allow-pinned-dependencies=script/configs/allowed_pinned_deps.yaml
         readme_script:
           - ./script/tool_runner.sh readme-check
           # Re-run with --require-excerpts, skipping packages that still need
@@ -122,9 +122,9 @@ task:
           # This check is only meaningful for PRs, as it validates changes
           # rather than state.
           - if [[ $CIRRUS_PR == "" ]]; then
-          -   ./script/tool_runner.sh federation-safety-check
-          - else
           -   echo "Only run in presubmit"
+          - else
+          -   ./script/tool_runner.sh federation-safety-check
           - fi
     - name: analyze
       env:

.github/workflows/pull_request_label.yml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@5c7539237e04b714afd8ad9b4aed733815b9fab4
+      - uses: actions/labeler@ba790c862c380240c6d5e7427be5ace9a05c754b
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

CODEOWNERS

@@ -15,7 +15,7 @@ packages/flutter_adaptive_scaffold/**                    @gspencergoog
 packages/flutter_image/**                                @stuartmorgan
 packages/flutter_lints/**                                @goderbauer
 packages/flutter_markdown/**                             @domesticmouse
-packages/flutter_migrate/**                              @GaryQian
+packages/flutter_migrate/**                              @stuartmorgan
 packages/flutter_template_images/**                      @stuartmorgan
 packages/go_router/**                                    @chunhtai
 packages/go_router_builder/**                            @chunhtai

customer_testing.bat

@@ -10,6 +10,7 @@ REM changing this file.
 
 CD packages/animations
 CALL flutter analyze --no-fatal-infos
+set USE_FLUTTER_TEST_FONT=1
 CALL flutter test
 
 REM We don't run the tests in packages/rfw because those tests are

customer_testing.sh

@@ -36,7 +36,7 @@ flutter analyze --no-fatal-infos
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
     # We only run the full tests on Linux because golden files differ
     # from platform to platform.
-    flutter test
+    USE_FLUTTER_TEST_FONT=1 flutter test
 fi
 # The next script verifies that the coverage is not regressed; it does
 # not verify goldens. (It does run all the tests though, so it still

packages/camera/camera/example/android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=false
-android.enableR8=true

packages/camera/camera/pubspec.yaml

@@ -35,6 +35,6 @@ dev_dependencies:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.0
+  mockito: 5.3.2
   plugin_platform_interface: ^2.0.0
   video_player: ^2.0.0

packages/camera/camera_android/CHANGELOG.md

@@ -1,7 +1,17 @@
-## NEXT
+## 0.10.5
+
+* Allows camera to be switched while video recording.
+## 0.10.4+3
+
+* Clarifies explanation of endorsement in README.
+
+## 0.10.4+2
 
 * Aligns Dart and Flutter SDK constraints.
 * Updates compileSdkVersion to 33.
+* Fixes false positive for CamcorderProfile deprecation warning
+  that was already fixed.
+* Changes the severity of `javac` warnings so that they are treated as errors and fixes the violations.
 
 ## 0.10.4+1
 

packages/camera/camera_android/README.md

@@ -5,7 +5,11 @@ The Android implementation of [`camera`][1].
 ## Usage
 
 This package is [endorsed][2], which means you can simply use `camera`
-normally. This package will be automatically included in your app when you do.
+normally. This package will be automatically included in your app when you do,
+so you do not need to add it to your `pubspec.yaml`.
+
+However, if you `import` this package to use any of its APIs directly, you
+should add it to your `pubspec.yaml` as usual.
 
 [1]: https://pub.dev/packages/camera
 [2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin