Skip to content

Commit 503ba7c

Browse files
bkonyibkonyi
authored
Dart SDK roll for 2018/07/26 (flutter#5876)
1 parent 2c6fa0d commit 503ba7c

File tree

5 files changed

+243
-161
lines changed

5 files changed

+243
-161
lines changed

‎DEPS

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -31,73 +31,73 @@ vars = {
3131
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3232
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3333
# updated revision list of existing dependencies.
34-
'dart_revision': '937ee2e8ca4b76499e24cd463f07bfb736bccd74',
34+
'dart_revision': '9c69e7e1d29ecf349715ca2ddd437c9d0bbba0d7',
3535

36-
'dart_args_tag': '1.4.1',
37-
'dart_async_tag': '2.0.7',
36+
'dart_args_tag': '1.4.4',
37+
'dart_async_tag': '2.0.8',
3838
'dart_bazel_worker_tag': '0.1.11',
39-
'dart_boolean_selector_tag': '1.0.3',
39+
'dart_boolean_selector_tag': '1.0.4',
4040
'dart_boringssl_gen_rev': 'fc47eaa1a245d858bae462cd64d4155605b850ea',
4141
'dart_boringssl_rev': '189270cd190267f5bd60cfe8f8ce7a61d07ba6f4',
42-
'dart_charcode_tag': 'v1.1.1',
43-
'dart_cli_util_tag': '0.1.2+1',
44-
'dart_collection_tag': '1.14.10',
45-
'dart_convert_tag': '2.0.1',
46-
'dart_crypto_tag': '2.0.5',
47-
'dart_csslib_tag': '0.14.1',
42+
'dart_charcode_tag': 'v1.1.2',
43+
'dart_cli_util_rev': '4ad7ccbe3195fd2583b30f86a86697ef61e80f41',
44+
'dart_collection_tag': '1.14.11',
45+
'dart_convert_tag': '2.0.2',
46+
'dart_crypto_tag': '2.0.6',
47+
'dart_csslib_tag': '0.14.4+1',
4848
'dart_dart2js_info_tag': '0.5.6+4',
49-
'dart_dart_style_tag': '1.1.2',
50-
'dart_dartdoc_tag': 'v0.20.1',
51-
'dart_fixnum_tag': '0.10.5',
52-
'dart_glob_tag': '1.1.5',
53-
'dart_html_tag': '0.13.3',
54-
'dart_http_multi_server_tag': '2.0.4',
49+
'dart_dart_style_tag': '1.1.3',
50+
'dart_dartdoc_tag': 'v0.20.2',
51+
'dart_fixnum_tag': '0.10.8',
52+
'dart_glob_tag': '1.1.7',
53+
'dart_html_tag': '0.13.3+2',
54+
'dart_http_multi_server_tag': '2.0.5',
5555
'dart_http_parser_tag': '3.1.1',
5656
'dart_http_retry_tag': '0.1.1',
5757
'dart_http_tag': '0.11.3+17',
5858
'dart_http_throttle_tag': '1.0.2',
5959
'dart_intl_tag': '0.15.6',
60-
'dart_json_rpc_2_tag': '2.0.6',
61-
'dart_linter_tag': '0.1.56',
62-
'dart_logging_tag': '0.11.3+1',
63-
'dart_markdown_tag': '2.0.1',
60+
'dart_json_rpc_2_tag': '2.0.9',
61+
'dart_linter_tag': '0.1.58',
62+
'dart_logging_tag': '0.11.3+2',
63+
'dart_markdown_tag': '2.0.2',
6464
'dart_matcher_tag': '0.12.3',
65-
'dart_mime_tag': '0.9.6',
65+
'dart_mime_tag': '0.9.6+2',
6666
'dart_mockito_tag': 'd39ac507483b9891165e422ec98d9fb480037c8b',
6767
'dart_mustache4dart_tag': 'v2.1.2',
6868
'dart_oauth2_tag': '1.2.1',
69-
'dart_observatory_pub_packages_rev': 'caf0aecfb15077fc7a34d48e9df13606c793fddf',
70-
'dart_package_config_tag': '1.0.3',
71-
'dart_package_resolver_tag': '1.0.2+1',
72-
'dart_path_tag': '1.5.1',
73-
'dart_plugin_tag': '0.2.0+2',
74-
'dart_pool_tag': '1.3.4',
69+
'dart_observatory_pub_packages_rev': '0894122173b0f98eb08863a7712e78407d4477bc',
70+
'dart_package_config_tag': '1.0.5',
71+
'dart_package_resolver_tag': '1.0.4',
72+
'dart_path_tag': '1.6.2',
73+
'dart_plugin_tag': 'f5b4b0e32d1406d62daccea030ba6457d14b1c47',
74+
'dart_pool_tag': '1.3.6',
7575
'dart_protobuf_tag': '0.9.0',
7676
'dart_pub_rev': '58fe996eab8d54f28f5109c407ff0ab62fbd835d',
77-
'dart_pub_semver_tag': '1.4.1',
78-
'dart_quiver_tag': '0.29.0',
79-
'dart_resource_tag': '2.1.4',
77+
'dart_pub_semver_tag': '1.4.2',
78+
'dart_quiver_tag': '0.29.0+2',
79+
'dart_resource_rev': '2.1.5',
8080
'dart_root_certificates_rev': '16ef64be64c7dfdff2b9f4b910726e635ccc519e',
81-
'dart_shelf_packages_handler_tag': '1.0.3',
82-
'dart_shelf_static_rev': 'v0.2.7',
83-
'dart_shelf_tag': '0.7.3+2',
84-
'dart_shelf_web_socket_tag': '0.2.2',
85-
'dart_source_map_stack_trace_tag': '1.1.4',
86-
'dart_source_maps_tag': '0.10.6',
87-
'dart_source_span_tag': '1.4.0',
88-
'dart_stack_trace_tag': '1.9.2',
89-
'dart_stream_channel_tag': '1.6.4',
90-
'dart_string_scanner_tag': '1.0.2',
91-
'dart_term_glyph_tag': '1.0.0',
81+
'dart_shelf_packages_handler_tag': '1.0.4',
82+
'dart_shelf_static_rev': 'v0.2.8',
83+
'dart_shelf_tag': '0.7.3+3',
84+
'dart_shelf_web_socket_tag': '0.2.2+3',
85+
'dart_source_map_stack_trace_tag': '1.1.5',
86+
'dart_source_maps_tag': '8af7cc1a1c3a193c1fba5993ce22a546a319c40e',
87+
'dart_source_span_tag': '1.4.1',
88+
'dart_stack_trace_tag': '1.9.3',
89+
'dart_stream_channel_tag': '1.6.8',
90+
'dart_string_scanner_tag': '1.0.3',
91+
'dart_term_glyph_tag': '1.0.1',
92+
'dart_test_reflective_loader_tag': '0.1.4',
9293
'dart_test_tag': '1.0.0',
9394
'dart_tuple_tag': 'v1.0.1',
94-
'dart_typed_data_tag': '1.1.3',
95+
'dart_typed_data_tag': '1.1.6',
9596
'dart_usage_tag': '3.4.0',
96-
'dart_utf_tag': '0.9.0+4',
97-
'dart_watcher_tag': '0.9.7+8',
98-
'dart_web_socket_channel_tag': '1.0.7',
99-
'dart_yaml_tag': '2.1.14',
100-
97+
'dart_utf_tag': '0.9.0+5',
98+
'dart_watcher_rev': '0.9.7+10',
99+
'dart_web_socket_channel_tag': '1.0.9',
100+
'dart_yaml_tag': '2.1.15',
101101
# Build bot tooling for iOS
102102
'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f',
103103

@@ -185,7 +185,7 @@ deps = {
185185
Var('dart_git') + '/charcode.git' + '@' + Var('dart_charcode_tag'),
186186

187187
'src/third_party/dart/third_party/pkg/cli_util':
188-
Var('dart_git') + '/cli_util.git' + '@' + Var('dart_cli_util_tag'),
188+
Var('dart_git') + '/cli_util.git' + '@' + Var('dart_cli_util_rev'),
189189

190190
'src/third_party/dart/third_party/pkg/collection':
191191
Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_tag'),
@@ -284,7 +284,7 @@ deps = {
284284
Var('chromium_git') + '/external/github.com/google/quiver-dart' + '@' + Var('dart_quiver_tag'),
285285

286286
'src/third_party/dart/third_party/pkg/resource':
287-
Var('dart_git') + '/resource.git' + '@' + Var('dart_resource_tag'),
287+
Var('dart_git') + '/resource.git' + '@' + Var('dart_resource_rev'),
288288

289289
'src/third_party/dart/third_party/pkg/shelf':
290290
Var('dart_git') + '/shelf.git' + '@' + Var('dart_shelf_tag'),
@@ -338,7 +338,7 @@ deps = {
338338
Var('dart_git') + '/usage.git' + '@' + Var('dart_usage_tag'),
339339

340340
'src/third_party/dart/third_party/pkg/watcher':
341-
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_tag'),
341+
Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
342342

343343
'src/third_party/dart/third_party/pkg/web_socket_channel':
344344
Var('dart_git') + '/web_socket_channel.git' + '@' + Var('dart_web_socket_channel_tag'),

‎tools/licenses/lib/filesystem.dart

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ enum FileType {
2626
typedef Reader = List<int> Function();
2727

2828
class BytesOf extends Key { BytesOf(dynamic value) : super(value); }
29-
class UTF8Of extends Key { UTF8Of(dynamic value) : super(value); }
29+
class utf8Of extends Key { utf8Of(dynamic value) : super(value); }
3030
class Latin1Of extends Key { Latin1Of(dynamic value) : super(value); }
3131

3232
bool matchesSignature(List<int> bytes, List<int> signature) {
@@ -59,7 +59,7 @@ const String kMultiLicenseFileHeader = 'Notices for files contained in';
5959

6060
bool isMultiLicenseNotice(Reader reader) {
6161
List<int> bytes = reader();
62-
return (ASCII.decode(bytes.take(kMultiLicenseFileHeader.length).toList(), allowInvalid: true) == kMultiLicenseFileHeader);
62+
return (ascii.decode(bytes.take(kMultiLicenseFileHeader.length).toList(), allowInvalid: true) == kMultiLicenseFileHeader);
6363
}
6464

6565
FileType identifyFile(String name, Reader reader) {
@@ -114,7 +114,7 @@ FileType identifyFile(String name, Reader reader) {
114114
case 'tzdata': return FileType.binary;
115115
case 'compressed_atrace_data.txt': return FileType.binary;
116116
// Source files that don't use UTF-8
117-
case 'Messages_de_DE.properties': // has a few non-ASCII characters they forgot to escape (from gnu-libstdc++)
117+
case 'Messages_de_DE.properties': // has a few non-ascii characters they forgot to escape (from gnu-libstdc++)
118118
case 'mmx_blendtmp.h': // author name in comment contains latin1 (mesa)
119119
case 'calling_convention.txt': // contains a soft hyphen instead of a real hyphen for some reason (mesa)
120120
// Character encoding data files
@@ -310,11 +310,11 @@ abstract class TextFile extends File {
310310
}
311311

312312
// mixin
313-
abstract class UTF8TextFile extends TextFile {
313+
abstract class utf8TextFile extends TextFile {
314314
@override
315315
String readString() {
316316
try {
317-
return cache(new UTF8Of(this), () => UTF8.decode(readBytes()));
317+
return cache(new utf8Of(this), () => utf8.decode(readBytes()));
318318
} on FormatException {
319319
print(fullName);
320320
rethrow;
@@ -330,15 +330,15 @@ abstract class Latin1TextFile extends TextFile {
330330
final List<int> bytes = readBytes();
331331
if (bytes.any((int byte) => byte == 0x00))
332332
throw '$fullName contains a U+0000 NULL and is probably not actually encoded as Win1252';
333-
bool isUTF8 = false;
333+
bool isutf8 = false;
334334
try {
335-
cache(new UTF8Of(this), () => UTF8.decode(readBytes()));
336-
isUTF8 = true;
335+
cache(new utf8Of(this), () => utf8.decode(readBytes()));
336+
isutf8 = true;
337337
} on FormatException {
338338
}
339-
if (isUTF8)
339+
if (isutf8)
340340
throw '$fullName contains valid UTF-8 and is probably not actually encoded as Win1252';
341-
return LATIN1.decode(bytes);
341+
return latin1.decode(bytes);
342342
});
343343
}
344344
}
@@ -460,7 +460,7 @@ class FileSystemDirectory extends IoNode implements Directory {
460460
case FileType.tar: yield new FileSystemTarFile(fileEntity); break;
461461
case FileType.gz: yield new FileSystemGZipFile(fileEntity); break;
462462
case FileType.bzip2: yield new FileSystemBZip2File(fileEntity); break;
463-
case FileType.text: yield new FileSystemUTF8TextFile(fileEntity); break;
463+
case FileType.text: yield new FileSystemutf8TextFile(fileEntity); break;
464464
case FileType.latin1Text: yield new FileSystemLatin1TextFile(fileEntity); break;
465465
case FileType.metadata: break; // ignore this file
466466
}
@@ -499,8 +499,8 @@ class FileSystemFile extends IoNode implements File {
499499
}
500500
}
501501

502-
class FileSystemUTF8TextFile extends FileSystemFile with UTF8TextFile {
503-
FileSystemUTF8TextFile(io.File file) : super(file);
502+
class FileSystemutf8TextFile extends FileSystemFile with utf8TextFile {
503+
FileSystemutf8TextFile(io.File file) : super(file);
504504
}
505505

506506
class FileSystemLatin1TextFile extends FileSystemFile with Latin1TextFile {
@@ -554,7 +554,7 @@ class ArchiveDirectory extends IoNode implements Directory {
554554
case FileType.tar: _files.add(new ArchiveTarFile(entryFullName, entry)); break;
555555
case FileType.gz: _files.add(new ArchiveGZipFile(entryFullName, entry)); break;
556556
case FileType.bzip2: _files.add(new ArchiveBZip2File(entryFullName, entry)); break;
557-
case FileType.text: _files.add(new ArchiveUTF8TextFile(entryFullName, entry)); break;
557+
case FileType.text: _files.add(new Archiveutf8TextFile(entryFullName, entry)); break;
558558
case FileType.latin1Text: _files.add(new ArchiveLatin1TextFile(entryFullName, entry)); break;
559559
case FileType.metadata: break; // ignore this file
560560
}
@@ -595,8 +595,8 @@ class ArchiveFile extends IoNode implements File {
595595
}
596596
}
597597

598-
class ArchiveUTF8TextFile extends ArchiveFile with UTF8TextFile {
599-
ArchiveUTF8TextFile(String fullName, a.ArchiveFile file) : super(fullName, file);
598+
class Archiveutf8TextFile extends ArchiveFile with utf8TextFile {
599+
Archiveutf8TextFile(String fullName, a.ArchiveFile file) : super(fullName, file);
600600
}
601601

602602
class ArchiveLatin1TextFile extends ArchiveFile with Latin1TextFile {
@@ -634,7 +634,7 @@ class InMemoryFile extends IoNode implements File {
634634
case FileType.tar: return new InMemoryTarFile(fullName, bytes); break;
635635
case FileType.gz: return new InMemoryGZipFile(fullName, bytes); break;
636636
case FileType.bzip2: return new InMemoryBZip2File(fullName, bytes); break;
637-
case FileType.text: return new InMemoryUTF8TextFile(fullName, bytes); break;
637+
case FileType.text: return new InMemoryutf8TextFile(fullName, bytes); break;
638638
case FileType.latin1Text: return new InMemoryLatin1TextFile(fullName, bytes); break;
639639
case FileType.metadata: break; // ignore this file
640640
}
@@ -654,8 +654,8 @@ class InMemoryFile extends IoNode implements File {
654654
List<int> readBytes() => _bytes;
655655
}
656656

657-
class InMemoryUTF8TextFile extends InMemoryFile with UTF8TextFile {
658-
InMemoryUTF8TextFile(String fullName, List<int> file) : super(fullName, file);
657+
class InMemoryutf8TextFile extends InMemoryFile with utf8TextFile {
658+
InMemoryutf8TextFile(String fullName, List<int> file) : super(fullName, file);
659659
}
660660

661661
class InMemoryLatin1TextFile extends InMemoryFile with Latin1TextFile {

‎tools/licenses/lib/licenses.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,25 +322,25 @@ abstract class License implements Comparable<License> {
322322
throw 'incomplete license detected:\n---\n$body\n---';
323323
// if (type == LicenseType.unknown)
324324
// print('need detector for:\n----\n$body\n----');
325-
bool isUTF8 = true;
325+
bool isutf8 = true;
326326
List<int> latin1Encoded;
327327
try {
328-
latin1Encoded = LATIN1.encode(body);
329-
isUTF8 = false;
328+
latin1Encoded = latin1.encode(body);
329+
isutf8 = false;
330330
} on ArgumentError { }
331-
if (!isUTF8) {
331+
if (!isutf8) {
332332
bool isAscii = false;
333333
try {
334-
ASCII.decode(latin1Encoded);
334+
ascii.decode(latin1Encoded);
335335
isAscii = true;
336336
} on FormatException { }
337337
if (isAscii)
338338
return;
339339
try {
340-
UTF8.decode(latin1Encoded);
341-
isUTF8 = true;
340+
utf8.decode(latin1Encoded);
341+
isutf8 = true;
342342
} on FormatException { }
343-
if (isUTF8)
343+
if (isutf8)
344344
throw 'tried to create a License object with text that appears to have been misdecoded as Latin1 instead of as UTF-8:\n$body';
345345
}
346346
}

‎tools/licenses/lib/main.dart

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class RepositorySourceFile extends RepositoryLicensedFile {
9292
try {
9393
contents = io.readString();
9494
} on FormatException {
95-
print('non-UTF8 data in $io');
95+
print('non-utf8 data in $io');
9696
system.exit(2);
9797
}
9898
_licenses = determineLicensesFor(contents, name, parent, origin: '$this');
@@ -736,33 +736,33 @@ class RepositoryMultiLicenseNoticesForFilesFile extends RepositoryLicenseFile {
736736
// "Notices for files contained in the"
737737
// ...then have a second line which is 60 "=" characters
738738
final List<List<int>> contents = splitIntList(io.readBytes(), 0x0A).toList();
739-
if (!ASCII.decode(contents[0]).startsWith('Notices for files contained in') ||
740-
ASCII.decode(contents[1]) != '============================================================\n')
739+
if (!ascii.decode(contents[0]).startsWith('Notices for files contained in') ||
740+
ascii.decode(contents[1]) != '============================================================\n')
741741
throw 'unrecognised syntax: ${io.fullName}';
742742
int index = 2;
743743
while (index < contents.length) {
744-
if (ASCII.decode(contents[index]) != 'Notices for file(s):\n')
744+
if (ascii.decode(contents[index]) != 'Notices for file(s):\n')
745745
throw 'unrecognised syntax on line ${index + 1}: ${io.fullName}';
746746
index += 1;
747747
final List<String> names = <String>[];
748748
do {
749-
names.add(ASCII.decode(contents[index]));
749+
names.add(ascii.decode(contents[index]));
750750
index += 1;
751-
} while (ASCII.decode(contents[index]) != '------------------------------------------------------------\n');
751+
} while (ascii.decode(contents[index]) != '------------------------------------------------------------\n');
752752
index += 1;
753753
final List<List<int>> body = <List<int>>[];
754754
do {
755755
body.add(contents[index]);
756756
index += 1;
757757
} while (index < contents.length &&
758-
ASCII.decode(contents[index], allowInvalid: true) != '============================================================\n');
758+
ascii.decode(contents[index], allowInvalid: true) != '============================================================\n');
759759
index += 1;
760760
final List<int> bodyBytes = body.expand((List<int> line) => line).toList();
761761
String bodyText;
762762
try {
763-
bodyText = UTF8.decode(bodyBytes);
763+
bodyText = utf8.decode(bodyBytes);
764764
} on FormatException {
765-
bodyText = LATIN1.decode(bodyBytes);
765+
bodyText = latin1.decode(bodyBytes);
766766
}
767767
License license = new License.unique(bodyText, LicenseType.unknown, origin: io.fullName);
768768
for (String name in names) {
@@ -2545,7 +2545,7 @@ Future<Null> main(List<String> arguments) async {
25452545
system.File goldenFile = new system.File(
25462546
path.join(argResults['golden'], 'licenses_${component.io.name}'));
25472547
String goldenSignature = await goldenFile.openRead()
2548-
.transform(UTF8.decoder).transform(new LineSplitter()).first;
2548+
.transform(utf8.decoder).transform(new LineSplitter()).first;
25492549
Match goldenMatch = signaturePattern.matchAsPrefix(goldenSignature);
25502550
if (goldenMatch != null && goldenMatch.group(1) == signature) {
25512551
system.stderr.writeln(' Skipping this component - no change in signature');

0 commit comments

Comments
 (0)