From 75851f085d92ccfc1346ec9d74b4d40864e423b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Crelier?= Date: Mon, 16 Apr 2018 17:25:39 -0700 Subject: [PATCH] Roll Dart to fe606f890b0a311da802c78b0af414a3c2087a79 (#5020) --- DEPS | 10 +++------- flutter_kernel_transformers/pubspec.yaml | 2 -- frontend_server/pubspec.yaml | 3 --- tools/licenses/pubspec.lock | 2 +- travis/licenses_golden/licenses_third_party | 4 +++- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/DEPS b/DEPS index b76d268685531..5eb80d20a03ad 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': 'f76dad0adcf6766d73351354da653d6a793b5abc', + 'dart_revision': 'fe606f890b0a311da802c78b0af414a3c2087a79', 'dart_args_tag': '1.4.1', 'dart_async_tag': '2.0.6', @@ -58,7 +58,6 @@ 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', @@ -76,7 +75,7 @@ vars = { 'dart_pool_tag': '1.3.4', 'dart_protobuf_tag': '0.7.1', 'dart_pub_rev': '4947e0b3cb3ec77e4e8fe0d3141ce4dc60f43256', - 'dart_pub_semver_tag': '1.3.6', + 'dart_pub_semver_tag': '1.3.7', 'dart_quiver_tag': '5aaa3f58c48608af5b027444d561270b53f15dbf', 'dart_resource_rev': 'af5a5bf65511943398146cf146e466e5f0b95cb9', 'dart_root_certificates_rev': '16ef64be64c7dfdff2b9f4b910726e635ccc519e', @@ -115,7 +114,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + '3cf97e01cdbd4bb920fa3d40282a56c4b2d62a58', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '66676c9960264c96d1b424264a5966f8e2b40153', # Fuchsia compatibility # @@ -209,9 +208,6 @@ 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/flutter_kernel_transformers/pubspec.yaml b/flutter_kernel_transformers/pubspec.yaml index 87d617b7afb46..0ef451c2cc92a 100644 --- a/flutter_kernel_transformers/pubspec.yaml +++ b/flutter_kernel_transformers/pubspec.yaml @@ -68,8 +68,6 @@ 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/frontend_server/pubspec.yaml b/frontend_server/pubspec.yaml index f7b9ee1746406..bb33fa85093f2 100644 --- a/frontend_server/pubspec.yaml +++ b/frontend_server/pubspec.yaml @@ -35,7 +35,6 @@ dev_dependencies: http: any http_multi_server: any http_parser: any - isolate: any matcher: any mime: any mockito: any @@ -117,8 +116,6 @@ 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/tools/licenses/pubspec.lock b/tools/licenses/pubspec.lock index 26c6f128265d0..59d4c41a73ddd 100644 --- a/tools/licenses/pubspec.lock +++ b/tools/licenses/pubspec.lock @@ -58,4 +58,4 @@ packages: source: hosted version: "1.1.5" sdks: - dart: ">=1.21.0 <=2.0.0-edge.af1436931b93e755d38223c487d33a0a1f5eadf5" + dart: ">=1.21.0 <=2.0.0-dev.47.0" diff --git a/travis/licenses_golden/licenses_third_party b/travis/licenses_golden/licenses_third_party index c7a001683cbaf..ab98ca97dca3c 100644 --- a/travis/licenses_golden/licenses_third_party +++ b/travis/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 11eed2d794a665c2ed961ab41d6006b7 +Signature: bb4a430cb851bf486943c666ca3c37e9 UNUSED LICENSES: @@ -6069,6 +6069,8 @@ FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.cc FILE: ../../../third_party/dart/runtime/vm/compiler/compiler_pass.h FILE: ../../../third_party/dart/runtime/vm/datastream.cc FILE: ../../../third_party/dart/runtime/vm/finalizable_data.h +FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs.cc +FILE: ../../../third_party/dart/runtime/vm/type_testing_stubs.h FILE: ../../../third_party/dart/sdk/lib/js/_js.dart FILE: ../../../third_party/dart/sdk/lib/js/_js_client.dart FILE: ../../../third_party/dart/sdk/lib/js/_js_server.dart