From 14aab33edd199fe453cd01b9c8a05e9dc3c6679f Mon Sep 17 00:00:00 2001 From: gspencergoog Date: Fri, 29 Sep 2017 14:32:15 -0700 Subject: [PATCH] Revert engine Dart roll. (#4158) * Revert "Include _http into sky_engine libraries for analyzer (#4154)" This reverts commit b930f107c3d6648423c42ed10b54f36a92edcbc8. It is dependent upon the Dart roll, which breaks the engine. * Revert "Roll dart to ade37f931e90b0fdb8fe16d6bf6f089545da55b6 (#4151)" This reverts commit 6f1264fb3e11d25a26bc7c44246110ecb5159011. This Dart roll breaks the engine build on Travis. --- DEPS | 66 +++++++++++----------- sky/packages/sky_engine/BUILD.gn | 8 --- sky/packages/sky_engine/lib/_embedder.yaml | 1 - travis/licenses_golden/licenses_dart | 2 +- 4 files changed, 34 insertions(+), 43 deletions(-) diff --git a/DEPS b/DEPS index e8e0ac4afbe42..25fe3cd8969a5 100644 --- a/DEPS +++ b/DEPS @@ -31,73 +31,73 @@ 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': 'ade37f931e90b0fdb8fe16d6bf6f089545da55b6', + 'dart_revision': '3d21a46b726c24ded2d3cb3cce4f43aeed875dbc', 'dart_args_tag': '0.13.7', - 'dart_async_tag': '2.0.0', - 'dart_barback_tag': '0.15.2+12', + 'dart_async_tag': 'daf66909019d2aaec1721fc39d94ea648a9fdc1d', + 'dart_barback_tag': '0.15.2+11', 'dart_bazel_worker_tag': 'v0.1.4', 'dart_boolean_selector_tag': '1.0.2', 'dart_boringssl_gen_rev': '753224969dbe43dad29343146529727b5066c0f3', 'dart_boringssl_rev': 'd519bf6be0b447fb80fbc539d4bff4479b5482a2', 'dart_charcode_tag': 'v1.1.1', - 'dart_cli_util_tag': '0.1.2+1', + 'dart_cli_util_tag': '0.1.0', 'dart_collection_tag': '1.14.3', 'dart_convert_tag': '2.0.1', - 'dart_crypto_tag': '2.0.2+1', - 'dart_csslib_tag': '0.14.1', - 'dart_dart2js_info_tag': '0.5.5+1', + 'dart_crypto_tag': '2.0.2', + 'dart_csslib_tag': '0.13.3+1', + 'dart_dart2js_info_tag': '0.5.4+2', 'dart_dart_style_tag': '1.0.7', 'dart_dartdoc_tag': 'v0.13.0+3', 'dart_fixnum_tag': '0.10.5', - 'dart_glob_tag': '1.1.5', - 'dart_html_tag': '0.13.2', - 'dart_http_multi_server_tag': '2.0.4', + 'dart_glob_tag': '1.1.3', + 'dart_html_tag': '0.13.1', + 'dart_http_multi_server_tag': '2.0.3', 'dart_http_parser_tag': '3.1.1', 'dart_http_tag': '0.11.3+14', 'dart_http_throttle_tag': '1.0.1', - 'dart_intl_tag': '0.15.1', - 'dart_isolate_tag': '1.1.0', + 'dart_intl_tag': '0.14.0', + 'dart_isolate_tag': '1.0.0', 'dart_json_rpc_2_tag': '2.0.4', 'dart_linter_tag': '0.1.35', 'dart_logging_tag': '0.11.3+1', - 'dart_markdown_tag': '0.11.4', - 'dart_matcher_tag': '0.12.1+4', - 'dart_mime_rev': '367087506c0a8a746bd75c685487b01ffed7f1c5', + 'dart_markdown_tag': '0.11.3', + 'dart_matcher_tag': '0.12.1+3', + 'dart_mime_rev': '75890811d4af5af080351ba8a2853ad4c8df98dd', 'dart_mockito_tag': '2.0.2', 'dart_mustache4dart_tag': 'v1.1.0', - 'dart_oauth2_tag': '1.1.0', - 'dart_observatory_pub_packages_rev': '4c282bb240b68f407c8c7779a65c68eeb0139dc6', - 'dart_package_config_tag': '1.0.3', + 'dart_oauth2_tag': '1.0.2', + 'dart_observatory_pub_packages_rev': 'a4e392521c720d244cd63e067387195d78584b35', + 'dart_package_config_tag': '1.0.1', 'dart_package_resolver_tag': '1.0.2+1', - 'dart_path_tag': '1.4.2', + 'dart_path_tag': '1.4.1', 'dart_plugin_tag': '0.2.0', - 'dart_pool_tag': '1.3.3', + 'dart_pool_tag': '1.3.0', 'dart_protobuf_tag': '0.5.4', - 'dart_pub_rev': 'cde958f157d3662bf968bcbed05580d5c0355e89', + 'dart_pub_rev': '0f122625f8e607842afe156b9b23a9709e4ce39a', 'dart_pub_semver_tag': '1.3.2', - 'dart_quiver_tag': '0.25.0', - 'dart_resource_rev': 'af5a5bf65511943398146cf146e466e5f0b95cb9', + 'dart_quiver_tag': '0.22.0', + 'dart_resource_rev': 'a49101ba2deb29c728acba6fb86000a8f730f4b1', 'dart_root_certificates_rev': 'a4c7c6f23a664a37bc1b6f15a819e3f2a292791a', - 'dart_shelf_packages_handler_tag': '1.0.3', - 'dart_shelf_static_tag': '0.2.5', - 'dart_shelf_tag': '0.6.8', + 'dart_shelf_packages_handler_tag': '1.0.0', + 'dart_shelf_static_tag': '0.2.4', + 'dart_shelf_tag': '0.6.7+2', 'dart_shelf_web_socket_tag': '0.2.1', 'dart_source_map_stack_trace_tag': '1.1.4', 'dart_source_maps_tag': '0.10.4', 'dart_source_span_tag': '1.4.0', - 'dart_stack_trace_tag': '1.8.2', - 'dart_stream_channel_tag': '1.6.2', - 'dart_string_scanner_tag': '1.0.2', - 'dart_test_tag': '0.12.24+6', + 'dart_stack_trace_tag': '1.7.2', + 'dart_stream_channel_tag': '1.6.1', + 'dart_string_scanner_tag': '1.0.1', + 'dart_test_tag': '0.12.24+2', 'dart_tuple_tag': 'v1.0.1', 'dart_typed_data_tag': '1.1.3', 'dart_usage_tag': '3.3.0', 'dart_utf_tag': '0.9.0+3', - 'dart_watcher_tag': '0.9.7+4', - 'dart_web_socket_channel_tag': '1.0.6', + 'dart_watcher_tag': '0.9.7+3', + 'dart_web_socket_channel_tag': '1.0.4', 'dart_yaml_tag': '2.1.12', - + # Build bot tooling for iOS 'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f', diff --git a/sky/packages/sky_engine/BUILD.gn b/sky/packages/sky_engine/BUILD.gn index 2243e0f99cad6..1d7f545aee03d 100644 --- a/sky/packages/sky_engine/BUILD.gn +++ b/sky/packages/sky_engine/BUILD.gn @@ -7,7 +7,6 @@ import("//dart/sdk/lib/collection/collection_sources.gni") import("//dart/sdk/lib/convert/convert_sources.gni") import("//dart/sdk/lib/core/core_sources.gni") import("//dart/sdk/lib/developer/developer_sources.gni") -import("//dart/sdk/lib/_http/http_sources.gni") import("//dart/sdk/lib/internal/internal_sources.gni") import("//dart/sdk/lib/io/io_sources.gni") import("//dart/sdk/lib/isolate/isolate_sources.gni") @@ -65,12 +64,6 @@ copy("developer") { outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/developer/{{source_file_part}}" ] } -copy("_http") { - lib_path = rebase_path("_http", "", dart_sdk_lib_path) - sources = rebase_path(http_sdk_sources, "", lib_path) - outputs = [ "$root_gen_dir/dart-pkg/sky_engine/lib/_http/{{source_file_part}}" ] -} - copy("internal") { lib_path = rebase_path("internal", "", dart_sdk_lib_path) sources = rebase_path(internal_sdk_sources, "", lib_path) @@ -116,7 +109,6 @@ group("copy_dart_sdk") { ":convert", ":core", ":developer", - ":_http", ":internal", ":io", ":isolate", diff --git a/sky/packages/sky_engine/lib/_embedder.yaml b/sky/packages/sky_engine/lib/_embedder.yaml index 3110ae482a974..ed8853518eb01 100644 --- a/sky/packages/sky_engine/lib/_embedder.yaml +++ b/sky/packages/sky_engine/lib/_embedder.yaml @@ -13,7 +13,6 @@ embedded_libs: # API, e.g. List being Iterable by virtue of implementing # EfficientLengthIterable. # Not including this library yields analysis errors. - "dart:_http": "_http/http.dart" "dart:_internal": "internal/internal.dart" "dart:nativewrappers": "_empty.dart" diff --git a/travis/licenses_golden/licenses_dart b/travis/licenses_golden/licenses_dart index 7fcf798f89678..21e6e5ff92a0e 100644 --- a/travis/licenses_golden/licenses_dart +++ b/travis/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: 2621886fcf617de655d20f9a6b37e8c3 +Signature: 65303da5f9417d807edf8cdd345f5596 UNUSED LICENSES: