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

Commit 3eeb2f4

Browse files
Merge branch 'main' into fix_polygon_depth
2 parents da84784 + 3cb6f4d commit 3eeb2f4

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vars = {
1414
'flutter_git': 'https://flutter.googlesource.com',
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
17-
'skia_revision': '778b21720a61d6cce3d2e4e55424cdec49abe7cf',
17+
'skia_revision': '261316c1048463134def350f8fc0d80d2253a2ff',
1818

1919
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2020
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,7 +56,7 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': 'ed9a5b1110aeb7495a8dbfea2e797cb3d86fff08',
59+
'dart_revision': '4ea43aa234a4a1712167ca711d90c52c69e323f3',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -875,7 +875,7 @@ deps = {
875875
'packages': [
876876
{
877877
'package': 'fuchsia/sdk/core/linux-amd64',
878-
'version': 'TZVo85tD5mpzhcafgVvi5wlAXomXRbtrbCfGJ2tO_ogC'
878+
'version': 'BajfrJuYeyWvnBhuMsYlPmNADNd_e4gS4bvqpD0uDTsC'
879879
}
880880
],
881881
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

ci/builders/linux_web_engine.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
},
427427
{
428428
"dependency": "firefox",
429-
"version": "version:106.0"
429+
"version": "version:132.0"
430430
}
431431
],
432432
"tasks": [

ci/licenses_golden/licenses_dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: ad943b3dce1d3415bb8663e604f48d55
1+
Signature: 9667582091ce380a8656962fd18d0464
22

33
====================================================================================================
44
LIBRARY: dart
@@ -4805,7 +4805,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
48054805
This Source Code Form is "Incompatible With Secondary Licenses", as
48064806
defined by the Mozilla Public License, v. 2.0.
48074807

4808-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/307869c696e8003257ca3666f3c89e22f2a379a9
4808+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/cde0e0dc084aecff13be91b5b46767003a05c561
48094809
/third_party/fallback_root_certificates/
48104810

48114811
====================================================================================================

ci/licenses_golden/licenses_fuchsia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 79614496f23d10dd35fb04f407d9e4cb
1+
Signature: 9740f32fa78b97178620d40cb7de45f3
22

33
====================================================================================================
44
LIBRARY: fuchsia_sdk

ci/licenses_golden/licenses_skia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: b6adc2a4d15695492cf578164185a65b
1+
Signature: f2ba2b43ea7612e25cf961ff83b28992
22

33
====================================================================================================
44
LIBRARY: etc1

lib/web_ui/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ The available versions of Chrome for Testing available can be found [here](https
180180
- Edit `dev/package_lock.yaml` and update the following values under `chrome`:
181181
- Set `version` to the full four part version number of the build of Chrome
182182
for Testing you want to roll (for example, `118.0.5993.70`)
183-
- Run `dart dev/browser_roller.dart` and make sure it completes successfully.
183+
- Run `dart dev/package_roller.dart` and make sure it completes successfully.
184184
The script uploads the specified versions of Chromium (and Chromedriver) to the
185185
right locations in CIPD: [Chrome](https://chrome-infra-packages.appspot.com/p/flutter_internal/browsers/chrome),
186186
[Chromedriver](https://chrome-infra-packages.appspot.com/p/flutter_internal/browser-drivers/chrome).
@@ -194,7 +194,7 @@ If you have questions, contact the Flutter Web team on Flutter Discord on the
194194

195195
We test with Firefox on LUCI in the Linux Web Engine builder. The process for
196196
rolling Firefox is even easier than Chromium. Simply update `package_lock.yaml`
197-
with the latest version of Firefox, and run `browser_roller.dart`.
197+
with the latest version of Firefox, and run `package_roller.dart`.
198198

199199
#### .ci.yaml
200200

@@ -210,7 +210,7 @@ After rolling Chrome and/or Firefox, also update the CI dependencies in
210210
]
211211
```
212212
213-
##### **browser_roller.dart**
213+
##### **package_roller.dart**
214214
215215
The script has the following command-line options:
216216
@@ -220,7 +220,7 @@ The script has the following command-line options:
220220
> Try the following!
221221
>
222222
> ```bash
223-
> dart ./dev/browser_roller.dart --dry-run --verbose
223+
> dart dev/package_roller.dart --dry-run --verbose
224224
> ```
225225

226226
#### **Other browsers / manual upload**

lib/web_ui/dev/package_lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ chrome:
44
version: '125.0.6422.141'
55

66
firefox:
7-
version: '106.0'
7+
version: '132.0'
88

99
edge:
1010
launcher_version: '1.2.0.0'

sky/packages/sky_engine/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32253,7 +32253,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
3225332253
This Source Code Form is "Incompatible With Secondary Licenses", as
3225432254
defined by the Mozilla Public License, v. 2.0.
3225532255

32256-
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/ed9a5b1110aeb7495a8dbfea2e797cb3d86fff08
32256+
You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/4ea43aa234a4a1712167ca711d90c52c69e323f3
3225732257
/third_party/fallback_root_certificates/
3225832258

3225932259
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)