From 765d7466089d9837cf06adff915bb70d3e0ae92f Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Wed, 5 Jun 2019 13:01:10 -0700 Subject: [PATCH] roll dart and update libraries files (flutter/engine#9201) --- DEPS | 4 +-- engine/src/flutter/web_sdk/libraries.json | 44 +++++++++++------------ engine/src/flutter/web_sdk/libraries.yaml | 44 +++++++++++------------ 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/DEPS b/DEPS index e0fb0c10404..6160be6636c 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': 'b080e7c97a879eb803c725621b3993cbe994d19d', + 'dart_revision': '9dcb026b264faf8be5e894dc227728fedb3fff33', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py @@ -60,7 +60,7 @@ vars = { 'dart_http_throttle_tag': '1.0.2', 'dart_intl_tag': '0.15.7', 'dart_json_rpc_2_tag': '2.0.9', - 'dart_linter_tag': '0.1.90', + 'dart_linter_tag': '0.1.91', 'dart_logging_tag': '0.11.3+2', 'dart_markdown_tag': '2.0.3', 'dart_matcher_tag': '0.12.3', diff --git a/engine/src/flutter/web_sdk/libraries.json b/engine/src/flutter/web_sdk/libraries.json index d9f69eb6eae..7b956ff61d3 100644 --- a/engine/src/flutter/web_sdk/libraries.json +++ b/engine/src/flutter/web_sdk/libraries.json @@ -125,30 +125,30 @@ "dartdevc": { "libraries": { "async": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart", "uri": "../../../third_party/dart/sdk/lib/async/async.dart" }, "_runtime": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart" }, "_interceptors": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart" }, "mirrors": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/mirrors_patch.dart", "supported": false, "uri": "../../../third_party/dart/sdk/lib/mirrors/mirrors.dart" }, "_debugger": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart" }, "io": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart", "supported": false, "uri": "../../../third_party/dart/sdk/lib/io/io.dart" }, "_internal": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart", "uri": "../../../third_party/dart/sdk/lib/internal/internal.dart" }, "_metadata": { @@ -158,10 +158,10 @@ "uri": "../../../third_party/dart/sdk/lib/_http/http.dart" }, "_js_primitives": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart" }, "_js_helper": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart" }, "ui": { "uri": "lib/ui/ui.dart" @@ -170,30 +170,30 @@ "uri": "lib/_engine/engine.dart" }, "js": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js/dart2js/js_dart2js.dart" }, "_js_mirrors": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_mirrors.dart" }, "html_common": { "uri": "../../../third_party/dart/sdk/lib/html/html_common/html_common_dart2js.dart" }, "_native_typed_data": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart" }, "core": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart", "uri": "../../../third_party/dart/sdk/lib/core/core.dart" }, "js_util": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js_util/dart2js/js_util_dart2js.dart" }, "collection": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart", "uri": "../../../third_party/dart/sdk/lib/collection/collection.dart" }, "typed_data": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart", "uri": "../../../third_party/dart/sdk/lib/typed_data/typed_data.dart" }, "web_audio": { @@ -203,11 +203,11 @@ "uri": "../../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart" }, "developer": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart", "uri": "../../../third_party/dart/sdk/lib/developer/developer.dart" }, "isolate": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart", "supported": false, "uri": "../../../third_party/dart/sdk/lib/isolate/isolate.dart" }, @@ -218,18 +218,18 @@ "uri": "../../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart" }, "convert": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart", "uri": "../../../third_party/dart/sdk/lib/convert/convert.dart" }, "_isolate_helper": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart" }, "math": { - "patches": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart", + "patches": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart", "uri": "../../../third_party/dart/sdk/lib/math/math.dart" }, "_foreign_helper": { - "uri": "../../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart" + "uri": "../../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart" }, "web_sql": { "uri": "../../../third_party/dart/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart" diff --git a/engine/src/flutter/web_sdk/libraries.yaml b/engine/src/flutter/web_sdk/libraries.yaml index 0cd58f155c5..bac5da63f2e 100644 --- a/engine/src/flutter/web_sdk/libraries.yaml +++ b/engine/src/flutter/web_sdk/libraries.yaml @@ -16,84 +16,84 @@ dartdevc: libraries: _runtime: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/ddc_runtime/runtime.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_runtime/runtime.dart" _debugger: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/debugger.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/debugger.dart" _foreign_helper: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/foreign_helper.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/foreign_helper.dart" _http: uri: "../../third_party/dart/sdk/lib/_http/http.dart" _interceptors: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/interceptors.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/interceptors.dart" _internal: uri: "../../third_party/dart/sdk/lib/internal/internal.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/internal_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/internal_patch.dart" _isolate_helper: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/isolate_helper.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/isolate_helper.dart" _js_helper: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_helper.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_helper.dart" _js_mirrors: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_mirrors.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_mirrors.dart" _js_primitives: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/js_primitives.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/js_primitives.dart" _metadata: uri: "../../third_party/dart/sdk/lib/html/html_common/metadata.dart" _native_typed_data: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/private/native_typed_data.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/private/native_typed_data.dart" async: uri: "../../third_party/dart/sdk/lib/async/async.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/async_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/async_patch.dart" collection: uri: "../../third_party/dart/sdk/lib/collection/collection.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/collection_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/collection_patch.dart" convert: uri: "../../third_party/dart/sdk/lib/convert/convert.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/convert_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/convert_patch.dart" core: uri: "../../third_party/dart/sdk/lib/core/core.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/core_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/core_patch.dart" developer: uri: "../../third_party/dart/sdk/lib/developer/developer.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/developer_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart" io: uri: "../../third_party/dart/sdk/lib/io/io.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/io_patch.dart" supported: false isolate: uri: "../../third_party/dart/sdk/lib/isolate/isolate.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/isolate_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/isolate_patch.dart" supported: false mirrors: uri: "../../third_party/dart/sdk/lib/mirrors/mirrors.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/mirrors_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/mirrors_patch.dart" supported: false math: uri: "../../third_party/dart/sdk/lib/math/math.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/math_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/math_patch.dart" typed_data: uri: "../../third_party/dart/sdk/lib/typed_data/typed_data.dart" - patches: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/patch/typed_data_patch.dart" + patches: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/patch/typed_data_patch.dart" html: uri: "../../third_party/dart/sdk/lib/html/dart2js/html_dart2js.dart" @@ -105,10 +105,10 @@ dartdevc: uri: "../../third_party/dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart" js: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js/dart2js/js_dart2js.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js/dart2js/js_dart2js.dart" js_util: - uri: "../../third_party/dart/pkg/dev_compiler/tool/input_sdk/lib/js_util/dart2js/js_util_dart2js.dart" + uri: "../../third_party/dart/sdk/lib/_internal/js_dev_runtime/lib/js_util/dart2js/js_util_dart2js.dart" svg: uri: "../../third_party/dart/sdk/lib/svg/dart2js/svg_dart2js.dart"