Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit c0eb51e

Browse files
bparrishMinesbparrishMines
authored
Pull latest main branch changes into v4_webview (#6713)
1 parent e6e35a2 commit c0eb51e

20 files changed

+461
-105
lines changed

‎.ci.yaml

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,149 @@ platform_properties:
2525
]
2626
device_type: none
2727
os: Windows
28+
mac_x64:
29+
properties:
30+
dependencies: >-
31+
[
32+
{"dependency": "xcode", "version": "14a5294e"},
33+
{"dependency": "gems", "version": "v3.3.14"}
34+
]
35+
os: Mac-12
36+
device_type: none
37+
cpu: x86
38+
xcode: 14a5294e # xcode 14.0 beta 5
39+
2840

2941
targets:
42+
### iOS+macOS tasks ***
43+
# TODO(stuartmorgan): Move this to ARM once google_maps_flutter has ARM
44+
# support. `pod lint` makes a synthetic target that doesn't respect the
45+
# pod's arch exclusions, so fails to build.
46+
- name: Mac_x64 lint_podspecs
47+
recipe: plugins/plugins
48+
bringup: true # New target: https://github.com/flutter/plugins/pull/6637
49+
timeout: 30
50+
properties:
51+
add_recipes_cq: "true"
52+
version_file: flutter_master.version
53+
target_file: mac_lint_podspecs.yaml
54+
55+
### macOS desktop tasks ###
56+
# macos-platform_tests builds all the plugins on M1, so this build is run
57+
# on Intel to give us build coverage of both host types.
58+
- name: Mac_x64 build_all_plugins master
59+
recipe: plugins/plugins
60+
bringup: true # New target: https://github.com/flutter/plugins/pull/6671
61+
timeout: 30
62+
properties:
63+
add_recipes_cq: "true"
64+
version_file: flutter_master.version
65+
target_file: mac_build_all_plugins.yaml
66+
channel: master
67+
68+
- name: Mac_x64 build_all_plugins stable
69+
recipe: plugins/plugins
70+
bringup: true # New target: https://github.com/flutter/plugins/pull/6671
71+
timeout: 30
72+
properties:
73+
add_recipes_cq: "true"
74+
version_file: flutter_stable.version
75+
target_file: mac_build_all_plugins.yaml
76+
channel: stable
77+
78+
### iOS tasks ###
79+
# TODO(stuartmorgan): Swap this and ios-build_all_plugins once simulator
80+
# tests are reliable on the ARM infrastructure. See discussion at
81+
# https://github.com/flutter/plugins/pull/5693#issuecomment-1126011089
82+
- name: Mac_x64 ios_platform_tests_1_of_4 master
83+
recipe: plugins/plugins
84+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
85+
timeout: 30
86+
properties:
87+
add_recipes_cq: "true"
88+
version_file: flutter_master.version
89+
target_file: mac_ios_platform_tests.yaml
90+
package_sharding: "--shardIndex 0 --shardCount 4"
91+
92+
- name: Mac_x64 ios_platform_tests_2_of_4 master
93+
recipe: plugins/plugins
94+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
95+
timeout: 30
96+
properties:
97+
add_recipes_cq: "true"
98+
version_file: flutter_master.version
99+
target_file: mac_ios_platform_tests.yaml
100+
package_sharding: "--shardIndex 1 --shardCount 4"
101+
102+
- name: Mac_x64 ios_platform_tests_3_of_4 master
103+
recipe: plugins/plugins
104+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
105+
timeout: 30
106+
properties:
107+
add_recipes_cq: "true"
108+
version_file: flutter_master.version
109+
target_file: mac_ios_platform_tests.yaml
110+
package_sharding: "--shardIndex 2 --shardCount 4"
111+
112+
- name: Mac_x64 ios_platform_tests_4_of_4 master
113+
recipe: plugins/plugins
114+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
115+
timeout: 30
116+
properties:
117+
add_recipes_cq: "true"
118+
version_file: flutter_master.version
119+
target_file: mac_ios_platform_tests.yaml
120+
package_sharding: "--shardIndex 3 --shardCount 4"
121+
122+
# Don't run full platform tests on both channels in pre-submit.
123+
- name: Mac_x64 ios_platform_tests_1_of_4 stable
124+
recipe: plugins/plugins
125+
presubmit: false
126+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
127+
timeout: 30
128+
properties:
129+
channel: stable
130+
add_recipes_cq: "true"
131+
version_file: flutter_stable.version
132+
target_file: mac_ios_platform_tests.yaml
133+
package_sharding: "--shardIndex 0 --shardCount 4"
134+
135+
- name: Mac_x64 ios_platform_tests_2_of_4 stable
136+
recipe: plugins/plugins
137+
presubmit: false
138+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
139+
timeout: 30
140+
properties:
141+
channel: stable
142+
add_recipes_cq: "true"
143+
version_file: flutter_stable.version
144+
target_file: mac_ios_platform_tests.yaml
145+
package_sharding: "--shardIndex 1 --shardCount 4"
146+
147+
- name: Mac_x64 ios_platform_tests_3_of_4 stable
148+
recipe: plugins/plugins
149+
presubmit: false
150+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
151+
timeout: 30
152+
properties:
153+
channel: stable
154+
add_recipes_cq: "true"
155+
version_file: flutter_stable.version
156+
target_file: mac_ios_platform_tests.yaml
157+
package_sharding: "--shardIndex 2 --shardCount 4"
158+
159+
- name: Mac_x64 ios_platform_tests_4_of_4 stable
160+
recipe: plugins/plugins
161+
presubmit: false
162+
bringup: true # New target: https://github.com/flutter/plugins/pull/6682
163+
timeout: 30
164+
properties:
165+
channel: stable
166+
add_recipes_cq: "true"
167+
version_file: flutter_stable.version
168+
target_file: mac_ios_platform_tests.yaml
169+
package_sharding: "--shardIndex 3 --shardCount 4"
170+
30171
- name: Windows win32-platform_tests master
31172
recipe: plugins/plugins
32173
timeout: 30

