From dd9b7675deb18afaab15a057dad3cd2a2f3b6f3c Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Mon, 16 Apr 2018 21:50:11 -0700 Subject: [PATCH] Revert "Roll Dart to fe606f890b0a311da802c78b0af414a3c2087a79" (flutter/engine#5023) This reverts commit 2983a1b6130a10aadb0f64a6ff411890a794c92f. --- DEPS | 10 +++++++--- .../flutter/flutter_kernel_transformers/pubspec.yaml | 2 ++ engine/src/flutter/frontend_server/pubspec.yaml | 3 +++ engine/src/flutter/tools/licenses/pubspec.lock | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 5eb80d20a03..b76d2686855 100644 --- a/DEPS +++ b/DEPS @@ -31,7 +31,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': 'fe606f890b0a311da802c78b0af414a3c2087a79', + 'dart_revision': 'f76dad0adcf6766d73351354da653d6a793b5abc', 'dart_args_tag': '1.4.1', 'dart_async_tag': '2.0.6', @@ -58,6 +58,7 @@ vars = { 'dart_http_tag': '0.11.3+16', 'dart_http_throttle_tag': '1.0.1', 'dart_intl_tag': '0.15.2', + 'dart_isolate_tag': '1.1.0', 'dart_json_rpc_2_tag': '2.0.6', 'dart_linter_tag': '0.1.47', 'dart_logging_tag': '0.11.3+1', @@ -75,7 +76,7 @@ vars = { 'dart_pool_tag': '1.3.4', 'dart_protobuf_tag': '0.7.1', 'dart_pub_rev': '4947e0b3cb3ec77e4e8fe0d3141ce4dc60f43256', - 'dart_pub_semver_tag': '1.3.7', + 'dart_pub_semver_tag': '1.3.6', 'dart_quiver_tag': '5aaa3f58c48608af5b027444d561270b53f15dbf', 'dart_resource_rev': 'af5a5bf65511943398146cf146e466e5f0b95cb9', 'dart_root_certificates_rev': '16ef64be64c7dfdff2b9f4b910726e635ccc519e', @@ -114,7 +115,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '66676c9960264c96d1b424264a5966f8e2b40153', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '3cf97e01cdbd4bb920fa3d40282a56c4b2d62a58', # Fuchsia compatibility # @@ -208,6 +209,9 @@ deps = { 'src/third_party/dart/third_party/pkg/dartdoc': Var('dart_git') + '/dartdoc.git' + '@' + Var('dart_dartdoc_tag'), + 'src/third_party/dart/third_party/pkg/isolate': + Var('dart_git') + '/isolate.git' + '@' + Var('dart_isolate_tag'), + 'src/third_party/dart/third_party/pkg/json_rpc_2': Var('dart_git') + '/json_rpc_2.git' + '@' + Var('dart_json_rpc_2_tag'), diff --git a/engine/src/flutter/flutter_kernel_transformers/pubspec.yaml b/engine/src/flutter/flutter_kernel_transformers/pubspec.yaml index 0ef451c2cc9..87d617b7afb 100644 --- a/engine/src/flutter/flutter_kernel_transformers/pubspec.yaml +++ b/engine/src/flutter/flutter_kernel_transformers/pubspec.yaml @@ -68,6 +68,8 @@ dependency_overrides: path: ../../third_party/dart/third_party/pkg/http_multi_server http_parser: path: ../../third_party/dart/third_party/pkg/http_parser + isolate: + path: ../../third_party/dart/third_party/pkg/isolate matcher: path: ../../third_party/dart/third_party/pkg/matcher mime: diff --git a/engine/src/flutter/frontend_server/pubspec.yaml b/engine/src/flutter/frontend_server/pubspec.yaml index bb33fa85093..f7b9ee17464 100644 --- a/engine/src/flutter/frontend_server/pubspec.yaml +++ b/engine/src/flutter/frontend_server/pubspec.yaml @@ -35,6 +35,7 @@ dev_dependencies: http: any http_multi_server: any http_parser: any + isolate: any matcher: any mime: any mockito: any @@ -116,6 +117,8 @@ dependency_overrides: path: ../../third_party/dart/third_party/pkg/http_multi_server http_parser: path: ../../third_party/dart/third_party/pkg/http_parser + isolate: + path: ../../third_party/dart/third_party/pkg/isolate matcher: path: ../../third_party/dart/third_party/pkg/matcher mime: diff --git a/engine/src/flutter/tools/licenses/pubspec.lock b/engine/src/flutter/tools/licenses/pubspec.lock index 59d4c41a73d..26c6f128265 100644 --- a/engine/src/flutter/tools/licenses/pubspec.lock +++ b/engine/src/flutter/tools/licenses/pubspec.lock @@ -58,4 +58,4 @@ packages: source: hosted version: "1.1.5" sdks: - dart: ">=1.21.0 <=2.0.0-dev.47.0" + dart: ">=1.21.0 <=2.0.0-edge.af1436931b93e755d38223c487d33a0a1f5eadf5"