Skip to content

Commit 1e3ceb0

Browse files
authored
Update pubspecs to null-safe dependencies (flutter#22366)
* update pubspecs to null-safe dependencies * remove build_runner dep; upgrade quiver * use analysis_options.yaml to control analysis scope
1 parent d6b71fa commit 1e3ceb0

File tree

7 files changed

+11
-54
lines changed

7 files changed

+11
-54
lines changed

lib/web_ui/analysis_options.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# uncommented, we'll delete this file and simply inherit the root options.
44

55
analyzer:
6+
exclude:
7+
- build/**
68
enable-experiment:
79
- non-nullable
810
strong-mode:

lib/web_ui/build.canvaskit.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

lib/web_ui/build.html.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

lib/web_ui/dev/test_runner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ class TestCommand extends Command<bool> with ArgUtils {
236236
}
237237

238238
// Separate HTML targets from CanvasKit targets because the two use
239-
// different dart2js options (and different build.*.yaml files).
239+
// different dart2js options.
240240
final List<FilePath> htmlTargets = <FilePath>[];
241241
final List<FilePath> canvasKitTargets = <FilePath>[];
242242
final String canvasKitTestDirectory =

lib/web_ui/pubspec.yaml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,18 @@ environment:
55
sdk: ">=2.10.0-0 <3.0.0"
66

77
dependencies:
8-
meta: 1.1.8
8+
js: 0.6.3-nullsafety.3
9+
meta: 1.3.0-nullsafety.6
910

1011
dev_dependencies:
1112
analyzer: 0.39.15
1213
archive: 2.0.13
1314
http: 0.12.1
1415
image: 2.1.13
15-
js: 0.6.1+1
1616
mockito: 4.1.1
1717
path: 1.8.0-nullsafety.3
18-
test: 1.14.3
19-
quiver: 2.1.3
20-
build_resolvers: 1.3.10
21-
build_runner: 1.10.0
22-
build_test: 1.0.0
23-
build_web_compilers: 2.11.0
18+
test: 1.16.0-nullsafety.9
19+
quiver: 3.0.0-nullsafety.2
2420
yaml: 2.2.1
2521
watcher: 0.9.7+15
2622
web_test_utils:

web_sdk/web_engine_tester/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ environment:
44
sdk: ">=2.2.0 <3.0.0"
55

66
dependencies:
7-
js: 0.6.1+1
8-
stream_channel: 2.0.0
9-
test: 1.14.3
7+
js: 0.6.3-nullsafety.3
8+
stream_channel: 2.1.0-nullsafety.3
9+
test: 1.16.0-nullsafety.9
1010
webkit_inspection_protocol: 0.5.0
1111
ui:
1212
path: ../../lib/web_ui

web_sdk/web_test_utils/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ environment:
66
dependencies:
77
path: 1.8.0-nullsafety.3
88
image: 2.1.13
9-
js: 0.6.1+1
9+
js: 0.6.3-nullsafety.3
1010
yaml: 2.2.1

0 commit comments

Comments
 (0)