From 24a514311ea9a3945080537478978eaa4d4edd1b Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Tue, 27 Oct 2020 10:23:19 +0100 Subject: [PATCH 1/2] Add dart-lang/sdk's new package:clock dependency and update package:intl dependency This fixes the HH build. --- DEPS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 1104b2284ba00..4088a807289e1 100644 --- a/DEPS +++ b/DEPS @@ -45,7 +45,8 @@ vars = { 'dart_dart_style_tag': '1.3.8', 'dart_http_retry_tag': '0.1.1', 'dart_http_throttle_tag': '1.0.2', - 'dart_intl_tag': '0.16.1', + "dart_intl_tag": "0.17.0-nullsafety", + "dart_clock_rev": "a494269254ba978e7ef8f192c5f7fec3fc05b9d3", 'dart_linter_tag': '0.1.121', 'dart_oauth2_tag': '1.6.0', 'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760', @@ -179,6 +180,9 @@ deps = { 'src/third_party/dart/third_party/pkg/collection': Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'), + 'src/third_party/dart/third_party/pkg/clock': + Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'), + 'src/third_party/dart/third_party/pkg/convert': Var('dart_git') + '/convert.git@c1b01f832835d3d8a06b0b246a361c0eaab35d3c', From 848d1d25727b6081fba6c54b179eb204f3b3024d Mon Sep 17 00:00:00 2001 From: Martin Kustermann Date: Tue, 27 Oct 2020 11:05:30 +0100 Subject: [PATCH 2/2] revert intl upgrade --- DEPS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DEPS b/DEPS index 4088a807289e1..af32e56242c0d 100644 --- a/DEPS +++ b/DEPS @@ -41,12 +41,12 @@ vars = { 'dart_args_tag': '1.6.0', 'dart_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499', 'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce', + 'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3', 'dart_collection_rev': '60e6ee2228586980826b07ec1df633bd879f42ea', 'dart_dart_style_tag': '1.3.8', 'dart_http_retry_tag': '0.1.1', 'dart_http_throttle_tag': '1.0.2', - "dart_intl_tag": "0.17.0-nullsafety", - "dart_clock_rev": "a494269254ba978e7ef8f192c5f7fec3fc05b9d3", + 'dart_intl_tag': '0.16.1', 'dart_linter_tag': '0.1.121', 'dart_oauth2_tag': '1.6.0', 'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760', @@ -177,12 +177,12 @@ deps = { 'src/third_party/dart/third_party/pkg/cli_util': Var('dart_git') + '/cli_util.git@335ed165887d0ec97c2a09173ebf22dcf56a6c4e', - 'src/third_party/dart/third_party/pkg/collection': - Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'), - 'src/third_party/dart/third_party/pkg/clock': Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'), + 'src/third_party/dart/third_party/pkg/collection': + Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'), + 'src/third_party/dart/third_party/pkg/convert': Var('dart_git') + '/convert.git@c1b01f832835d3d8a06b0b246a361c0eaab35d3c',