Skip to content

Commit e721835

Browse files
jakemac53jakemac53
committed
add all flutter/flutter_test/test isolate deps to the allow list
I also had to migrate package:js to nnbd as a part of this Bug:#42274 Change-Id: Ia0223e013d2afb464c05eba71783827cf1fb4781 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151400 Auto-Submit: Jake Macdonald <[email protected]> Reviewed-by: Leaf Petersen <[email protected]>
1 parent 7e5fe50 commit e721835

File tree

9 files changed

+189
-10
lines changed

9 files changed

+189
-10
lines changed

‎.dart_tool/package_config.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"constraint, update this by running tools/generate_package_config.dart."
1212
],
1313
"configVersion": 2,
14-
"generated": "2020-05-15T15:16:14.438097",
14+
"generated": "2020-06-16T15:18:03.429449",
1515
"generator": "tools/generate_package_config.dart",
1616
"packages": [
1717
{
@@ -326,7 +326,8 @@
326326
{
327327
"name": "js",
328328
"rootUri": "../pkg/js",
329-
"packageUri": "lib/"
329+
"packageUri": "lib/",
330+
"languageVersion": "2.9"
330331
},
331332
{
332333
"name": "js_ast",
@@ -576,7 +577,7 @@
576577
"name": "stream_channel",
577578
"rootUri": "../third_party/pkg/stream_channel",
578579
"packageUri": "lib/",
579-
"languageVersion": "2.0"
580+
"languageVersion": "2.2"
580581
},
581582
{
582583
"name": "string_scanner",

‎pkg/front_end/lib/src/api_prototype/experimental_flags_generated.dart

Lines changed: 86 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,89 @@ const Map<ExperimentalFlag, bool> expiredExperimentalFlags = {
8282
const AllowedExperimentalFlags defaultAllowedExperimentalFlags =
8383
const AllowedExperimentalFlags(sdkDefaultExperiments: {
8484
ExperimentalFlag.nonNullable,
85-
}, sdkLibraryExperiments: {}, packageExperiments: {});
85+
}, sdkLibraryExperiments: {}, packageExperiments: {
86+
"async": {
87+
ExperimentalFlag.nonNullable,
88+
},
89+
"boolean_selector": {
90+
ExperimentalFlag.nonNullable,
91+
},
92+
"characters": {
93+
ExperimentalFlag.nonNullable,
94+
},
95+
"charcode": {
96+
ExperimentalFlag.nonNullable,
97+
},
98+
"clock": {
99+
ExperimentalFlag.nonNullable,
100+
},
101+
"collection": {
102+
ExperimentalFlag.nonNullable,
103+
},
104+
"fake_async": {
105+
ExperimentalFlag.nonNullable,
106+
},
107+
"fixnum": {
108+
ExperimentalFlag.nonNullable,
109+
},
110+
"flutter": {
111+
ExperimentalFlag.nonNullable,
112+
},
113+
"js": {
114+
ExperimentalFlag.nonNullable,
115+
},
116+
"matcher": {
117+
ExperimentalFlag.nonNullable,
118+
},
119+
"meta": {
120+
ExperimentalFlag.nonNullable,
121+
},
122+
"path": {
123+
ExperimentalFlag.nonNullable,
124+
},
125+
"pedantic": {
126+
ExperimentalFlag.nonNullable,
127+
},
128+
"pool": {
129+
ExperimentalFlag.nonNullable,
130+
},
131+
"sky_engine": {
132+
ExperimentalFlag.nonNullable,
133+
},
134+
"source_maps": {
135+
ExperimentalFlag.nonNullable,
136+
},
137+
"source_map_stack_trace": {
138+
ExperimentalFlag.nonNullable,
139+
},
140+
"source_span": {
141+
ExperimentalFlag.nonNullable,
142+
},
143+
"stack_trace": {
144+
ExperimentalFlag.nonNullable,
145+
},
146+
"stream_channel": {
147+
ExperimentalFlag.nonNullable,
148+
},
149+
"string_scanner": {
150+
ExperimentalFlag.nonNullable,
151+
},
152+
"term_glyph": {
153+
ExperimentalFlag.nonNullable,
154+
},
155+
"test": {
156+
ExperimentalFlag.nonNullable,
157+
},
158+
"test_api": {
159+
ExperimentalFlag.nonNullable,
160+
},
161+
"test_core": {
162+
ExperimentalFlag.nonNullable,
163+
},
164+
"typed_data": {
165+
ExperimentalFlag.nonNullable,
166+
},
167+
"vector_math": {
168+
ExperimentalFlag.nonNullable,
169+
},
170+
});

‎pkg/front_end/test/spell_checking_list_code.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ class6a
178178
class6b
179179
clazz
180180
cli
181+
clock
181182
cls
182183
cn
183184
cnt
@@ -963,6 +964,7 @@ size
963964
sizes
964965
sj
965966
sk
967+
sky
966968
slash
967969
slb
968970
slots
@@ -1191,6 +1193,7 @@ variant
11911193
variants
11921194
vary
11931195
vb
1196+
vector
11941197
vegorov
11951198
versa
11961199
vice

‎pkg/js/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.3-dev
2+
3+
* Opt in to null safety.
4+
15
## 0.6.2
26

37
* Improved documentation.

‎pkg/js/analysis_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
analyzer:
2+
enable-experiment:
3+
- non-nullable

‎pkg/js/lib/js.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export 'dart:js' show allowInterop, allowInteropCaptureThis;
1717
/// dart name is used. It is not valid to specify a custom [name] for class
1818
/// instance members.
1919
class JS {
20-
final String name;
20+
final String? name;
2121
const JS([this.name]);
2222
}
2323

‎pkg/js/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: js
2-
version: 0.6.2
2+
version: 0.6.3-dev
33
description: Annotations to create static Dart interfaces for JavaScript APIs.
44
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/js
55

66
environment:
7-
sdk: '>=2.0.0 <3.0.0'
7+
sdk: '>=2.9.0-1 <3.0.0'

‎sdk/lib/_internal/allowed_experiments.json

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"version": 1,
33
"experimentSets": {
4-
"nullSafety": ["non-nullable"]
4+
"nullSafety": [
5+
"non-nullable"
6+
]
57
},
68
"sdk": {
79
"default": {
@@ -13,9 +15,90 @@
1315
}
1416
}
1517
},
16-
"_example_packages": {
18+
"packages": {
19+
"async": {
20+
"experimentSet": "nullSafety"
21+
},
22+
"boolean_selector": {
23+
"experimentSet": "nullSafety"
24+
},
25+
"characters": {
26+
"experimentSet": "nullSafety"
27+
},
28+
"charcode": {
29+
"experimentSet": "nullSafety"
30+
},
31+
"clock": {
32+
"experimentSet": "nullSafety"
33+
},
1734
"collection": {
1835
"experimentSet": "nullSafety"
36+
},
37+
"fake_async": {
38+
"experimentSet": "nullSafety"
39+
},
40+
"fixnum": {
41+
"experimentSet": "nullSafety"
42+
},
43+
"flutter": {
44+
"experimentSet": "nullSafety"
45+
},
46+
"js": {
47+
"experimentSet": "nullSafety"
48+
},
49+
"matcher": {
50+
"experimentSet": "nullSafety"
51+
},
52+
"meta": {
53+
"experimentSet": "nullSafety"
54+
},
55+
"path": {
56+
"experimentSet": "nullSafety"
57+
},
58+
"pedantic": {
59+
"experimentSet": "nullSafety"
60+
},
61+
"pool": {
62+
"experimentSet": "nullSafety"
63+
},
64+
"sky_engine": {
65+
"experimentSet": "nullSafety"
66+
},
67+
"source_maps": {
68+
"experimentSet": "nullSafety"
69+
},
70+
"source_map_stack_trace": {
71+
"experimentSet": "nullSafety"
72+
},
73+
"source_span": {
74+
"experimentSet": "nullSafety"
75+
},
76+
"stack_trace": {
77+
"experimentSet": "nullSafety"
78+
},
79+
"stream_channel": {
80+
"experimentSet": "nullSafety"
81+
},
82+
"string_scanner": {
83+
"experimentSet": "nullSafety"
84+
},
85+
"term_glyph": {
86+
"experimentSet": "nullSafety"
87+
},
88+
"test": {
89+
"experimentSet": "nullSafety"
90+
},
91+
"test_api": {
92+
"experimentSet": "nullSafety"
93+
},
94+
"test_core": {
95+
"experimentSet": "nullSafety"
96+
},
97+
"typed_data": {
98+
"experimentSet": "nullSafety"
99+
},
100+
"vector_math": {
101+
"experimentSet": "nullSafety"
19102
}
20103
}
21104
}

‎utils/dartdevc/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ template("dartdevc_kernel_compile") {
204204
# named `${name}_js` must exist.
205205
# * args: additional args to pass to dartdevc
206206

207-
prebuilt_dart_action(target_name) {
207+
dart_action(target_name) {
208208
script = "../../pkg/dev_compiler/bin/dartdevc.dart"
209209
module = invoker.package
210210
out_dir = rebase_path("$js_gen_dir")

0 commit comments

Comments
 (0)