From 2b0bf168690e16a3d8cb87318f59f991001f40e6 Mon Sep 17 00:00:00 2001 From: Yegor Jbanov Date: Fri, 6 Nov 2020 13:38:18 -0800 Subject: [PATCH 1/3] update pubspecs to null-safe dependencies --- lib/web_ui/dev/web_engine_analysis.sh | 4 +++- lib/web_ui/pubspec.yaml | 6 +++--- web_sdk/web_engine_tester/pubspec.yaml | 6 +++--- web_sdk/web_test_utils/pubspec.yaml | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/web_ui/dev/web_engine_analysis.sh b/lib/web_ui/dev/web_engine_analysis.sh index c347bf7d3a15a..758cfd96ac8e5 100755 --- a/lib/web_ui/dev/web_engine_analysis.sh +++ b/lib/web_ui/dev/web_engine_analysis.sh @@ -17,4 +17,6 @@ echo "Running \`pub get\` in 'engine/src/flutter/lib/web_ui'" (cd "$WEB_UI_DIR"; $PUB_PATH get) echo "Running \`dart analyze\` in 'engine/src/flutter/lib/web_ui'" -(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos) +(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos lib/) +(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos test/) +(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos dev/) diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml index c428be84f72e5..f79fdf46f86b1 100644 --- a/lib/web_ui/pubspec.yaml +++ b/lib/web_ui/pubspec.yaml @@ -5,17 +5,17 @@ environment: sdk: ">=2.10.0-0 <3.0.0" dependencies: - meta: 1.1.8 + js: 0.6.3-nullsafety.3 + meta: 1.3.0-nullsafety.6 dev_dependencies: analyzer: 0.39.15 archive: 2.0.13 http: 0.12.1 image: 2.1.13 - js: 0.6.1+1 mockito: 4.1.1 path: 1.8.0-nullsafety.3 - test: 1.14.3 + test: 1.16.0-nullsafety.9 quiver: 2.1.3 build_resolvers: 1.3.10 build_runner: 1.10.0 diff --git a/web_sdk/web_engine_tester/pubspec.yaml b/web_sdk/web_engine_tester/pubspec.yaml index 4bb4079035a29..af9f4ed712b84 100644 --- a/web_sdk/web_engine_tester/pubspec.yaml +++ b/web_sdk/web_engine_tester/pubspec.yaml @@ -4,9 +4,9 @@ environment: sdk: ">=2.2.0 <3.0.0" dependencies: - js: 0.6.1+1 - stream_channel: 2.0.0 - test: 1.14.3 + js: 0.6.3-nullsafety.3 + stream_channel: 2.1.0-nullsafety.3 + test: 1.16.0-nullsafety.9 webkit_inspection_protocol: 0.5.0 ui: path: ../../lib/web_ui diff --git a/web_sdk/web_test_utils/pubspec.yaml b/web_sdk/web_test_utils/pubspec.yaml index c11d442a20360..7f92e2348463e 100644 --- a/web_sdk/web_test_utils/pubspec.yaml +++ b/web_sdk/web_test_utils/pubspec.yaml @@ -6,5 +6,5 @@ environment: dependencies: path: 1.8.0-nullsafety.3 image: 2.1.13 - js: 0.6.1+1 + js: 0.6.3-nullsafety.3 yaml: 2.2.1 From c50996298bc034074c918a09e1f6ed00fa8177fc Mon Sep 17 00:00:00 2001 From: Yegor Jbanov Date: Fri, 6 Nov 2020 14:29:56 -0800 Subject: [PATCH 2/3] remove build_runner dep; upgrade quiver --- lib/web_ui/build.canvaskit.yaml | 20 -------------------- lib/web_ui/build.html.yaml | 21 --------------------- lib/web_ui/dev/test_runner.dart | 2 +- lib/web_ui/pubspec.yaml | 6 +----- 4 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 lib/web_ui/build.canvaskit.yaml delete mode 100644 lib/web_ui/build.html.yaml diff --git a/lib/web_ui/build.canvaskit.yaml b/lib/web_ui/build.canvaskit.yaml deleted file mode 100644 index 8be2596d000a7..0000000000000 --- a/lib/web_ui/build.canvaskit.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Build configuration used by CanvasKit tests. When building for CanvasKit -# we must pass FLUTTER_WEB_USE_SKIA=true to dart2js. -# -# See also `build.html.yaml`. -targets: - $default: - builders: - build_web_compilers|entrypoint: - options: - compiler: dart2js - dart2js_args: - - --no-minify - - --disable-inlining - - --enable-asserts - - --enable-experiment=non-nullable - - --no-sound-null-safety - - -DFLUTTER_WEB_USE_SKIA=true - generate_for: - include: - - test/canvaskit/**.dart diff --git a/lib/web_ui/build.html.yaml b/lib/web_ui/build.html.yaml deleted file mode 100644 index 36ea478d17df4..0000000000000 --- a/lib/web_ui/build.html.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Build configuration used by HTML (non-CanvasKit) tests. -# -# See also `build.canvaskit.yaml`. -targets: - $default: - builders: - build_web_compilers|entrypoint: - options: - compiler: dart2js - dart2js_args: - - --no-minify - - --disable-inlining - - --enable-asserts - - --enable-experiment=non-nullable - - --no-sound-null-safety - generate_for: - include: - - test/**.dart - exclude: - - test/**vm_test.dart - - test/canvaskit/**.dart diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart index 9538a380ec58b..c9dfacdb33c6a 100644 --- a/lib/web_ui/dev/test_runner.dart +++ b/lib/web_ui/dev/test_runner.dart @@ -236,7 +236,7 @@ class TestCommand extends Command with ArgUtils { } // Separate HTML targets from CanvasKit targets because the two use - // different dart2js options (and different build.*.yaml files). + // different dart2js options. final List htmlTargets = []; final List canvasKitTargets = []; final String canvasKitTestDirectory = diff --git a/lib/web_ui/pubspec.yaml b/lib/web_ui/pubspec.yaml index f79fdf46f86b1..8116e434bab07 100644 --- a/lib/web_ui/pubspec.yaml +++ b/lib/web_ui/pubspec.yaml @@ -16,11 +16,7 @@ dev_dependencies: mockito: 4.1.1 path: 1.8.0-nullsafety.3 test: 1.16.0-nullsafety.9 - quiver: 2.1.3 - build_resolvers: 1.3.10 - build_runner: 1.10.0 - build_test: 1.0.0 - build_web_compilers: 2.11.0 + quiver: 3.0.0-nullsafety.2 yaml: 2.2.1 watcher: 0.9.7+15 web_test_utils: From 39ed49811a5f45af09fd249b2ca0f28023fa5276 Mon Sep 17 00:00:00 2001 From: Yegor Jbanov Date: Fri, 6 Nov 2020 14:50:40 -0800 Subject: [PATCH 3/3] use analysis_options.yaml to control analysis scope --- lib/web_ui/analysis_options.yaml | 2 ++ lib/web_ui/dev/web_engine_analysis.sh | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/web_ui/analysis_options.yaml b/lib/web_ui/analysis_options.yaml index 869fffe973553..eda384399fd47 100644 --- a/lib/web_ui/analysis_options.yaml +++ b/lib/web_ui/analysis_options.yaml @@ -3,6 +3,8 @@ # uncommented, we'll delete this file and simply inherit the root options. analyzer: + exclude: + - build/** enable-experiment: - non-nullable strong-mode: diff --git a/lib/web_ui/dev/web_engine_analysis.sh b/lib/web_ui/dev/web_engine_analysis.sh index 758cfd96ac8e5..c347bf7d3a15a 100755 --- a/lib/web_ui/dev/web_engine_analysis.sh +++ b/lib/web_ui/dev/web_engine_analysis.sh @@ -17,6 +17,4 @@ echo "Running \`pub get\` in 'engine/src/flutter/lib/web_ui'" (cd "$WEB_UI_DIR"; $PUB_PATH get) echo "Running \`dart analyze\` in 'engine/src/flutter/lib/web_ui'" -(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos lib/) -(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos test/) -(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos dev/) +(cd "$WEB_UI_DIR"; $DART_PATH analyze --fatal-infos)