‎.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0e98194681fdd83ee1c0a90b8b5b176df121bf1e
1+
61e927d22fe6d82c94c368d62aa81f733bd9218d

‎.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6928314d505d2bb4777be05e45d7808a5aa91d2a
1+
52b3dc25f6471c27b2144594abb11c741cb88f57

‎.ci/scripts/build_all_plugins.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Use of this source code is governed by a BSD-style license that can be
44
# found in the LICENSE file.
55

6+
platform="$1"
7+
build_mode="$2"
68
cd all_packages
7-
flutter build windows --debug
8-
flutter build windows --release
9+
flutter build "$platform" --"$build_mode"

‎.ci/scripts/create_simulator.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
# Copyright 2013 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
device=com.apple.CoreSimulator.SimDeviceType.iPhone-11
7+
os=com.apple.CoreSimulator.SimRuntime.iOS-16-0
8+
9+
xcrun simctl list
10+
xcrun simctl create Flutter-iPhone "$device" "$os" | xargs xcrun simctl boot

‎.ci/targets/build_all_plugins.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@ tasks:
33
script: .ci/scripts/prepare_tool.sh
44
- name: create all_plugins app
55
script: .ci/scripts/create_all_plugins_app.sh
6-
- name: build all_plugins
6+
- name: build all_plugins debug
77
script: .ci/scripts/build_all_plugins.sh
8+
args: ["windows", "debug"]
9+
- name: build all_plugins release
10+
script: .ci/scripts/build_all_plugins.sh
11+
args: ["windows", "release"]

