From 05c7980fff31c98e1a59d76137ee2bab7c7b86b6 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Tue, 14 Jul 2020 08:40:34 +0000 Subject: [PATCH] update async in the sdk, add flutter engine patch Change-Id: I17e088df3024992c4ea19a6dc2bcd63ba0dbb11b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/153620 Reviewed-by: William Hesse Auto-Submit: Jake Macdonald --- .dart_tool/package_config.json | 4 ++-- DEPS | 2 +- .../fecc8163afc76f6accd461d59a7eb82fe4215d61.patch | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 tools/patches/flutter-engine/fecc8163afc76f6accd461d59a7eb82fe4215d61.patch diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 06b673aa9b0..8b1dba48e0b 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -72,7 +72,7 @@ "name": "async", "rootUri": "../third_party/pkg/async", "packageUri": "lib/", - "languageVersion": "2.2" + "languageVersion": "2.9" }, { "name": "async_helper", @@ -713,4 +713,4 @@ "languageVersion": "2.4" } ] -} \ No newline at end of file +} diff --git a/DEPS b/DEPS index deb01f2b559..9614afddda8 100644 --- a/DEPS +++ b/DEPS @@ -66,7 +66,7 @@ vars = { # Revisions of /third_party/* dependencies. "args_tag": "1.6.0", - "async_rev": "e0c41e0c1fb70ba606dc81335c981af7c00987c6", + "async_rev": "5a4373458bfc902e4a4064427c619c2b41783f0d", "bazel_worker_rev": "26680d5e249b249c7216ab2fed0ac8ed4ee285c5", "benchmark_harness_rev": "a9d5fe44b1cb5527101fb4597b38b3c8b7c04ea8", "boolean_selector_rev": "1309eabed510cc3b7536fd4367d39b97ebee3d69", diff --git a/tools/patches/flutter-engine/fecc8163afc76f6accd461d59a7eb82fe4215d61.patch b/tools/patches/flutter-engine/fecc8163afc76f6accd461d59a7eb82fe4215d61.patch new file mode 100644 index 00000000000..2de0d9bc555 --- /dev/null +++ b/tools/patches/flutter-engine/fecc8163afc76f6accd461d59a7eb82fe4215d61.patch @@ -0,0 +1,13 @@ +diff --git a/DEPS b/DEPS +index a4ee1ba7e..862c7d8f7 100644 +--- a/DEPS ++++ b/DEPS +@@ -170,7 +170,7 @@ deps = { + Var('dart_git') + '/args.git' + '@' + Var('dart_args_tag'), + + 'src/third_party/dart/third_party/pkg/async': +- Var('dart_git') + '/async.git@e0c41e0c1fb70ba606dc81335c981af7c00987c6', ++ Var('dart_git') + '/async.git@5a4373458bfc902e4a4064427c619c2b41783f0d', + + 'src/third_party/dart/third_party/pkg/bazel_worker': + Var('dart_git') + '/bazel_worker.git@26680d5e249b249c7216ab2fed0ac8ed4ee285c5',