Skip to content

Commit

Permalink
Revert "Roll Dart to fe606f8" (flutter#5023)
Browse files Browse the repository at this point in the history
This reverts commit 75851f0.
  • Loading branch information
tvolkert authored Apr 17, 2018
1 parent 4b45a53 commit cf6ca32
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
10 changes: 7 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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
#
Expand Down Expand Up @@ -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'),

Expand Down
2 changes: 2 additions & 0 deletions flutter_kernel_transformers/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions frontend_server/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dev_dependencies:
http: any
http_multi_server: any
http_parser: any
isolate: any
matcher: any
mime: any
mockito: any
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tools/licenses/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 1 addition & 3 deletions travis/licenses_golden/licenses_third_party
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Signature: bb4a430cb851bf486943c666ca3c37e9
Signature: 11eed2d794a665c2ed961ab41d6006b7

UNUSED LICENSES:

Expand Down Expand Up @@ -6069,8 +6069,6 @@ 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
Expand Down

0 comments on commit cf6ca32

Please sign in to comment.