From a40cc7bb46bbc40d1c9e0656a203a02f37f9fc06 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 3 Oct 2017 18:35:07 -0700 Subject: [PATCH] Revert "Roll Dart to 4b64a835b9c10480063739d1e73847dcc4d8bfb6. (#4166)" (#4172) This reverts commit 0d2f0cb64819f7669b6134994a4ba6d7211480fa. Attempting to roll into the framework causes analysis errors with mock classes implementing HTTP-related classes previously in dart:io: [error] Classes can only implement other classes. (packages/flutter_tools/test/base/net_test.dart, line 94, col 41) [error] Classes can only implement other classes. (packages/flutter_tools/test/base/net_test.dart, line 62, col 33) [error] Classes can only implement other classes. (packages/flutter_tools/test/base/net_test.dart, line 78, col 40) [error] Classes can only implement other classes. (packages/flutter_tools/test/src/context.dart, line 249, col 46) and dartdoc failures: dartdoc:stdout: [error] Target of URI doesn't exist: 'dart:_http'. at /home/travis/build/flutter/flutter/bin/cache/pkg/sky_engine/lib/io/io.dart, line 206. --- DEPS | 64 ++++++++++++++-------------- travis/licenses_golden/licenses_dart | 25 ++++++----- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/DEPS b/DEPS index 2ae5888b97e..7a90923337e 100644 --- a/DEPS +++ b/DEPS @@ -31,71 +31,71 @@ 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': '4b64a835b9c10480063739d1e73847dcc4d8bfb6', + '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 diff --git a/travis/licenses_golden/licenses_dart b/travis/licenses_golden/licenses_dart index 48dbedd606c..21e6e5ff92a 100644 --- a/travis/licenses_golden/licenses_dart +++ b/travis/licenses_golden/licenses_dart @@ -1,4 +1,4 @@ -Signature: 166a4d00849da38c6ac848b0c0a1d9dc +Signature: 65303da5f9417d807edf8cdd345f5596 UNUSED LICENSES: @@ -404,13 +404,6 @@ FILE: ../../../dart/runtime/vm/weak_table.cc FILE: ../../../dart/runtime/vm/weak_table.h FILE: ../../../dart/sdk/lib/_chrome/dart2js/chrome_dart2js.dart FILE: ../../../dart/sdk/lib/_chrome/dart2js/chrome_dart2js.dart -FILE: ../../../dart/sdk/lib/_http/http.dart -FILE: ../../../dart/sdk/lib/_http/http_headers.dart -FILE: ../../../dart/sdk/lib/_http/http_impl.dart -FILE: ../../../dart/sdk/lib/_http/http_parser.dart -FILE: ../../../dart/sdk/lib/_http/http_session.dart -FILE: ../../../dart/sdk/lib/_http/websocket.dart -FILE: ../../../dart/sdk/lib/_http/websocket_impl.dart FILE: ../../../dart/sdk/lib/_internal/js_runtime/lib/annotations.dart FILE: ../../../dart/sdk/lib/_internal/js_runtime/lib/collection_patch.dart FILE: ../../../dart/sdk/lib/_internal/js_runtime/lib/convert_patch.dart @@ -462,6 +455,11 @@ FILE: ../../../dart/sdk/lib/io/data_transformer.dart FILE: ../../../dart/sdk/lib/io/file.dart FILE: ../../../dart/sdk/lib/io/file_impl.dart FILE: ../../../dart/sdk/lib/io/file_system_entity.dart +FILE: ../../../dart/sdk/lib/io/http.dart +FILE: ../../../dart/sdk/lib/io/http_headers.dart +FILE: ../../../dart/sdk/lib/io/http_impl.dart +FILE: ../../../dart/sdk/lib/io/http_parser.dart +FILE: ../../../dart/sdk/lib/io/http_session.dart FILE: ../../../dart/sdk/lib/io/io_service.dart FILE: ../../../dart/sdk/lib/io/io_sink.dart FILE: ../../../dart/sdk/lib/io/link.dart @@ -469,6 +467,8 @@ FILE: ../../../dart/sdk/lib/io/secure_socket.dart FILE: ../../../dart/sdk/lib/io/socket.dart FILE: ../../../dart/sdk/lib/io/stdio.dart FILE: ../../../dart/sdk/lib/io/string_transformer.dart +FILE: ../../../dart/sdk/lib/io/websocket.dart +FILE: ../../../dart/sdk/lib/io/websocket_impl.dart FILE: ../../../dart/sdk/lib/js/dart2js/js_dart2js.dart FILE: ../../../dart/sdk/lib/math/jenkins_smi_hash.dart FILE: ../../../dart/sdk/lib/math/point.dart @@ -1096,8 +1096,6 @@ FILE: ../../../dart/samples/sample_extension/sample_synchronous_extension.dart FILE: ../../../dart/samples/sample_extension/test_sample_asynchronous_extension.dart FILE: ../../../dart/samples/sample_extension/test_sample_synchronous_extension.dart FILE: ../../../dart/samples/samples.status -FILE: ../../../dart/sdk/lib/_http/crypto.dart -FILE: ../../../dart/sdk/lib/_http/http_date.dart FILE: ../../../dart/sdk/lib/_internal/js_runtime/lib/async_patch.dart FILE: ../../../dart/sdk/lib/_internal/js_runtime/lib/constant_map.dart FILE: ../../../dart/sdk/lib/_internal/js_runtime/lib/core_patch.dart @@ -1155,9 +1153,11 @@ FILE: ../../../dart/sdk/lib/html/html_common/metadata.dart FILE: ../../../dart/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart FILE: ../../../dart/sdk/lib/internal/internal.dart FILE: ../../../dart/sdk/lib/io/common.dart +FILE: ../../../dart/sdk/lib/io/crypto.dart FILE: ../../../dart/sdk/lib/io/directory.dart FILE: ../../../dart/sdk/lib/io/directory_impl.dart FILE: ../../../dart/sdk/lib/io/eventhandler.dart +FILE: ../../../dart/sdk/lib/io/http_date.dart FILE: ../../../dart/sdk/lib/io/io.dart FILE: ../../../dart/sdk/lib/io/platform.dart FILE: ../../../dart/sdk/lib/io/platform_impl.dart @@ -1964,6 +1964,7 @@ FILE: ../../../dart/third_party/observatory_pub_packages/packages/barback/exampl FILE: ../../../dart/third_party/observatory_pub_packages/packages/barback/example/aggregate_transformer/lib/recipes-grammas/winter-squash-pie-recipe.html FILE: ../../../dart/third_party/observatory_pub_packages/packages/barback/example/markdown_converter/lib/images/bison.jpg FILE: ../../../dart/third_party/observatory_pub_packages/packages/barback/example/markdown_converter/lib/index.markdown +FILE: ../../../dart/third_party/observatory_pub_packages/packages/csslib/.analysis_options FILE: ../../../dart/third_party/observatory_pub_packages/packages/csslib/.test_config FILE: ../../../dart/third_party/observatory_pub_packages/packages/csslib/example/call_parser.dart FILE: ../../../dart/third_party/observatory_pub_packages/packages/csslib/example/call_parser.html @@ -3105,10 +3106,13 @@ FILE: ../../../dart/third_party/observatory_pub_packages/packages/dart_style/.te FILE: ../../../dart/third_party/observatory_pub_packages/packages/dart_style/dist/dart-style.d.ts FILE: ../../../dart/third_party/observatory_pub_packages/packages/dart_style/web/index.html FILE: ../../../dart/third_party/observatory_pub_packages/packages/dart_style/web/main.dart +FILE: ../../../dart/third_party/observatory_pub_packages/packages/glob/.analysis_options FILE: ../../../dart/third_party/observatory_pub_packages/packages/glob/.test_config +FILE: ../../../dart/third_party/observatory_pub_packages/packages/matcher/.analysis_options FILE: ../../../dart/third_party/observatory_pub_packages/packages/matcher/.test_config FILE: ../../../dart/third_party/observatory_pub_packages/packages/path/.analysis_options FILE: ../../../dart/third_party/observatory_pub_packages/packages/path/.test_config +FILE: ../../../dart/third_party/observatory_pub_packages/packages/pool/.analysis_options FILE: ../../../dart/third_party/observatory_pub_packages/packages/pool/.test_config FILE: ../../../dart/third_party/observatory_pub_packages/packages/source_maps/.analysis_options FILE: ../../../dart/third_party/observatory_pub_packages/packages/source_maps/.test_config @@ -3444,6 +3448,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIBRARY: observatory_pub_packages ORIGIN: ../../../dart/third_party/observatory_pub_packages/packages/meta/LICENSE TYPE: LicenseType.bsd +FILE: ../../../dart/third_party/observatory_pub_packages/packages/meta/.packages FILE: ../../../dart/third_party/observatory_pub_packages/packages/observable/.analysis_options ---------------------------------------------------------------------------------------------------- Copyright 2016, the Dart project authors. All rights reserved.