Merge branch 'main' into manual-roll-2d9977c14ebe

Author: stuartmorgan-g

packages/pigeon/example/app/ios/Runner/AppDelegate.swift

@@ -100,18 +100,26 @@ func sendEvents(_ eventListener: EventListener) {
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
+    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
+  }
+}
+
+// TODO(stuartmorgan): Once 3.33+ reaches stable, remove this subclass and move the setup to
+// AppDelegate.register(...). This approach is only used because this example needs to support
+// both stable and master, and 3.32 doesn't have FlutterPluginRegistrant, while 3.33+ can't use
+// the older application(didFinishLaunchingWithOptions) approach.
+@objc class ExampleViewController: FlutterViewController {
+  override func awakeFromNib() {
+    super.awakeFromNib()
 
-    let controller = window?.rootViewController as! FlutterViewController
     let api = PigeonApiImplementation()
-    ExampleHostApiSetup.setUp(binaryMessenger: controller.binaryMessenger, api: api)
+    ExampleHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: api)
+    let controller = self
     // #docregion swift-init-event
     let eventListener = EventListener()
     StreamEventsStreamHandler.register(
       with: controller.binaryMessenger, streamHandler: eventListener)
     // #enddocregion swift-init-event
     sendEvents(eventListener)
-
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
-
   }
 }

packages/pigeon/example/app/ios/Runner/Base.lproj/Main.storyboard

@@ -1,22 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Flutter View Controller-->
+        <!--Example View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ExampleViewController" customModule="Runner" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

packages/quick_actions/quick_actions_ios/example/ios/RunnerUITests/RunnerUITests.swift

@@ -36,7 +36,10 @@ class RunnerUITests: XCTestCase {
     exampleApp = nil
   }
 
-  func testQuickActionWithFreshStart() {
+  func testQuickActionWithFreshStart() throws {
+    // See https://github.com/flutter/flutter/issues/169928
+    throw XCTSkip("Temporarily disabled")
+
     let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")
     let quickActionsAppIcon = springboard.icons["quick_actions_example"]
 
@@ -53,7 +56,10 @@ class RunnerUITests: XCTestCase {
     XCTAssert(actionTwoConfirmation.exists)
   }
 
-  func testQuickActionWhenAppIsInBackground() {
+  func testQuickActionWhenAppIsInBackground() throws {
+    // See https://github.com/flutter/flutter/issues/169928
+    throw XCTSkip("Temporarily disabled")
+
     exampleApp.launch()
 
     let actionsReady = exampleApp.otherElements["actions ready"]

packages/video_player/video_player_avfoundation/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## NEXT
 
 * Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
+* Refactors native code for improved testing.
 
 ## 2.7.1