From 9c214be26a8d225a21d230878459380f7f0f0596 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Sat, 8 May 2021 14:17:00 -0700 Subject: [PATCH 1/5] Revert "Roll Dart SDK from 094c9024373c to 2ea89ef8f6de (1 revision) (#26030)" This reverts commit 0d62a560fe6a6d8420e812a563707d3ed5ef6f0e. --- DEPS | 6 +++--- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 9f9eb8de54444..b573945ebd4c8 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '2ea89ef8f6de01860980ff31feffe8d56a60b4f2', + 'dart_revision': '094c9024373cd7eed440183cf623deb9682963e9', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -51,7 +51,7 @@ vars = { 'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7', 'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8', 'dart_shelf_proxy_tag': 'v1.0.0', - 'dart_shelf_static_rev': 'b8e51372332a27a4939466d94a22f15be53ac3e4', + 'dart_shelf_static_rev': 'fa30419055279a00c9e428439b1abe362d18f25d', 'dart_sse_tag': '5da8fedcdc56f306933d202e2d204753eecefd36', 'dart_stack_trace_tag': '6788afc61875079b71b3d1c3e65aeaa6a25cbc2f', 'dart_stream_channel_tag': 'd7251e61253ec389ee6e045ee1042311bced8f1d', @@ -268,7 +268,7 @@ deps = { Var('dart_git') + '/resource.git' + '@' + Var('dart_resource_rev'), 'src/third_party/dart/third_party/pkg/shelf': - Var('dart_git') + '/shelf.git@c511f06e6d2d28ffe905a45eea1da761b95ea0ca', + Var('dart_git') + '/shelf.git@4b9294e29eb308709444a5c0b890fa8ccd69fae4', 'src/third_party/dart/third_party/pkg/shelf_packages_handler': Var('dart_git') + '/shelf_packages_handler.git@78302e67c035047e6348e692b0c1182131f0fe35', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 083cd2712cc1e..92c3b633c0ac2 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: ef8dea0096af85cf7a7112d581c768cc +Signature: 72f547c2ea1a62b4c15d41bea1f2cd46 UNUSED LICENSES: From 4a5b52d6b9eed2b95f9b49fff8b269a6af6f2dde Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Sat, 8 May 2021 14:17:23 -0700 Subject: [PATCH 2/5] Revert "Roll Dart SDK from 04e55dad908d to 094c9024373c (1 revision) (#26027)" This reverts commit 06cbf1e0d773846e1d7cfad89d9aef4f3b43ecb3. --- DEPS | 4 ++-- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index b573945ebd4c8..e9341bf75d2c8 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '094c9024373cd7eed440183cf623deb9682963e9', + 'dart_revision': '04e55dad908d8a7dc2af170a6c4ff613329198ed', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -154,7 +154,7 @@ deps = { Var('dart_git') + '/args.git@d8fea36c10ef96797be02e3d132d572445cd86f4', 'src/third_party/dart/third_party/pkg/async': - Var('dart_git') + '/async.git@49464c342fe64c8632223ce3475364d163fb0623', + Var('dart_git') + '/async.git@cde00b89bd3c19e877b21de2c02282d4d311d0a5', 'src/third_party/dart/third_party/pkg/bazel_worker': Var('dart_git') + '/bazel_worker.git@0885637b037979afbf5bcd05fd748b309fd669c0', diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 92c3b633c0ac2..a7c548fa9c63a 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 72f547c2ea1a62b4c15d41bea1f2cd46 +Signature: 3b7e4efe98b5bbe51969d1d179bc8e3c UNUSED LICENSES: From e98b68f0d105951e1bfdae08469cf46f447e9886 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Sat, 8 May 2021 14:17:44 -0700 Subject: [PATCH 3/5] Revert "Roll Dart SDK from b4210cc43086 to 04e55dad908d (2 revisions) (#26020)" This reverts commit d1a11828b18da53b5fd4c3c176a1578df729a2d4. --- DEPS | 2 +- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index e9341bf75d2c8..7a00f48a7a154 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '04e55dad908d8a7dc2af170a6c4ff613329198ed', + 'dart_revision': 'b4210cc43086e68526369ef441f26ad91ee3446e', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index a7c548fa9c63a..9fd3c7cf5c7cb 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 3b7e4efe98b5bbe51969d1d179bc8e3c +Signature: dc3d2868e7a8929e8551f9264d01acd7 UNUSED LICENSES: From b6d73058758dd41fc88a8087a616f7e3b7a3d84a Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Sat, 8 May 2021 14:18:08 -0700 Subject: [PATCH 4/5] Revert "Roll Dart SDK from 86c749398b3a to b4210cc43086 (2 revisions) (#26006)" This reverts commit 3ffb8efcf682d742d167ffed29df0234f7e84f8d. --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 7a00f48a7a154..36c663c871a17 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': 'b4210cc43086e68526369ef441f26ad91ee3446e', + 'dart_revision': '86c749398b3ace9707030dbda522e2d02aa90d34', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py From 0a181d2ca8c5e7117263e6c3a6d9f04b942b8a81 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Sat, 8 May 2021 14:18:26 -0700 Subject: [PATCH 5/5] Revert "Roll Dart SDK from b8f4018535fa to 86c749398b3a (16 revisions) (#25999)" This reverts commit a712ffe25a1944333c6d7ef03997778ece63d764. --- DEPS | 8 ++++---- ci/licenses_golden/licenses_third_party | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 36c663c871a17..a7045e5680783 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '86c749398b3ace9707030dbda522e2d02aa90d34', + 'dart_revision': 'b8f4018535fa792891e2add3a475f35e3ec156ab', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -166,7 +166,7 @@ deps = { Var('dart_git') + '/charcode.git@bcd8a12c315b7a83390e4865ad847ecd9344cba2', 'src/third_party/dart/third_party/pkg/cli_util': - Var('dart_git') + '/cli_util.git@8a73cd7eca373ff71d290ccf47d4829e5ca44209', + Var('dart_git') + '/cli_util.git@fd1b716e8a350a454e01ae56df540293d31ff6c8', 'src/third_party/dart/third_party/pkg/clock': Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'), @@ -223,7 +223,7 @@ deps = { Var('dart_git') + '/intl.git' + '@' + Var('dart_intl_tag'), 'src/third_party/dart/third_party/pkg/json_rpc_2': - Var('dart_git') + '/json_rpc_2.git@7e00f893440a72de0637970325e4ea44bd1e8c8e', + Var('dart_git') + '/json_rpc_2.git@5ec32a2e0e99dedcef5b3237f93167cd22c2da50', 'src/third_party/dart/third_party/pkg/linter': Var('dart_git') + '/linter.git' + '@' + Var('dart_linter_tag'), @@ -334,7 +334,7 @@ deps = { Var('dart_git') + '/package_config.git@a84c0d45401f215fbe9384df923a38f4022a3c45', 'src/third_party/dart/tools/sdks': - {'packages': [{'version': 'version:2.13.0-211.14.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, + {'packages': [{'version': 'version:2.12.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'}, # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py. diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 9fd3c7cf5c7cb..eed239085c311 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: dc3d2868e7a8929e8551f9264d01acd7 +Signature: 0cd97bc3f34ac40583de63d2f282fdba UNUSED LICENSES: