Merge remote-tracking branch 'upstream/main' into update-goldens

Author: LongCatIsLooong

.ci/flutter_master.version

@@ -1 +1 @@
-d8a7211061084525a992664d997cff9349fa43d3
+67e5f663d075f31b251e22bb9a6b2c5c6744f448

.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

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_camerax/pubspec.yaml

@@ -30,5 +30,5 @@ dev_dependencies:
   build_runner: ^2.1.4
   flutter_test:
     sdk: flutter
-  mockito: ^5.3.2
+  mockito: 5.3.2
   pigeon: ^3.2.6

packages/camera/camera_web/example/pubspec.yaml

@@ -21,4 +21,4 @@ dev_dependencies:
     sdk: flutter
   integration_test:
     sdk: flutter
-  mocktail: ^0.3.0
+  mocktail: 0.3.0

packages/file_selector/file_selector_ios/pubspec.yaml

@@ -25,6 +25,6 @@ dev_dependencies:
   build_runner: 2.1.11
   flutter_test:
     sdk: flutter
-  mockito: ^5.1.0
+  mockito: 5.3.2
   pigeon: ^3.2.5