From 8c27e91cdc8950478010ee0b8073aa6adf0cb1d7 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Wed, 1 Dec 2021 16:06:12 -0800 Subject: [PATCH 1/2] Revert "Roll Dart SDK from 3a963ff14181 to 8bb2e56ec900 (4 revisions) (#30045)" This reverts commit c85a129b4732ec9b746ccbf22733c831c3907d16. --- DEPS | 4 ++-- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 252c7381b7712..7baede9bb704c 100644 --- a/DEPS +++ b/DEPS @@ -39,7 +39,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '8bb2e56ec900b90376dacd103499d1f3acf09c9d', + 'dart_revision': '3a963ff14181c5d1bdc08a6e3a795879a0a97728', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -52,7 +52,7 @@ vars = { 'dart_intl_tag': '0.17.0-nullsafety', 'dart_linter_tag': '1.15.0', 'dart_protobuf_rev': 'c1eb6cb51af39ccbaa1a8e19349546586a5c8e31', - 'dart_pub_rev': 'b9edfa5e288ea3d1a57d1db054ef844ae7b27d99', + 'dart_pub_rev': '96404e0749864c9fbf8b12e1d424e8078809e00a', 'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50', 'dart_shelf_proxy_tag': 'v1.0.0', 'dart_shelf_static_rev': '202ec1a53c9a830c17cf3b718d089cf7eba568ad', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index f8126f12a17a2..f503464283186 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 6e34072f232f939890e6e64792a656d7 +Signature: 3cc11d51383dc3d5de103a9649144fac UNUSED LICENSES: From cd24afddfdb47ea95bbc0f2e615c4a6a1c1d44e5 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Wed, 1 Dec 2021 16:06:38 -0800 Subject: [PATCH 2/2] Revert "Roll Dart SDK from 9f61c2487bbd to 3a963ff14181 (7 revisions) (#30011)" This reverts commit 9b200e156d338e4c02e647b700d464c2c94dddc9. --- DEPS | 6 +++--- ci/licenses_golden/licenses_third_party | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index 7baede9bb704c..44bd888c60da7 100644 --- a/DEPS +++ b/DEPS @@ -39,7 +39,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '3a963ff14181c5d1bdc08a6e3a795879a0a97728', + 'dart_revision': '9f61c2487bbd52f28d19bb7fc76f3b6fce7d040a', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -48,7 +48,7 @@ vars = { 'dart_browser_launcher_rev': 'c6cc1025d6901926cf022e144ba109677e3548f1', 'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3', 'dart_collection_rev': 'a4c941ab94044d118b2086a3f261c30377604127', - 'dart_devtools_rev': 'f2ede24a4ea666d4832d78b813c7d4e376aa77d0', + 'dart_devtools_rev': '3a2f570813200e6dee141f3e7a9edcae5f31c2e8', 'dart_intl_tag': '0.17.0-nullsafety', 'dart_linter_tag': '1.15.0', 'dart_protobuf_rev': 'c1eb6cb51af39ccbaa1a8e19349546586a5c8e31', @@ -170,7 +170,7 @@ deps = { # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py. 'src/third_party/dart/third_party/devtools': - {'packages': [{'version': 'git_revision:f2ede24a4ea666d4832d78b813c7d4e376aa77d0', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'}, + {'packages': [{'version': 'git_revision:3a2f570813200e6dee141f3e7a9edcae5f31c2e8', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'}, 'src/third_party/dart/third_party/pkg/args': Var('dart_git') + '/args.git@3b3f55766af13d895d2020ec001a28e8dc147f91', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index f503464283186..e66480bdab57d 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 3cc11d51383dc3d5de103a9649144fac +Signature: 6687862bd639dcf5eda6d323f19131d2 UNUSED LICENSES: @@ -9782,8 +9782,6 @@ FILE: ../../../third_party/dart/benchmarks/DartCLIStartup/dart2/DartCLIStartup.d FILE: ../../../third_party/dart/benchmarks/EventLoopLatencyRegexp/dart/EventLoopLatencyRegexp.dart FILE: ../../../third_party/dart/benchmarks/EventLoopLatencyRegexp/dart/regexp_benchmark.dart FILE: ../../../third_party/dart/benchmarks/EventLoopLatencyRegexp/dart2/regexp_benchmark.dart -FILE: ../../../third_party/dart/benchmarks/FfiAsTypedList/dart/FfiAsTypedList.dart -FILE: ../../../third_party/dart/benchmarks/FfiAsTypedList/dart2/FfiAsTypedList.dart FILE: ../../../third_party/dart/benchmarks/IsolateFibonacci/dart/IsolateFibonacci.dart FILE: ../../../third_party/dart/benchmarks/IsolateFibonacci/dart2/IsolateFibonacci.dart FILE: ../../../third_party/dart/benchmarks/MapLookup/dart/MapLookup.dart