@@ -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' : 'c91ea1a8fd3fdd0018e89875557ded9ac14620c1 ' ,
17+ 'skia_revision' : '3ab8765a1512cb18dde76a7d1a2ae641fa8f21b5 ' ,
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,25 +56,25 @@ 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' : '0cfefe2a03fb19c288d58484abb9690d7570fdeb ' ,
59+ 'dart_revision' : '8fe61b2d428babd3d4b6c54c87e69b7e07093b57 ' ,
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
6363 'dart_binaryen_rev' : 'b4bdcc33115b31758c56b83bb9de4642c411a042' ,
64- 'dart_boringssl_rev' : 'ef839bf397fb4ecdb66ef2679a08ac7b3563c50b ' ,
64+ 'dart_boringssl_rev' : '8d312a04845e98a0c3ceafde50377b56fc83d2c0 ' ,
6565 'dart_core_rev' : '635dfa32c261ba078438b74de397f2207904ca78' ,
6666 'dart_devtools_rev' : '1fb2f4ce5099042b7f2dfa93dec675a21861d21f' ,
6767 'dart_ecosystem_rev' : '815d4ba2e7d11f8695a26f6cbe1262e3b8ff8d0d' ,
68- 'dart_http_rev' : 'e4ddd3e3d3a3d0ba7c9e48506e9d2e8620af30a8 ' ,
68+ 'dart_http_rev' : '63c477b466f650e8f5505d6d78dc283c2c2f9845 ' ,
6969 'dart_i18n_rev' : 'de1943629469719bf34269bf90fcdbe9334a73f3' ,
7070 'dart_libprotobuf_rev' : '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb' ,
7171 'dart_perfetto_rev' : '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b' ,
7272 'dart_protobuf_gn_rev' : 'ca669f79945418f6229e4fef89b666b2a88cbb10' ,
7373 'dart_protobuf_rev' : '1aaa332af75c61ff32739821f7ec52186ff18d4c' ,
7474 'dart_pub_rev' : 'b2c03b448a47fdd52800609b9222cd737be3a934' ,
7575 'dart_sync_http_rev' : 'dc54465f07d9652875deeade643256dafa2fbc6c' ,
76- 'dart_tools_rev' : '4a284152c263a5d3429d5ab6acfdb70eca2ebcfb ' ,
77- 'dart_vector_math_rev' : 'dc9d379674f50bb5559e99ee3a9f64729df9d3c8 ' ,
76+ 'dart_tools_rev' : '11a7719ffc6573b62d164a3188b8c2131b6ef6c3 ' ,
77+ 'dart_vector_math_rev' : '39cafd45346f355a6e4c38a17c89fcd199dc1c96 ' ,
7878 'dart_web_rev' : '5a39fdc396ae40344308975140343c23b6863261' ,
7979 'dart_webdev_rev' : '5bf833d0c277a384ab8bbfc10e7d3d71b8022560' ,
8080 'dart_webdriver_rev' : 'f52afbf72895ae980bd4129d877305c2182d6cbc' ,
@@ -100,10 +100,6 @@ vars = {
100100 # Checkout Linux dependencies only when building on Linux.
101101 'download_linux_deps' : 'host_os == "linux"' ,
102102
103- # The minimum macOS SDK version. This must match the setting in
104- # //flutter/tools/gn.
105- 'mac_sdk_min' : '10.14' ,
106-
107103 # Checkout Fuchsia dependencies only on Linux. This is the umbrella flag which
108104 # controls the behavior of all fuchsia related flags. I.e. any fuchsia related
109105 # logic or condition may not work if this flag is False.
@@ -211,7 +207,7 @@ vars = {
211207 # The version / instance id of the cipd:chromium/fuchsia/test-scripts which
212208 # will be used altogether with fuchsia-sdk to setup the build / test
213209 # environment.
214- 'fuchsia_test_scripts_version' : 'mApUsju36efRytN4WFdopPYMfYgAI8ODzTmYq3zNEqsC ' ,
210+ 'fuchsia_test_scripts_version' : 'TcALRG6cjvR6RVe4L8oiH60SOFvQQM9bP54kURsCgyAC ' ,
215211
216212 # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
217213 # used altogether with fuchsia-sdk to generate gn based build rules.
@@ -268,7 +264,7 @@ deps = {
268264 Var ('chromium_git' ) + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709' ,
269265
270266 'engine/src/flutter/third_party/icu' :
271- Var ('chromium_git' ) + '/chromium/deps/icu.git' + '@' + '4239b1559d11d4fa66c100543eda4161e060311e ' ,
267+ Var ('chromium_git' ) + '/chromium/deps/icu.git' + '@' + 'c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b ' ,
272268
273269 'engine/src/flutter/third_party/gtest-parallel' :
274270 Var ('chromium_git' ) + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14' ,
@@ -317,7 +313,7 @@ deps = {
317313 Var ('dart_git' ) + '/dart_style.git@100db45075abdd66fd8788b205243e90ff0595df' ,
318314
319315 'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc' :
320- Var ('dart_git' ) + '/dartdoc.git@62aefbb788baf5b73b2d704d66d9735a7ca56a69 ' ,
316+ Var ('dart_git' ) + '/dartdoc.git@17887101dd0f233eed40d9d1cac6b4ee5b70572e ' ,
321317
322318 'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem' :
323319 Var ('dart_git' ) + '/ecosystem.git' + '@' + Var ('dart_ecosystem_rev' ),
@@ -332,7 +328,7 @@ deps = {
332328 Var ('dart_git' ) + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c' ,
333329
334330 'engine/src/flutter/third_party/dart/third_party/pkg/native' :
335- Var ('dart_git' ) + '/native.git@49a8912734162e5dc6ad009fc080fe54e9985470 ' ,
331+ Var ('dart_git' ) + '/native.git@f1e2d898e78c17ff413727a58170d4bc21ec5678 ' ,
336332
337333 'engine/src/flutter/third_party/dart/third_party/pkg/protobuf' :
338334 Var ('dart_git' ) + '/protobuf.git' + '@' + Var ('dart_protobuf_rev' ),
@@ -350,7 +346,7 @@ deps = {
350346 Var ('dart_git' ) + '/external/github.com/simolus3/tar.git@5a1ea943e70cdf3fa5e1102cdbb9418bd9b4b81a' ,
351347
352348 'engine/src/flutter/third_party/dart/third_party/pkg/test' :
353- Var ('dart_git' ) + '/test.git@84eba115521b74e848f096572a2d3e4d3607e8fa ' ,
349+ Var ('dart_git' ) + '/test.git@3ac991fa5ea406474e4d8d6c823fc078a6c6c6b4 ' ,
354350
355351 'engine/src/flutter/third_party/dart/third_party/pkg/tools' :
356352 Var ('dart_git' ) + '/tools.git' + '@' + Var ('dart_tools_rev' ),
@@ -371,7 +367,7 @@ deps = {
371367 Var ('dart_git' ) + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var ('dart_webkit_inspection_protocol_rev' ),
372368
373369 'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk' :
374- {'dep_type' : 'cipd' , 'packages' : [{'package' : 'dart/dart-sdk/${{platform}}' , 'version' : 'git_revision:5a8921e0042c662ea2adbac35ea051dec20a5341 ' }]},
370+ {'dep_type' : 'cipd' , 'packages' : [{'package' : 'dart/dart-sdk/${{platform}}' , 'version' : 'git_revision:4bb26ad346b166d759773e01ffc8247893b9681e ' }]},
375371
376372 # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
377373
@@ -813,7 +809,7 @@ deps = {
813809 'packages' : [
814810 {
815811 'package' : 'fuchsia/sdk/core/linux-amd64' ,
816- 'version' : 'nggV-vSVM14nIXPsZBFj_hPpzMnA3MgxNK9YksOJUv8C '
812+ 'version' : 'RlQprtM7XbYtyrgDzNVWyHAjTLR_ScW_Ebe1nGMCn1AC '
817813 }
818814 ],
819815 'condition' : 'download_fuchsia_deps and not download_fuchsia_sdk' ,
@@ -988,32 +984,19 @@ hooks = [
988984 'terminal.x64,terminal.qemu-arm64' ,
989985 ]
990986 },
991- # The following two scripts check if they are running in the LUCI
992- # environment, and do nothing if so. This is because Xcode is not yet
993- # installed in CI when these hooks are run.
987+ # The following script checks if it is running in the LUCI environment,
988+ # and does nothing if so. This is because Xcode is not yet installed in CI
989+ # when this hook is run.
994990 {
995- 'name' : 'Find the iOS device SDKs' ,
991+ 'name' : 'Find the iOS and macOS SDKs' ,
996992 'pattern' : '.' ,
997993 'condition' : 'host_os == "mac"' ,
998994 'action' : [
999995 'python3' ,
1000- 'engine/src/build/config/ios/ios_sdk.py' ,
1001- # This cleans up entries under flutter/prebuilts for this script and the
1002- # following script.
996+ 'engine/src/build/mac/apple_sdk.py' ,
1003997 '--as-gclient-hook'
1004998 ]
1005999 },
1006- {
1007- 'name' : 'Find the macOS SDK' ,
1008- 'pattern' : '.' ,
1009- 'condition' : 'host_os == "mac"' ,
1010- 'action' : [
1011- 'python3' ,
1012- 'engine/src/build/mac/find_sdk.py' ,
1013- '--as-gclient-hook' ,
1014- Var ('mac_sdk_min' )
1015- ]
1016- },
10171000 {
10181001 'name' : 'Generate Fuchsia GN build rules' ,
10191002 'pattern' : '.' ,
0 commit comments