‎.ci/targets/mac_build_all_plugins.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tasks:
2+
- name: prepare tool
3+
script: .ci/scripts/prepare_tool.sh
4+
- name: create all_plugins app
5+
script: .ci/scripts/create_all_plugins_app.sh
6+
- name: build all_plugins debug
7+
script: .ci/scripts/build_all_plugins.sh
8+
args: ["macos", "debug"]
9+
- name: build all_plugins release
10+
script: .ci/scripts/build_all_plugins.sh
11+
args: ["macos", "release"]

‎.ci/targets/mac_ios_platform_tests.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
tasks:
2+
- name: create simulator
3+
script: .ci/scripts/create_simulator.sh
4+
- name: build examples
5+
script: script/tool_runner.sh
6+
args: ["build-examples", "--ios"]
7+
- name: xcode analyze
8+
script: script/tool_runner.sh
9+
args: ["xcode-analyze", "--ios"]
10+
- name: xcode analyze deprecation
11+
# Ensure we don't accidentally introduce deprecated code.
12+
script: script/tool_runner.sh
13+
args: ["xcode-analyze", "--ios", "--ios-min-version=13.0"]
14+
- name: native test
15+
script: script/tool_runner.sh
16+
args: ["native-test", "--ios", "--ios-destination", "platform=iOS Simulator,name=iPhone 11,OS=latest"]
17+
- name: drive examples
18+
# `drive-examples` contains integration tests, which changes the UI of the application.
19+
# This UI change sometimes affects `xctest`.
20+
# So we run `drive-examples` after `native-test`; changing the order will result ci failure.
21+
script: script/tool_runner.sh
22+
args: ["drive-examples", "--ios", "--exclude=script/configs/exclude_integration_ios.yaml"]

‎.ci/targets/mac_lint_podspecs.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
tasks:
2+
- name: prepare tool
3+
script: .ci/scripts/prepare_tool.sh
4+
- name: lint iOS and macOS podspecs
5+
script: script/tool_runner.sh
6+
args: ["podspecs"]

‎.cirrus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gcp_credentials: ENCRYPTED[!f1177d1ddb5330ffaa9ea11c9c9e8e0c542185e895c36071f18cec923dd31c50ece6d18da89c2f6f1cd2d1a98d0c2eea!]
1+
gcp_credentials: ENCRYPTED[!9e38557f08108136b3625b7e62c64cc9eccc50365ffeaaa55c6be52f1d8fd6225af5badc69983ca08484274f02f34424!]
22

33
# Run on PRs and main branch post submit only. Don't run tests when tagging.
44
only_if: $CIRRUS_TAG == '' && ($CIRRUS_PR != '' || $CIRRUS_BRANCH == 'main')
@@ -245,7 +245,7 @@ task:
245245
CHANNEL: "master"
246246
CHANNEL: "stable"
247247
MAPS_API_KEY: ENCRYPTED[596a9f6bca436694625ac50851dc5da6b4d34cba8025f7db5bc9465142e8cd44e15f69e3507787753accebfc4910d550]
248-
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[30e6cf7189e3ff3868edc25d2e638ef2aec70546456427064bbc74b297d36145364f49f9d26b327787a59df149d69262]
248+
GCLOUD_FIREBASE_TESTLAB_KEY: ENCRYPTED[4457646586de940f49e054de7d82e60078b205ac627f11a89d077e63f639c9ba1002541d9209a9ee7777e159e97b43d0]
249249
build_script:
250250
- ./script/tool_runner.sh build-examples --apk
251251
lint_script:

‎packages/video_player/video_player_android/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Updates code for `no_leading_underscores_for_local_identifiers` lint.
44
* Updates minimum Flutter version to 2.10.
55
* Fixes violations of new analysis option use_named_constants.
6+
* Removes an unnecessary override in example code.
67

78
## 2.3.9
89

‎packages/video_player/video_player_android/example/lib/mini_controller.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,6 @@ class MiniController extends ValueNotifier<VideoPlayerValue> {
341341
void _updatePosition(Duration position) {
342342
value = value.copyWith(position: position);
343343
}
344-
345-
@override
346-
void removeListener(VoidCallback listener) {
347-
super.removeListener(listener);
348-
}
349344
}
350345

