Skip to content

Commit e8dcbd9

Browse files
Roll Flutter master to 8b22f67c85114 (#9407)
Rolls the Flutter master pin to 8b22f67c85114def3f090286c386627efdf59614 flutter/flutter@d8baa77...8b22f67 Makes the following changes: - Updates the Pigeon example app's iOS channel registration for the breaking change caused by UISceneDelegate automigration in the `flutter` tool - Updates the video_player_avfoundation XCTests to use mock registrars instead of real registrars created by the real registry. This was tech debt, since unit tests shouldn't be coupled to real app state, and it broke because of the registry no longer being available when the unit tests run (due to the same migration). - Updates video_player_avfoundation to take a view provider, so that tests can inject a fake provider, decoupling unit test behavior from the actual app's root view controller, fixing a potential race after the UISceneDelegate migration. - Skips quick_actions_ios XCUITests until the plugin can be fixed. Tracked in flutter/flutter#169928
1 parent c3c4c5a commit e8dcbd9

File tree

15 files changed

+237
-160
lines changed

15 files changed

+237
-160
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d8baa77b38461e7061e06e72c6bf50d64d302b8c
1+
8b22f67c85114def3f090286c386627efdf59614

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,26 @@ func sendEvents(_ eventListener: EventListener) {
100100
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
101101
) -> Bool {
102102
GeneratedPluginRegistrant.register(with: self)
103+
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
104+
}
105+
}
106+
107+
// TODO(stuartmorgan): Once 3.33+ reaches stable, remove this subclass and move the setup to
108+
// AppDelegate.register(...). This approach is only used because this example needs to support
109+
// both stable and master, and 3.32 doesn't have FlutterPluginRegistrant, while 3.33+ can't use
110+
// the older application(didFinishLaunchingWithOptions) approach.
111+
@objc class ExampleViewController: FlutterViewController {
112+
override func awakeFromNib() {
113+
super.awakeFromNib()
103114

104-
let controller = window?.rootViewController as! FlutterViewController
105115
let api = PigeonApiImplementation()
106-
ExampleHostApiSetup.setUp(binaryMessenger: controller.binaryMessenger, api: api)
116+
ExampleHostApiSetup.setUp(binaryMessenger: binaryMessenger, api: api)
117+
let controller = self
107118
// #docregion swift-init-event
108119
let eventListener = EventListener()
109120
StreamEventsStreamHandler.register(
110121
with: controller.binaryMessenger, streamHandler: eventListener)
111122
// #enddocregion swift-init-event
112123
sendEvents(eventListener)
113-
114-
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
115-
116124
}
117125
}

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<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">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<device id="retina6_12" orientation="portrait" appearance="light"/>
34
<dependencies>
45
<deployment identifier="iOS"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
7+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
68
</dependencies>
79
<scenes>
8-
<!--Flutter View Controller-->
10+
<!--Example View Controller-->
911
<scene sceneID="tne-QT-ifu">
1012
<objects>
11-
<viewController id="BYZ-38-t0r" customClass="FlutterViewController" sceneMemberID="viewController">
13+
<viewController id="BYZ-38-t0r" customClass="ExampleViewController" customModule="Runner" customModuleProvider="target" sceneMemberID="viewController">
1214
<layoutGuides>
1315
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
1416
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
1517
</layoutGuides>
1618
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
17-
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
19+
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
1820
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
19-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
21+
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2022
</view>
2123
</viewController>
2224
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ class RunnerUITests: XCTestCase {
3636
exampleApp = nil
3737
}
3838

39-
func testQuickActionWithFreshStart() {
39+
func testQuickActionWithFreshStart() throws {
40+
// See https://github.com/flutter/flutter/issues/169928
41+
throw XCTSkip("Temporarily disabled")
42+
4043
let springboard = XCUIApplication(bundleIdentifier: "com.apple.springboard")
4144
let quickActionsAppIcon = springboard.icons["quick_actions_example"]
4245

@@ -53,7 +56,10 @@ class RunnerUITests: XCTestCase {
5356
XCTAssert(actionTwoConfirmation.exists)
5457
}
5558

56-
func testQuickActionWhenAppIsInBackground() {
59+
func testQuickActionWhenAppIsInBackground() throws {
60+
// See https://github.com/flutter/flutter/issues/169928
61+
throw XCTSkip("Temporarily disabled")
62+
5763
exampleApp.launch()
5864

5965
let actionsReady = exampleApp.otherElements["actions ready"]

packages/video_player/video_player_avfoundation/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## NEXT
22

33
* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
4+
* Refactors native code for improved testing.
45

56
## 2.7.1
67

0 commit comments

Comments
 (0)