Skip to content

Commit 2932eb2

Browse files
bderobdero
committed
chore: reset DEPS to upstream 3.44 + shorebird overlay (dry run)
1 parent 8bc9075 commit 2932eb2

1 file changed

Lines changed: 47 additions & 57 deletions

File tree

‎DEPS‎

Lines changed: 47 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ vars = {
1515
'flutter_git': 'https://flutter.googlesource.com',
1616
'skia_git': 'https://skia.googlesource.com',
1717
'llvm_git': 'https://llvm.googlesource.com',
18-
'skia_revision': 'a183ded9ad67d998a5b0fe4cd86d3ef5402ffb45',
19-
"dart_sdk_revision": "3f8b97e369a83033089608c86c996a3f67897f8c",
18+
'skia_revision': 'e9ed4fc9f1544c58d8a9347c1fc9471d8dd7c465',
19+
"dart_sdk_revision": "8cf643d7faf6a52058c128b70450dfced40acc39",
2020
"dart_sdk_git": "git@github.com:shorebirdtech/dart-sdk.git",
2121
"updater_git": "https://github.com/shorebirdtech/updater.git",
2222
"updater_rev": "34509fca3c65388ebc84cfaea8f38733ce41f41a",
@@ -47,7 +47,7 @@ vars = {
4747
# updates to Clang Tidy will not turn the tree red.
4848
#
4949
# See https://github.com/flutter/flutter/wiki/Engine-pre‐submits-and-post‐submits#post-submit
50-
'clang_version': 'git_revision:8c7a2ce01a77c96028fe2c8566f65c45ad9408d3',
50+
'clang_version': 'git_revision:80743bd43fd5b38fedc503308e7a652e23d3ec93',
5151

5252
'reclient_version': 're_client_version:0.185.0.db415f21-gomaip',
5353

@@ -63,30 +63,28 @@ vars = {
6363
# updated revision list of existing dependencies. You will need to
6464
# gclient sync before and after update deps to ensure all deps are updated.
6565
# updated revision list of existing dependencies.
66-
'dart_revision': 'c70f78e7d682c158c15ca0c26c729b3ccb932284',
66+
'dart_revision': '9dc12969f5526d1bf1c2b48197d1608a68075866',
6767

6868
# WARNING: DO NOT EDIT MANUALLY
6969
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
70-
'dart_ai_rev': '1e69aa896fa23c93458017ee9b0bfacf446cb616',
71-
'dart_binaryen_rev': '6ec7b5f9c615d3b224c67ae221d6812c8f8e1a96',
72-
'dart_boringssl_rev': '9f138d05879fcf61965d1ea9d6c8b2cfc8bc12cb',
73-
'dart_core_rev': 'cbb485437c61d37753bcc98818beca54d5b38f69',
74-
'dart_devtools_rev': '9be2c887e3982e519cf58f185d5f7b008a4606e9',
75-
'dart_ecosystem_rev': 'eac66d93142907b39f2271647c111f36ff3365b9',
76-
'dart_http_rev': 'a22386e9c390290c916d1c53a3d3c1447ec120ce',
77-
'dart_i18n_rev': 'dd8a792a8492370a594706c8304d2eb8db844d7a',
78-
'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
70+
'dart_ai_rev': '3d3b7fdaddead83ce262377e5c4ce5b2a843066c',
71+
'dart_binaryen_rev': '58de22cdfd0ccb38ce68632695c0493c587af932',
72+
'dart_boringssl_rev': 'b0ae229f686f2be70689584d1e1c6a727a2cdfab',
73+
'dart_core_rev': '347df4b546f315fc1ff69c6e65f2a023b0263b1d',
74+
'dart_devtools_rev': 'fa063f322c03cc7a690d819db124c196a69cff56',
75+
'dart_ecosystem_rev': '6b2164f8f57583a7bcaa32341eaa219efd8fd2d3',
76+
'dart_http_rev': '6bfe07f26384637fad6d1713de9ba9d2bb5d8c88',
77+
'dart_i18n_rev': 'de7e11b7cc231d8daf6e49dc12690d7339241691',
7978
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
80-
'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
81-
'dart_protobuf_rev': '9e30258e0aa6a6430ee36c84b75308a9702fde42',
82-
'dart_pub_rev': '30b29f1cad33a772fa58692ce109ad412748d78e',
79+
'dart_protobuf_rev': '84079e8b8531309e06ba7276b1c28bdca9210ad6',
80+
'dart_pub_rev': '74408212b5348003381bc63f3b59274aaa23cfa3',
8381
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
84-
'dart_tools_rev': '87270e60a5c92f127acb29d6e0dbc2d920c3f669',
85-
'dart_vector_math_rev': '70a9a2cb610d040b247f3ca2cd70a94c1c6f6f23',
86-
'dart_web_rev': '35fc98dd8f9da175ed0a2dcf246299e922e1e1e2',
87-
'dart_webdev_rev': '234e44c2ba0aa6cee5a36026538ca89457bf0d55',
88-
'dart_webdriver_rev': '09104f459ed834d48b132f6b7734923b1fbcf2e9',
89-
'dart_webkit_inspection_protocol_rev': '0f7685804d77ec02c6564d7ac1a6c8a2341c5bdf',
82+
'dart_tools_rev': '7f986eaa15f493dd2da081ba0daa49be22fcc2fb',
83+
'dart_vector_math_rev': '7bf60fb95e0fbbd7648944071de9ab5e32ce7387',
84+
'dart_web_rev': 'e0ea82dd5e737b0c06fcaad6194731fb6f414791',
85+
'dart_webdev_rev': '5b7299f5b85706536aeac1c9f470b869ddb39fef',
86+
'dart_webdriver_rev': '26326d37c0279f201a59c4114c1389977928c0ca',
87+
'dart_webkit_inspection_protocol_rev': '762115a971d1968bc940454ad1e88d506d8c5640',
9088

9189
'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
9290

@@ -209,11 +207,11 @@ vars = {
209207
# The version / instance id of the cipd:chromium/fuchsia/test-scripts which
210208
# will be used altogether with fuchsia-sdk to setup the build / test
211209
# environment.
212-
'fuchsia_test_scripts_version': 'nR2ESa1Gd8yPcWo063yCqGBh6aAsLcwhgsRPFU0I0v0C',
210+
'fuchsia_test_scripts_version': 'R2EllDf4DgBXVNuiND77UsIc5t36TtLMwB1a92BF4-oC',
213211

214212
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
215213
# used altogether with fuchsia-sdk to generate gn based build rules.
216-
'fuchsia_gn_sdk_version': 'NAEC5tfgSl8g94nwpKsGtNMEdbiAlgwrNa9XQ7cIcbcC',
214+
'fuchsia_gn_sdk_version': 'JLBh4Z9PKsjIJcqDUDzEL8Q7whJ3CGRd4QmUL6IzizUC',
217215
}
218216

219217
gclient_gn_args_file = 'engine/src/flutter/third_party/dart/build/config/gclient_args.gni'
@@ -239,10 +237,10 @@ deps = {
239237
Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
240238

241239
'engine/src/flutter/third_party/rapidjson':
242-
Var('flutter_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
240+
Var('flutter_git') + '/third_party/rapidjson' + '@' + '47253cab97e9cfe99dbd6b90836fc11589d7d802',
243241

244242
'engine/src/flutter/third_party/harfbuzz':
245-
Var('flutter_git') + '/third_party/harfbuzz' + '@' + 'ea6a172f84f2cbcfed803b5ae71064c7afb6b5c2',
243+
Var('flutter_git') + '/third_party/harfbuzz' + '@' + '49844c32a7a3f6be371355a1213c952a3f4a44e7',
246244

247245
'engine/src/flutter/third_party/libcxx':
248246
Var('llvm_git') + '/llvm-project/libcxx' + '@' + 'bd557f6f764d1e40b62528a13b124ce740624f8f',
@@ -254,10 +252,10 @@ deps = {
254252
Var('llvm_git') + '/llvm-project/libc' + '@' + '5af39a19a1ad51ce93972cdab206dcd3ff9b6afa',
255253

256254
'engine/src/flutter/third_party/glfw':
257-
Var('flutter_git') + '/third_party/glfw' + '@' + 'dd8a678a66f1967372e5a5e3deac41ebf65ee127',
255+
Var('flutter_git') + '/third_party/glfw' + '@' + '9352d8fe93cd443be18157abe81f16500549aec0',
258256

259257
'engine/src/flutter/third_party/shaderc':
260-
Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + '37e25539ce199ecaf19fb7f7d27818716d36686d',
258+
Var('chromium_git') + '/external/github.com/google/shaderc' + '@' + 'd15277d6bc180f6a0b8b601f0cab2bbcaac9b4d5',
261259

262260
'engine/src/flutter/third_party/vulkan-deps':
263261
Var('chromium_git') + '/vulkan-deps' + '@' + 'a9e2ca3b57aba86a22a2df1b84bf12f8cc98806e',
@@ -266,7 +264,7 @@ deps = {
266264
Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '067bfdbde9b10c1beb5d6b02d67ae9db8b96f736',
267265

268266
'engine/src/flutter/third_party/icu':
269-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a86a32e67b8d1384b33f8fa48c83a6079b86f8cd',
267+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'ee5f27adc28bd3f15b2c293f726d14d2e336cbd5',
270268

271269
'engine/src/flutter/third_party/gtest-parallel':
272270
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -275,7 +273,7 @@ deps = {
275273
Var('chromium_git') + '/external/github.com/google/benchmark' + '@' + '431abd149fd76a072f821913c0340137cc755f36',
276274

277275
'engine/src/flutter/third_party/googletest':
278-
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + '7f036c5563af7d0329f20e8bb42effb04629f0c0',
276+
Var('chromium_git') + '/external/github.com/google/googletest' + '@' + 'e9907112b47255d50b4d343e7e2160bce8dc85d1',
279277

280278
'engine/src/flutter/third_party/re2':
281279
Var('chromium_git') + '/external/github.com/google/re2' + '@' + 'c84a140c93352cdabbfb547c531be34515b12228',
@@ -289,14 +287,6 @@ deps = {
289287
'engine/src/flutter/third_party/boringssl/src':
290288
'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
291289

292-
'engine/src/flutter/third_party/protobuf':
293-
Var('flutter_git') + '/third_party/protobuf' + '@' + Var('dart_libprotobuf_rev'),
294-
295-
# TODO(67373): These are temporarily checked in, but this dep can be restored
296-
# once the buildmoot is completed.
297-
# 'engine/src/flutter/build/secondary/third_party/protobuf':
298-
# Var('flutter_git') + '/third_party/protobuf-gn' + '@' + Var('dart_protobuf_gn_rev'),
299-
300290
'engine/src/flutter/third_party/dart':
301291
Var('dart_sdk_git') + '@' + Var('dart_sdk_revision'),
302292

@@ -306,10 +296,10 @@ deps = {
306296
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
307297

308298
'engine/src/flutter/third_party/dart/third_party/devtools':
309-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:9be2c887e3982e519cf58f185d5f7b008a4606e9'}]},
299+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:fa063f322c03cc7a690d819db124c196a69cff56'}]},
310300

311301
'engine/src/flutter/third_party/dart/third_party/perfetto/src':
312-
Var('android_git') + '/platform/external/perfetto' + '@' + Var('dart_perfetto_rev'),
302+
Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
313303

314304
'engine/src/flutter/third_party/dart/third_party/pkg/ai':
315305
Var('dart_git') + '/ai.git' + '@' + Var('dart_ai_rev'),
@@ -318,10 +308,10 @@ deps = {
318308
Var('dart_git') + '/core.git' + '@' + Var('dart_core_rev'),
319309

320310
'engine/src/flutter/third_party/dart/third_party/pkg/dart_style':
321-
Var('dart_git') + '/dart_style.git@e8190bf2242654daee7ebf21fd6d8c8046989822',
311+
Var('dart_git') + '/dart_style.git@9b302dd20b4b38979352f21cf515b44617d344ce',
322312

323313
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
324-
Var('dart_git') + '/dartdoc.git@6d1aa6f5045c33d3723aba05e3e0dc1403b763c0',
314+
Var('dart_git') + '/dartdoc.git@a57f497ae9df6e6073b5eb7ddf253d0b2eb470c3',
325315

326316
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
327317
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -336,7 +326,7 @@ deps = {
336326
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
337327

338328
'engine/src/flutter/third_party/dart/third_party/pkg/native':
339-
Var('dart_git') + '/native.git@9a11537944f2ee295df46104624fb714c3dd7741',
329+
Var('dart_git') + '/native.git@debb5bddc4ce0aef9d70bb949495e0c65cc976d4',
340330

341331
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
342332
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -345,7 +335,7 @@ deps = {
345335
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
346336

347337
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
348-
Var('dart_git') + '/shelf.git@dd830a0338b31bee92fe7ebc20b9bb963403b6b0',
338+
Var('dart_git') + '/shelf.git@c4b94d3879e627c0b1fe95d9e1ce5f93ebf122d3',
349339

350340
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
351341
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -354,7 +344,7 @@ deps = {
354344
Var('dart_git') + '/external/github.com/simolus3/tar.git@13479f7c2a18f499e840ad470cfcca8c579f6909',
355345

356346
'engine/src/flutter/third_party/dart/third_party/pkg/test':
357-
Var('dart_git') + '/test.git@f95c0f5c10fa9af35014117cb00ec17d2a117265',
347+
Var('dart_git') + '/test.git@bcc5228370ba909e5774441398b8585ba9874423',
358348

359349
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
360350
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -375,7 +365,7 @@ deps = {
375365
Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
376366

377367
'engine/src/flutter/third_party/dart/tools/sdks/dart-sdk':
378-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:782552bdddc112c62db28ec7e9b2763f4457a3ea'}]},
368+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/dart-sdk/${{platform}}', 'version': 'git_revision:9ac06cdd18015c83a25921e26912c96e3fbe22c2'}]},
379369

380370
# WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
381371

@@ -487,22 +477,19 @@ deps = {
487477
Var('chromium_git') + '/external/github.com/libexpat/libexpat.git' + '@' + '8e49998f003d693213b538ef765814c7d21abada',
488478

489479
'engine/src/flutter/third_party/freetype2':
490-
Var('flutter_git') + '/third_party/freetype2' + '@' + 'bfc3453fdc85d87b45c896f68bf2e49ebdaeef0a',
480+
Var('flutter_git') + '/third_party/freetype2' + '@' + 'be4bcb57914154fc1b9e2900bf8e4b516057e2b8',
491481

492482
'engine/src/flutter/third_party/skia':
493483
Var('skia_git') + '/skia.git' + '@' + Var('skia_revision'),
494484

495485
'engine/src/flutter/third_party/ocmock':
496486
Var('flutter_git') + '/third_party/ocmock' + '@' + Var('ocmock_rev'),
497487

498-
'engine/src/flutter/third_party/updater':
499-
Var('updater_git') + '@' + Var('updater_rev'),
500-
501488
'engine/src/flutter/third_party/libjpeg-turbo/src':
502489
Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
503490

504491
'engine/src/flutter/third_party/libpng':
505-
Var('flutter_git') + '/third_party/libpng' + '@' + 'f139fd5d80944f5453b079672e50f32ca98ef076',
492+
Var('flutter_git') + '/third_party/libpng' + '@' + 'b6004397d2ab98f0250376d9b357337b7f422d13',
506493

507494
'engine/src/flutter/third_party/libwebp':
508495
Var('chromium_git') + '/webm/libwebp.git' + '@' + 'ca332209cb5567c9b249c86788cb2dbf8847e760', # 1.3.2
@@ -511,7 +498,7 @@ deps = {
511498
Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
512499

513500
'engine/src/flutter/third_party/zlib':
514-
Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df',
501+
Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7eda07b1e067ef3fd7eea0419c88b5af45c9a776',
515502

516503
'engine/src/flutter/third_party/cpu_features/src':
517504
Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e',
@@ -532,7 +519,7 @@ deps = {
532519
Var('swiftshader_git') + '/SwiftShader.git' + '@' + '794b0cfce1d828d187637e6d932bae484fbe0976',
533520

534521
'engine/src/flutter/third_party/angle':
535-
Var('flutter_git') + '/third_party/angle' + '@' + '6950c6c99fa1a2d653922871ede6679d74840289',
522+
Var('flutter_git') + '/third_party/angle' + '@' + '84027aca9b71c9ba335bd000dad1107b8810a511',
536523

537524
'engine/src/flutter/third_party/vulkan_memory_allocator':
538525
Var('chromium_git') + '/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator' + '@' + 'c788c52156f3ef7bc7ab769cb03c110a53ac8fcb',
@@ -572,7 +559,7 @@ deps = {
572559
Var('dart_git') + '/external/github.com/google/vector_math.dart.git' + '@' + '0a5fd95449083d404df9768bc1b321b88a7d2eef', # 2.1.0
573560

574561
'engine/src/flutter/third_party/imgui':
575-
Var('flutter_git') + '/third_party/imgui.git' + '@' + '3ea0fad204e994d669f79ed29dcaf61cd5cb571d',
562+
Var('flutter_git') + '/third_party/imgui.git' + '@' + '2a1b69f05748ad909f03acf4533447cac1331611',
576563

577564
'engine/src/flutter/third_party/json':
578565
Var('flutter_git') + '/third_party/json.git' + '@' + '17d9eacd248f58b73f4d1be518ef649fe2295642',
@@ -781,7 +768,7 @@ deps = {
781768
'packages': [
782769
{
783770
'package': 'flutter_internal/rbe/reclient_cfgs',
784-
'version': 'LNMZdvF2Y86Dq05IWthtVJ_PswIFSRiywIHrkfHhelUC',
771+
'version': '0vARzGeIZgIhW7zVfWuqIPQ_HXMLDccjAstykWZKjaEC',
785772
}
786773
],
787774
'condition': 'use_rbe',
@@ -817,7 +804,7 @@ deps = {
817804
'packages': [
818805
{
819806
'package': 'fuchsia/sdk/core/linux-amd64',
820-
'version': 'rxeg-6UB678HKJ4UQLCcLXWIpyiqp3-AZhNclbbePEkC'
807+
'version': 'pDXMXRIjEHTw7B0skTRDSpKChNTGz9I7h61kTq_jD64C'
821808
}
822809
],
823810
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',
@@ -854,7 +841,10 @@ deps = {
854841
}
855842
],
856843
'dep_type': 'cipd',
857-
}
844+
},
845+
846+
'engine/src/flutter/third_party/updater':
847+
Var('updater_git') + '@' + Var('updater_rev'),
858848
}
859849

860850
recursedeps = [

0 commit comments

Comments
 (0)