Skip to content

Commit 0c7e952

Browse files
authored
Manual Dart SDK roll 6e015bd9cddb to 9c6e76468ca4 (6 revisions (flutter#22153)
This includes the commits from https://dart.googlesource.com/sdk.git/+log/6e015bd9cddb..9c6e76468ca4 as well as the changes from https://github.com/flutter/engine/pull/22149/files which are needed due to dart-lang/sdk@23ee425de7533b
1 parent 03395de commit 0c7e952

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ vars = {
3434
# Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
3535
# You can use //tools/dart/create_updated_flutter_deps.py to produce
3636
# updated revision list of existing dependencies.
37-
'dart_revision': '6e015bd9cddb6073b5d59fccb1238227e5e834c7',
37+
'dart_revision': '9c6e76468ca4b7886f0477af69b6fd0fb610b2e8',
3838

3939
# WARNING: DO NOT EDIT MANUALLY
4040
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -46,7 +46,7 @@ vars = {
4646
'dart_dart_style_tag': '1.3.8',
4747
'dart_http_retry_tag': '0.1.1',
4848
'dart_http_throttle_tag': '1.0.2',
49-
'dart_intl_tag': '0.16.1',
49+
'dart_intl_tag': '0.17.0-nullsafety',
5050
'dart_linter_tag': '0.1.121',
5151
'dart_oauth2_tag': '1.6.0',
5252
'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',

ci/licenses_golden/licenses_third_party

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 08da629cc55657469fbc030dd104af1f
1+
Signature: df32ba1b81ccb800b01c3d2bf007a2a8
22

33
UNUSED LICENSES:
44

@@ -8430,6 +8430,7 @@ FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.cc
84308430
FILE: ../../../third_party/dart/runtime/bin/dartdev_isolate.h
84318431
FILE: ../../../third_party/dart/runtime/bin/exe_utils.cc
84328432
FILE: ../../../third_party/dart/runtime/bin/exe_utils.h
8433+
FILE: ../../../third_party/dart/runtime/bin/ffi_test/ffi_test_functions_generated.cc
84338434
FILE: ../../../third_party/dart/runtime/bin/file_win.h
84348435
FILE: ../../../third_party/dart/runtime/bin/platform_macos.h
84358436
FILE: ../../../third_party/dart/runtime/bin/platform_macos_test.cc

tools/const_finder/test/const_finder_test.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ void _checkNonConsts() {
120120
'line': 14,
121121
'column': 26,
122122
},
123+
<String, dynamic>{
124+
'file': 'file://$fixtures/lib/consts_and_non.dart',
125+
'line': 17,
126+
'column': 41,
127+
},
123128
<String, dynamic>{
124129
'file': 'file://$fixtures/lib/consts_and_non.dart',
125130
'line': 17,

tools/const_finder/test/fixtures/lib/consts.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ class IgnoreMe {
4545
const IgnoreMe([this.target]);
4646

4747
final Target target;
48+
49+
@override
50+
String toString() => target.toString();
4851
}
4952

5053
class StaticConstInitializer {

tools/const_finder/test/fixtures/lib/consts_and_non.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ class IgnoreMe {
3838
const IgnoreMe([this.target]);
3939

4040
final Target target;
41+
42+
@override
43+
String toString() => target.toString();
4144
}
4245

4346
void blah(Target target) {

0 commit comments

Comments
 (0)