351346
/// Widget that displays the video controlled by [controller].

‎packages/video_player/video_player_avfoundation/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## NEXT
2+
3+
* Adds an integration test for a bug where the aspect ratios of some HLS videos are incorrectly inverted.
4+
* Removes an unnecessary override in example code.
5+
16
## 2.3.7
27

38
* Fixes a bug where the aspect ratio of some HLS videos are incorrectly inverted.

‎packages/video_player/video_player_avfoundation/example/integration_test/video_player_test.dart

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,5 +177,19 @@ void main() {
177177
expect(livestreamController.value.duration,
178178
(Duration duration) => duration != Duration.zero);
179179
});
180+
181+
testWidgets('rotated m3u8 has correct aspect ratio',
182+
(WidgetTester tester) async {
183+
// Some m3u8 files contain rotation data that may incorrectly invert the aspect ratio.
184+
// More info [here](https://github.com/flutter/flutter/issues/109116).
185+
final MiniController livestreamController = MiniController.network(
186+
'https://flutter.github.io/assets-for-api-docs/assets/videos/hls/rotated_nail_manifest.m3u8',
187+
);
188+
await livestreamController.initialize();
189+
190+
expect(livestreamController.value.isInitialized, true);
191+
expect(livestreamController.value.size.width,
192+
lessThan(livestreamController.value.size.height));
193+
});
180194
});
181195
}

‎packages/video_player/video_player_avfoundation/example/lib/mini_controller.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,6 @@ class MiniController extends ValueNotifier<VideoPlayerValue> {
341341
void _updatePosition(Duration position) {
342342
value = value.copyWith(position: position);
343343
}
344-
345-
@override
346-
void removeListener(VoidCallback listener) {
347-
super.removeListener(listener);
348-
}
349344
}
350345

351346
/// Widget that displays the video controlled by [controller].

‎packages/webview_flutter/webview_flutter/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Fixes avoid_redundant_argument_values lint warnings and minor typos.
66
* Ignores unnecessary import warnings in preparation for [upcoming Flutter changes](https://github.com/flutter/flutter/pull/104231).
77
* Updates references to the obsolete master branch.
8+
* Fixes typo from lowercase to uppercase.
89

910
## 3.0.4
1011

‎packages/webview_flutter/webview_flutter/lib/src/webview.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ class _WebViewState extends State<WebView> {
315315
webViewPlatformCallbacksHandler: _platformCallbacksHandler,
316316
javascriptChannelRegistry: _javascriptChannelRegistry,
317317
gestureRecognizers: widget.gestureRecognizers,
318-
creationParams: _creationParamsfromWidget(widget),
318+
creationParams: _creationParamsFromWidget(widget),
319319
);
320320
}
321321

@@ -360,7 +360,7 @@ class _WebViewState extends State<WebView> {
360360
}
361361
}
362362

363-
CreationParams _creationParamsfromWidget(WebView widget) {
363+
CreationParams _creationParamsFromWidget(WebView widget) {
364364
return CreationParams(
365365
initialUrl: widget.initialUrl,
366366
webSettings: _webSettingsFromWidget(widget),

‎script/tool/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## NEXT
2+
3+
* Pins `package:git` dependency to `2.0.x` until `dart >=2.18.0` becomes our
4+
oldest legacy.
5+
* Updates test mocks.
6+
17
## 0.13.0
28

39
* Renames `all-plugins-app` to `create-all-packages-app` to clarify what it

‎script/tool/pubspec.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ dependencies:
99
collection: ^1.15.0
1010
colorize: ^3.0.0
1111
file: ^6.1.0
12-
git: ^2.0.0
12+
# Pin git to 2.0.x until dart >=2.18 is legacy
13+
git: '>=2.0.0 <2.1.0'
1314
http: ^0.13.3
1415
http_multi_server: ^3.0.1
1516
meta: ^1.3.0

0 commit comments

Comments
 (0)