From a785db78fb3545ec471b776d3e21d2fc9c014c9f Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Mon, 5 Aug 2019 16:51:57 -0700 Subject: [PATCH] Reland "Integrate dwds into flutter tool for web support (#34252)" (#37649)" (#37650) --- dev/automated_tests/pubspec.yaml | 10 +- dev/benchmarks/complex_layout/pubspec.yaml | 10 +- dev/benchmarks/macrobenchmarks/pubspec.yaml | 10 +- dev/benchmarks/microbenchmarks/pubspec.yaml | 10 +- dev/bots/pubspec.yaml | 10 +- dev/customer_testing/pubspec.yaml | 6 +- dev/devicelab/pubspec.yaml | 10 +- .../android_semantics_testing/pubspec.yaml | 8 +- .../splash_screen_kitchen_sink/pubspec.yaml | 10 +- .../splash_screen_load_rotate/pubspec.yaml | 8 +- .../splash_screen_trans_rotate/pubspec.yaml | 10 +- .../android_views/pubspec.yaml | 10 +- dev/integration_tests/channels/pubspec.yaml | 8 +- dev/integration_tests/codegen/pubspec.yaml | 8 +- .../external_ui/pubspec.yaml | 8 +- dev/integration_tests/flavors/pubspec.yaml | 8 +- .../image_loading/pubspec.yaml | 8 +- .../ios_add2app/flutterapp/pubspec.yaml | 8 +- .../platform_interaction/pubspec.yaml | 8 +- .../release_smoke_test/pubspec.yaml | 8 +- .../simple_codegen/pubspec.yaml | 6 +- dev/integration_tests/ui/pubspec.yaml | 10 +- dev/manual_tests/pubspec.yaml | 8 +- dev/snippets/pubspec.yaml | 10 +- dev/tools/gen_keycodes/pubspec.yaml | 8 +- dev/tools/pubspec.yaml | 8 +- dev/tools/vitool/pubspec.yaml | 8 +- examples/catalog/pubspec.yaml | 10 +- examples/flutter_gallery/pubspec.yaml | 16 +- examples/hello_world/pubspec.yaml | 8 +- examples/image_list/pubspec.yaml | 8 +- examples/layers/pubspec.yaml | 8 +- examples/platform_channel/pubspec.yaml | 10 +- examples/platform_channel_swift/pubspec.yaml | 10 +- examples/stocks/pubspec.yaml | 8 +- packages/flutter/pubspec.yaml | 10 +- packages/flutter_driver/pubspec.yaml | 10 +- packages/flutter_goldens/pubspec.yaml | 10 +- packages/flutter_goldens_client/pubspec.yaml | 6 +- packages/flutter_localizations/pubspec.yaml | 8 +- packages/flutter_test/pubspec.yaml | 8 +- .../lib/src/build_runner/build_runner.dart | 8 +- .../lib/src/build_runner/build_script.dart | 1 + .../lib/src/commands/daemon.dart | 19 +- .../flutter_tools/lib/src/commands/run.dart | 2 +- .../lib/src/commands/update_packages.dart | 5 +- .../lib/src/resident_runner.dart | 13 + .../lib/src/resident_web_runner.dart | 330 ++++++++++++----- .../lib/src/web/asset_server.dart | 186 ---------- .../flutter_tools/lib/src/web/web_device.dart | 2 + .../flutter_tools/lib/src/web/web_fs.dart | 348 ++++++++++++++++++ packages/flutter_tools/pubspec.yaml | 56 ++- .../commands/build_web_test.dart | 3 +- .../resident_web_runner_cold_test.dart | 108 ++++++ .../resident_web_runner_test.dart | 311 ++++++++++++++++ .../test/general.shard/web/web_fs_test.dart | 95 +++++ .../flutter_tools/tool/tool_coverage.dart | 2 +- .../pubspec.yaml | 10 +- 58 files changed, 1371 insertions(+), 492 deletions(-) delete mode 100644 packages/flutter_tools/lib/src/web/asset_server.dart create mode 100644 packages/flutter_tools/lib/src/web/web_fs.dart create mode 100644 packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart create mode 100644 packages/flutter_tools/test/general.shard/resident_web_runner_test.dart create mode 100644 packages/flutter_tools/test/general.shard/web/web_fs_test.dart diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml index 219092e34d..d753ddfb7a 100644 --- a/dev/automated_tests/pubspec.yaml +++ b/dev/automated_tests/pubspec.yaml @@ -34,14 +34,14 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -51,7 +51,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,4 +67,4 @@ flutter: assets: - icon/ -# PUBSPEC CHECKSUM: b02a +# PUBSPEC CHECKSUM: ee2f diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 632ded5bf1..fdef8250dd 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -58,19 +58,19 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -82,4 +82,4 @@ flutter: - packages/flutter_gallery_assets/people/square/ali.png - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png -# PUBSPEC CHECKSUM: 61b9 +# PUBSPEC CHECKSUM: 9fbe diff --git a/dev/benchmarks/macrobenchmarks/pubspec.yaml b/dev/benchmarks/macrobenchmarks/pubspec.yaml index f82755a597..1656681784 100644 --- a/dev/benchmarks/macrobenchmarks/pubspec.yaml +++ b/dev/benchmarks/macrobenchmarks/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -58,19 +58,19 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -79,4 +79,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 61b9 +# PUBSPEC CHECKSUM: 9fbe diff --git a/dev/benchmarks/microbenchmarks/pubspec.yaml b/dev/benchmarks/microbenchmarks/pubspec.yaml index 4b77a0375f..0c2c82bdd1 100644 --- a/dev/benchmarks/microbenchmarks/pubspec.yaml +++ b/dev/benchmarks/microbenchmarks/pubspec.yaml @@ -41,15 +41,15 @@ dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -59,7 +59,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -73,4 +73,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 468f +# PUBSPEC CHECKSUM: f094 diff --git a/dev/bots/pubspec.yaml b/dev/bots/pubspec.yaml index b00955df18..612ea31429 100644 --- a/dev/bots/pubspec.yaml +++ b/dev/bots/pubspec.yaml @@ -6,11 +6,11 @@ environment: sdk: ">=2.2.2 <3.0.0" dependencies: - path: 1.6.2 + path: 1.6.4 args: 1.5.2 meta: 1.1.7 process: 3.0.9 - platform: 2.2.0 + platform: 2.2.1 http: 0.12.0+2 http_parser: 3.1.3 test: 1.6.3 @@ -39,7 +39,7 @@ dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -54,7 +54,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,4 +67,4 @@ dev_dependencies: mockito: 4.1.0 test_api: 0.2.5 -# PUBSPEC CHECKSUM: e98b +# PUBSPEC CHECKSUM: 2890 diff --git a/dev/customer_testing/pubspec.yaml b/dev/customer_testing/pubspec.yaml index 25a9c8bb4d..726c1282f9 100644 --- a/dev/customer_testing/pubspec.yaml +++ b/dev/customer_testing/pubspec.yaml @@ -6,7 +6,7 @@ environment: dependencies: args: 1.5.2 - path: 1.6.2 + path: 1.6.4 glob: 1.1.7 meta: 1.1.7 @@ -14,7 +14,7 @@ dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 7d73 +# PUBSPEC CHECKSUM: 8376 diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml index 210141b0f3..caca3c905a 100644 --- a/dev/devicelab/pubspec.yaml +++ b/dev/devicelab/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: file: 5.0.8+1 image: 2.1.4 meta: 1.1.7 - path: 1.6.2 - platform: 2.2.0 + path: 1.6.4 + platform: 2.2.1 process: 3.0.9 stack_trace: 1.9.3 vm_service_client: 0.2.6+2 @@ -56,7 +56,7 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,10 +67,10 @@ dev_dependencies: shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.1.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: c704 +# PUBSPEC CHECKSUM: d609 diff --git a/dev/integration_tests/android_semantics_testing/pubspec.yaml b/dev/integration_tests/android_semantics_testing/pubspec.yaml index 22974acd4e..4ba501fcbf 100644 --- a/dev/integration_tests/android_semantics_testing/pubspec.yaml +++ b/dev/integration_tests/android_semantics_testing/pubspec.yaml @@ -33,10 +33,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -49,7 +49,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -63,4 +63,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 80cf +# PUBSPEC CHECKSUM: 6cd3 diff --git a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/pubspec.yaml b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/pubspec.yaml index ec3cb22da5..aca2abb99d 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/pubspec.yaml +++ b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/pubspec.yaml @@ -65,14 +65,14 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -82,7 +82,7 @@ dev_dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -129,4 +129,4 @@ flutter: # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages -# PUBSPEC CHECKSUM: e85f +# PUBSPEC CHECKSUM: 2764 diff --git a/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/pubspec.yaml b/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/pubspec.yaml index bb6cdceec5..9b11b34659 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/pubspec.yaml +++ b/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/pubspec.yaml @@ -42,13 +42,13 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -90,4 +90,4 @@ flutter: # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages -# PUBSPEC CHECKSUM: e860 +# PUBSPEC CHECKSUM: 5564 diff --git a/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/pubspec.yaml b/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/pubspec.yaml index ddedfef3a9..1387271574 100644 --- a/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/pubspec.yaml +++ b/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/pubspec.yaml @@ -65,14 +65,14 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -82,7 +82,7 @@ dev_dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -129,4 +129,4 @@ flutter: # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages -# PUBSPEC CHECKSUM: e85f +# PUBSPEC CHECKSUM: 2764 diff --git a/dev/integration_tests/android_views/pubspec.yaml b/dev/integration_tests/android_views/pubspec.yaml index 96850716cf..a87a101b45 100644 --- a/dev/integration_tests/android_views/pubspec.yaml +++ b/dev/integration_tests/android_views/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -55,19 +55,19 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -76,4 +76,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: a181 +# PUBSPEC CHECKSUM: 5886 diff --git a/dev/integration_tests/channels/pubspec.yaml b/dev/integration_tests/channels/pubspec.yaml index d3923d554b..a87e2fd0ec 100644 --- a/dev/integration_tests/channels/pubspec.yaml +++ b/dev/integration_tests/channels/pubspec.yaml @@ -37,10 +37,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,7 +53,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,4 +67,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 80cf +# PUBSPEC CHECKSUM: 6cd3 diff --git a/dev/integration_tests/codegen/pubspec.yaml b/dev/integration_tests/codegen/pubspec.yaml index 92c457d92e..8744ad897f 100644 --- a/dev/integration_tests/codegen/pubspec.yaml +++ b/dev/integration_tests/codegen/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -50,7 +50,7 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -61,7 +61,7 @@ dev_dependencies: shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -74,4 +74,4 @@ builders: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 80cf +# PUBSPEC CHECKSUM: 6cd3 diff --git a/dev/integration_tests/external_ui/pubspec.yaml b/dev/integration_tests/external_ui/pubspec.yaml index 3d834d1216..db6f19fe09 100644 --- a/dev/integration_tests/external_ui/pubspec.yaml +++ b/dev/integration_tests/external_ui/pubspec.yaml @@ -37,10 +37,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,7 +53,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,4 +67,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 80cf +# PUBSPEC CHECKSUM: 6cd3 diff --git a/dev/integration_tests/flavors/pubspec.yaml b/dev/integration_tests/flavors/pubspec.yaml index 5483223b59..45254a637e 100644 --- a/dev/integration_tests/flavors/pubspec.yaml +++ b/dev/integration_tests/flavors/pubspec.yaml @@ -37,10 +37,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,7 +53,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,4 +67,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 80cf +# PUBSPEC CHECKSUM: 6cd3 diff --git a/dev/integration_tests/image_loading/pubspec.yaml b/dev/integration_tests/image_loading/pubspec.yaml index 8f0fd3cd2d..462971f010 100644 --- a/dev/integration_tests/image_loading/pubspec.yaml +++ b/dev/integration_tests/image_loading/pubspec.yaml @@ -30,10 +30,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -46,7 +46,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -60,4 +60,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: c484 +# PUBSPEC CHECKSUM: b088 diff --git a/dev/integration_tests/ios_add2app/flutterapp/pubspec.yaml b/dev/integration_tests/ios_add2app/flutterapp/pubspec.yaml index 6dcc216a67..0f113bc073 100644 --- a/dev/integration_tests/ios_add2app/flutterapp/pubspec.yaml +++ b/dev/integration_tests/ios_add2app/flutterapp/pubspec.yaml @@ -40,13 +40,13 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -98,4 +98,4 @@ flutter: androidPackage: com.example.iosadd2appflutter iosBundleIdentifier: com.example.iosAdd2appFlutter -# PUBSPEC CHECKSUM: e860 +# PUBSPEC CHECKSUM: 5564 diff --git a/dev/integration_tests/platform_interaction/pubspec.yaml b/dev/integration_tests/platform_interaction/pubspec.yaml index 6af7eb7431..07795b21ec 100644 --- a/dev/integration_tests/platform_interaction/pubspec.yaml +++ b/dev/integration_tests/platform_interaction/pubspec.yaml @@ -37,10 +37,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,7 +53,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -67,4 +67,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 80cf +# PUBSPEC CHECKSUM: 6cd3 diff --git a/dev/integration_tests/release_smoke_test/pubspec.yaml b/dev/integration_tests/release_smoke_test/pubspec.yaml index 64ea51ff50..b601f2a99d 100644 --- a/dev/integration_tests/release_smoke_test/pubspec.yaml +++ b/dev/integration_tests/release_smoke_test/pubspec.yaml @@ -21,14 +21,14 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 9bbb +# PUBSPEC CHECKSUM: 08bf diff --git a/dev/integration_tests/simple_codegen/pubspec.yaml b/dev/integration_tests/simple_codegen/pubspec.yaml index 12c973a715..eacc46603e 100644 --- a/dev/integration_tests/simple_codegen/pubspec.yaml +++ b/dev/integration_tests/simple_codegen/pubspec.yaml @@ -19,11 +19,11 @@ dependencies: logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -33,4 +33,4 @@ environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. sdk: ">=2.0.0-dev.68.0 <3.0.0" -# PUBSPEC CHECKSUM: 339d +# PUBSPEC CHECKSUM: d6a0 diff --git a/dev/integration_tests/ui/pubspec.yaml b/dev/integration_tests/ui/pubspec.yaml index 80f90464e9..20980e61dc 100644 --- a/dev/integration_tests/ui/pubspec.yaml +++ b/dev/integration_tests/ui/pubspec.yaml @@ -39,10 +39,10 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -56,7 +56,7 @@ dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -72,9 +72,9 @@ dev_dependencies: sdk: flutter test_api: 0.2.5 - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" flutter: uses-material-design: true -# PUBSPEC CHECKSUM: c214 +# PUBSPEC CHECKSUM: d119 diff --git a/dev/manual_tests/pubspec.yaml b/dev/manual_tests/pubspec.yaml index c5e546917c..08563188e7 100644 --- a/dev/manual_tests/pubspec.yaml +++ b/dev/manual_tests/pubspec.yaml @@ -23,17 +23,17 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ec01 +# PUBSPEC CHECKSUM: 5905 diff --git a/dev/snippets/pubspec.yaml b/dev/snippets/pubspec.yaml index 081dd403d8..2f2bfa8fd0 100644 --- a/dev/snippets/pubspec.yaml +++ b/dev/snippets/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: args: 1.5.2 dart_style: 1.2.9 meta: 1.1.7 - platform: 2.2.0 + platform: 2.2.1 analyzer: 0.36.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -30,11 +30,11 @@ dependencies: html: 0.14.0+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" kernel: 0.3.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,7 +53,7 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -98,4 +98,4 @@ executables: vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: bd93 +# PUBSPEC CHECKSUM: 8b98 diff --git a/dev/tools/gen_keycodes/pubspec.yaml b/dev/tools/gen_keycodes/pubspec.yaml index d4f78f4eb9..a0c56f34f9 100644 --- a/dev/tools/gen_keycodes/pubspec.yaml +++ b/dev/tools/gen_keycodes/pubspec.yaml @@ -8,8 +8,8 @@ environment: dependencies: args: 1.5.2 http: 0.12.0+2 - path: 1.6.2 - platform: 2.2.0 + path: 1.6.4 + platform: 2.2.1 async: 2.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -18,8 +18,8 @@ dependencies: meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 6e34 +# PUBSPEC CHECKSUM: ee38 diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index 59b14b930d..e2f1b92e14 100644 --- a/dev/tools/pubspec.yaml +++ b/dev/tools/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: http: 0.12.0+2 intl: 0.15.8 meta: 1.1.7 - path: 1.6.2 + path: 1.6.4 process: 3.0.9 async: 2.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -22,9 +22,9 @@ dependencies: file: 5.0.8+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -37,4 +37,4 @@ dev_dependencies: stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 8bf5 +# PUBSPEC CHECKSUM: c3f9 diff --git a/dev/tools/vitool/pubspec.yaml b/dev/tools/vitool/pubspec.yaml index 9083b349a0..da8c321563 100644 --- a/dev/tools/vitool/pubspec.yaml +++ b/dev/tools/vitool/pubspec.yaml @@ -27,14 +27,14 @@ dev_dependencies: async: 2.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 8eaf +# PUBSPEC CHECKSUM: 93b3 diff --git a/examples/catalog/pubspec.yaml b/examples/catalog/pubspec.yaml index 190acf40fb..82b40ba31d 100644 --- a/examples/catalog/pubspec.yaml +++ b/examples/catalog/pubspec.yaml @@ -8,7 +8,7 @@ environment: dependencies: flutter: sdk: flutter - path: 1.6.2 + path: 1.6.4 collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -45,13 +45,13 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -61,7 +61,7 @@ dev_dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -73,4 +73,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 4eba +# PUBSPEC CHECKSUM: 8cbf diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 58fcd94eaf..f38d22b4b4 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -11,10 +11,10 @@ dependencies: device_info: 0.4.0+2 intl: 0.15.8 connectivity: 0.4.3+6 - string_scanner: 1.0.4 - url_launcher: 5.1.0 + string_scanner: 1.0.5 + url_launcher: 5.1.2 cupertino_icons: 0.1.2 - video_player: 0.10.1+5 + video_player: 0.10.1+6 scoped_model: 1.0.1 shrine_images: 1.1.2 @@ -23,7 +23,7 @@ dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -59,15 +59,15 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" process: 3.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -254,4 +254,4 @@ flutter: - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf -# PUBSPEC CHECKSUM: 4586 +# PUBSPEC CHECKSUM: a58f diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml index 15031f907e..f553263dd7 100644 --- a/examples/hello_world/pubspec.yaml +++ b/examples/hello_world/pubspec.yaml @@ -21,14 +21,14 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 9bbb +# PUBSPEC CHECKSUM: 08bf diff --git a/examples/image_list/pubspec.yaml b/examples/image_list/pubspec.yaml index c8a43266f1..520a2a49b8 100644 --- a/examples/image_list/pubspec.yaml +++ b/examples/image_list/pubspec.yaml @@ -32,13 +32,13 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -53,4 +53,4 @@ flutter: assets: - images/coast.jpg -# PUBSPEC CHECKSUM: e860 +# PUBSPEC CHECKSUM: 5564 diff --git a/examples/layers/pubspec.yaml b/examples/layers/pubspec.yaml index 5326d4a226..11324d3da8 100644 --- a/examples/layers/pubspec.yaml +++ b/examples/layers/pubspec.yaml @@ -21,13 +21,13 @@ dev_dependencies: boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -36,4 +36,4 @@ flutter: - services/data.json uses-material-design: true -# PUBSPEC CHECKSUM: 9bbb +# PUBSPEC CHECKSUM: 08bf diff --git a/examples/platform_channel/pubspec.yaml b/examples/platform_channel/pubspec.yaml index d1a2333fde..ca8ec78cc3 100644 --- a/examples/platform_channel/pubspec.yaml +++ b/examples/platform_channel/pubspec.yaml @@ -43,14 +43,14 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -60,7 +60,7 @@ dev_dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -72,4 +72,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 4eba +# PUBSPEC CHECKSUM: 8cbf diff --git a/examples/platform_channel_swift/pubspec.yaml b/examples/platform_channel_swift/pubspec.yaml index b3764e1a7d..29645c6bea 100644 --- a/examples/platform_channel_swift/pubspec.yaml +++ b/examples/platform_channel_swift/pubspec.yaml @@ -43,14 +43,14 @@ dev_dependencies: matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -60,7 +60,7 @@ dev_dependencies: source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_core: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -72,4 +72,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 4eba +# PUBSPEC CHECKSUM: 8cbf diff --git a/examples/stocks/pubspec.yaml b/examples/stocks/pubspec.yaml index bd7758140f..c628b4dfe7 100644 --- a/examples/stocks/pubspec.yaml +++ b/examples/stocks/pubspec.yaml @@ -30,12 +30,12 @@ dependencies: kernel: 0.3.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -52,7 +52,7 @@ dev_dependencies: file: 5.0.8+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_rpc_2: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -62,4 +62,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: c380 +# PUBSPEC CHECKSUM: 4784 diff --git a/packages/flutter/pubspec.yaml b/packages/flutter/pubspec.yaml index 1237f4e336..b2556501a0 100644 --- a/packages/flutter/pubspec.yaml +++ b/packages/flutter/pubspec.yaml @@ -30,16 +30,16 @@ dev_dependencies: file: 5.0.8+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" process: 3.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 7c9a +# PUBSPEC CHECKSUM: b79f diff --git a/packages/flutter_driver/pubspec.yaml b/packages/flutter_driver/pubspec.yaml index b8647ac13d..0e0ef142a3 100644 --- a/packages/flutter_driver/pubspec.yaml +++ b/packages/flutter_driver/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: file: 5.0.8+1 json_rpc_2: 2.1.0 meta: 1.1.7 - path: 1.6.2 + path: 1.6.4 web_socket_channel: 1.0.14 vm_service_client: 0.2.6+2 flutter: @@ -30,13 +30,13 @@ dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" process: 3.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -44,6 +44,6 @@ dependencies: dev_dependencies: mockito: 4.1.0 - quiver: 2.0.3 + quiver: 2.0.4 -# PUBSPEC CHECKSUM: e14c +# PUBSPEC CHECKSUM: 8d51 diff --git a/packages/flutter_goldens/pubspec.yaml b/packages/flutter_goldens/pubspec.yaml index f3d56455c0..5346e844ac 100644 --- a/packages/flutter_goldens/pubspec.yaml +++ b/packages/flutter_goldens/pubspec.yaml @@ -10,7 +10,7 @@ dependencies: sdk: flutter file: 5.0.8+1 meta: 1.1.7 - platform: 2.2.0 + platform: 2.2.1 process: 3.0.9 flutter_goldens_client: path: ../flutter_goldens_client @@ -21,13 +21,13 @@ dependencies: collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,4 +35,4 @@ dependencies: dev_dependencies: mockito: 4.1.0 -# PUBSPEC CHECKSUM: b828 +# PUBSPEC CHECKSUM: 492d diff --git a/packages/flutter_goldens_client/pubspec.yaml b/packages/flutter_goldens_client/pubspec.yaml index 922b7987de..a8f0bdfa16 100644 --- a/packages/flutter_goldens_client/pubspec.yaml +++ b/packages/flutter_goldens_client/pubspec.yaml @@ -7,15 +7,15 @@ environment: dependencies: # To update these, use "flutter update-packages --force-upgrade". file: 5.0.8+1 - platform: 2.2.0 + platform: 2.2.1 process: 3.0.9 intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: 7691 +# PUBSPEC CHECKSUM: 0a94 diff --git a/packages/flutter_localizations/pubspec.yaml b/packages/flutter_localizations/pubspec.yaml index 5620dd0276..c32413f9fd 100644 --- a/packages/flutter_localizations/pubspec.yaml +++ b/packages/flutter_localizations/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -27,12 +27,12 @@ dev_dependencies: charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: ce3f +# PUBSPEC CHECKSUM: 3b43 diff --git a/packages/flutter_test/pubspec.yaml b/packages/flutter_test/pubspec.yaml index 99d08b6727..ac9b6f4595 100644 --- a/packages/flutter_test/pubspec.yaml +++ b/packages/flutter_test/pubspec.yaml @@ -16,10 +16,10 @@ dependencies: test_api: 0.2.5 # Used by golden file comparator - path: 1.6.2 + path: 1.6.4 # We use FakeAsync and other testing utilities. - quiver: 2.0.3 + quiver: 2.0.4 # We import stack_trace because the test packages uses it and we # need to be able to unmangle the stack traces that it passed to @@ -38,7 +38,7 @@ dependencies: pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -47,4 +47,4 @@ dev_dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 1d4c +# PUBSPEC CHECKSUM: 8950 diff --git a/packages/flutter_tools/lib/src/build_runner/build_runner.dart b/packages/flutter_tools/lib/src/build_runner/build_runner.dart index 01312d8f29..6265c02172 100644 --- a/packages/flutter_tools/lib/src/build_runner/build_runner.dart +++ b/packages/flutter_tools/lib/src/build_runner/build_runner.dart @@ -27,8 +27,8 @@ import '../project.dart'; import 'build_script_generator.dart'; /// The minimum version of build_runner we can support in the flutter tool. -const String kMinimumBuildRunnerVersion = '1.4.0'; -const String kSupportedBuildDaemonVersion = '1.0.0'; +const String kMinimumBuildRunnerVersion = '1.6.5'; +const String kSupportedBuildDaemonVersion = '2.0.0'; /// A wrapper for a build_runner process which delegates to a generated /// build script. @@ -168,7 +168,9 @@ class BuildRunner extends CodeGenerator { flutterProject.directory.path, command, logHandler: (ServerLog log) { - printTrace(log.toString()); + if (log.message != null) { + printTrace(log.message); + } } ); } finally { diff --git a/packages/flutter_tools/lib/src/build_runner/build_script.dart b/packages/flutter_tools/lib/src/build_runner/build_script.dart index 9f13988c21..056ad43fbd 100644 --- a/packages/flutter_tools/lib/src/build_runner/build_script.dart +++ b/packages/flutter_tools/lib/src/build_runner/build_script.dart @@ -123,6 +123,7 @@ final List builders = [ outputExtension: ddcKernelExtension, platform: flutterWebPlatform, librariesPath: 'libraries.json', + kernelTargetName: 'ddc', ), (BuilderOptions builderOptions) => DevCompilerBuilder( useIncrementalCompiler: false, diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 9187bb5ee1..8a0fc3d4bb 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -21,10 +21,10 @@ import '../emulator.dart'; import '../globals.dart'; import '../project.dart'; import '../resident_runner.dart'; +import '../resident_web_runner.dart'; import '../run_cold.dart'; import '../run_hot.dart'; import '../runner/flutter_command.dart'; -import '../vmservice.dart'; const String protocolVersion = '0.5.3'; @@ -413,7 +413,15 @@ class AppDomain extends Domain { ResidentRunner runner; - if (enableHotReload) { + if (await device.targetPlatform == TargetPlatform.web_javascript) { + runner = ResidentWebRunner( + flutterDevice.device, + debuggingOptions: options, + flutterProject: flutterProject, + ipv6: ipv6, + target: target, + ); + } else if (enableHotReload) { runner = HotRunner( [flutterDevice], target: target, @@ -485,7 +493,8 @@ class AppDomain extends Domain { unawaited(connectionInfoCompleter.future.then( (DebugConnectionInfo info) { final Map params = { - 'port': info.httpUri.port, + // The web vmservice proxy does not have an http address. + 'port': info.httpUri?.port ?? info.wsUri.port, 'wsUri': info.wsUri.toString(), }; if (info.baseUri != null) @@ -565,8 +574,8 @@ class AppDomain extends Domain { if (app == null) throw "app '$appId' not found"; - final Isolate isolate = app.runner.flutterDevices.first.views.first.uiIsolate; - final Map result = await isolate.invokeFlutterExtensionRpcRaw(methodName, params: params); + final Map result = await app.runner + .invokeFlutterExtensionRpcRawOnFirstIsolate(methodName, params: params); if (result == null) throw 'method not available: $methodName'; diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index 6e9d86933d..c4e96c603a 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart @@ -431,7 +431,7 @@ class RunCommand extends RunCommandBase { ); } else if (webMode) { runner = ResidentWebRunner( - flutterDevices, + devices.single, target: targetFile, flutterProject: flutterProject, ipv6: ipv6, diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 1851a2b102..1559188175 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -22,11 +22,10 @@ import '../runner/flutter_command.dart'; const Map _kManuallyPinnedDependencies = { // Add pinned packages here. 'flutter_gallery_assets': '0.1.9+2', // See //examples/flutter_gallery/pubspec.yaml - 'test': '1.6.3', // | Tests are timing out at 1.6.4 https://github.com/flutter/flutter/issues/33823 + 'vm_service_client': '0.2.6+2', // Final version before being marked deprecated. + 'test': '1.6.3', // | Tests are timing out at 1.6.4 'test_api': '0.2.5', // | 'test_core': '0.2.5', // | - 'build_runner': '1.6.1', // TODO(jonahwilliams): allow newer versions - 'build_modules': '2.3.0' }; class UpdatePackagesCommand extends FlutterCommand { diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index cd618a3b8a..f881188d42 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart @@ -562,6 +562,8 @@ abstract class ResidentRunner { } } + @protected + @visibleForTesting final List flutterDevices; final String target; final DebuggingOptions debuggingOptions; @@ -599,6 +601,17 @@ abstract class ResidentRunner { }); } + /// Invoke an RPC extension method on the first attached ui isolate of the first device. + // TODO(jonahwilliams): Update/Remove this method when refactoring the resident + // runner to support a single flutter device. + Future> invokeFlutterExtensionRpcRawOnFirstIsolate( + String method, { + Map params, + }) { + return flutterDevices.first.views.first.uiIsolate + .invokeFlutterExtensionRpcRaw(method, params: params); + } + /// Whether this runner can hot reload. bool get canHotReload => hotMode; diff --git a/packages/flutter_tools/lib/src/resident_web_runner.dart b/packages/flutter_tools/lib/src/resident_web_runner.dart index be3753639d..dddf9b8b2c 100644 --- a/packages/flutter_tools/lib/src/resident_web_runner.dart +++ b/packages/flutter_tools/lib/src/resident_web_runner.dart @@ -4,38 +4,38 @@ import 'dart:async'; +import 'package:dwds/dwds.dart'; import 'package:meta/meta.dart'; -import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart'; +import 'package:vm_service_lib/vm_service_lib.dart' as vmservice; import 'application_package.dart'; -import 'asset.dart'; import 'base/common.dart'; import 'base/file_system.dart'; import 'base/logger.dart'; import 'base/terminal.dart'; import 'base/utils.dart'; import 'build_info.dart'; -import 'bundle.dart'; -import 'dart/package_map.dart'; +import 'convert.dart'; import 'device.dart'; import 'globals.dart'; import 'project.dart'; import 'resident_runner.dart'; -import 'run_hot.dart'; -import 'web/asset_server.dart'; -import 'web/chrome.dart'; -import 'web/compile.dart'; +import 'web/web_fs.dart'; + +// TODO(jonahwilliams): remove this constant when the error message is removed. +// The web engine is currently spamming this message on certain pages. Filter it out +// until we remove it entirely. See flutter/flutter##37625. +const String _kBadError = 'WARNING: 3D transformation matrix was passed to BitmapCanvas.'; /// A hot-runner which handles browser specific delegation. class ResidentWebRunner extends ResidentRunner { - ResidentWebRunner( - List flutterDevices, { + ResidentWebRunner(this.device, { String target, @required this.flutterProject, @required bool ipv6, @required DebuggingOptions debuggingOptions, }) : super( - flutterDevices, + [], target: target, debuggingOptions: debuggingOptions, ipv6: ipv6, @@ -43,41 +43,50 @@ class ResidentWebRunner extends ResidentRunner { stayResident: true, ); - WebAssetServer _server; - ProjectFileInvalidator projectFileInvalidator; - DateTime _lastCompiled; - WipConnection _connection; + final Device device; final FlutterProject flutterProject; - @override - bool get canHotReload => false; + WebFs _webFs; + DebugConnection _debugConnection; + StreamSubscription _stdOutSub; + + vmservice.VmService get _vmService => _debugConnection.vmService; @override - Future attach( - {Completer connectionInfoCompleter, - Completer appStartedCompleter}) async { - connectionInfoCompleter?.complete(DebugConnectionInfo()); - final int result = await waitForAppToFinish(); - await cleanupAtFinish(); - return result; + bool get canHotRestart { + return true; + } + + @override + Future> invokeFlutterExtensionRpcRawOnFirstIsolate( + String method, { + Map params, + }) async { + final vmservice.Response response = await _vmService.callServiceExtension(method, args: params); + return response.toJson(); } @override Future cleanupAfterSignal() async { - await _connection.sendCommand('Browser.close'); - _connection = null; - await _server?.dispose(); + await _cleanup(); } @override Future cleanupAtFinish() async { - await _connection?.sendCommand('Browser.close'); - _connection = null; - await _server?.dispose(); + await _cleanup(); + } + + Future _cleanup() async { + await _debugConnection?.close(); + await _stdOutSub?.cancel(); + await _webFs?.stop(); } @override - void printHelp({bool details}) { + void printHelp({bool details = true}) { + if (details) { + return printHelpDetails(); + } const String fire = '🔥'; const String rawMessage = ' To hot restart (and rebuild state), press "R".'; @@ -108,7 +117,8 @@ class ResidentWebRunner extends ResidentRunner { applicationBinary: null, ); if (package == null) { - printError('No application found for TargetPlatform.web_javascript'); + printError('No application found for TargetPlatform.web_javascript.'); + printError('To add web support to a project, run `flutter create --web .`.'); return 1; } if (!fs.isFileSync(mainPath)) { @@ -120,37 +130,24 @@ class ResidentWebRunner extends ResidentRunner { printError(message); return 1; } - // Start the web compiler and build the assets. - final bool success = await webCompilationProxy.initialize( - projectDirectory: flutterProject.directory, - ); - if (!success) { - throwToolExit('Failed to compile for the web.'); + Status buildStatus; + try { + buildStatus = logger.startProgress('Building application for the web...', timeout: null); + _webFs = await webFsFactory( + target: target, + flutterProject: flutterProject, + buildInfo: debuggingOptions.buildInfo, + ); + if (supportsServiceProtocol) { + _debugConnection = await _webFs.runAndDebug(); + } + } catch (err, stackTrace) { + printError(err.toString()); + printError(stackTrace.toString()); + throwToolExit('Failed to build application for the web.'); + } finally { + buildStatus.stop(); } - _lastCompiled = DateTime.now(); - final AssetBundle assetBundle = AssetBundleFactory.instance.createBundle(); - final int build = await assetBundle.build(); - if (build != 0) { - throwToolExit('Error: Failed to build asset bundle.'); - } - await writeBundle(fs.directory(getAssetBuildDirectory()), assetBundle.entries); - - // Step 2: Start an HTTP server - _server = WebAssetServer(flutterProject, target, ipv6); - await _server.initialize(); - - // Step 3: Spawn an instance of Chrome and direct it to the created server. - final String url = 'http://localhost:${_server.port}'; - final Chrome chrome = await chromeLauncher.launch(url); - final ChromeTab chromeTab = await chrome.chromeConnection.getTab((ChromeTab chromeTab) { - return chromeTab.url.contains(url); // we don't care about trailing slashes or # - }); - _connection = await chromeTab.connect(); - _connection.onClose.listen((WipConnection connection) { - exit(); - }); - - // We don't support the debugging proxy yet. appStartedCompleter?.complete(); return attach( connectionInfoCompleter: connectionInfoCompleter, @@ -158,6 +155,42 @@ class ResidentWebRunner extends ResidentRunner { ); } + @override + Future attach({ + Completer connectionInfoCompleter, + Completer appStartedCompleter, + }) async { + // Cleanup old subscriptions. These will throw if there isn't anything + // listening, which is fine because that is what we want to ensure. + try { + await _debugConnection?.vmService?.streamCancel('Stdout'); + } on vmservice.RPCError { + // Ignore this specific error. + } + try { + await _debugConnection?.vmService?.streamListen('Stdout'); + } on vmservice.RPCError { + // Ignore this specific error. + } + Uri websocketUri; + if (supportsServiceProtocol) { + _stdOutSub = _debugConnection.vmService.onStdoutEvent.listen((vmservice.Event log) { + final String message = utf8.decode(base64.decode(log.bytes)).trim(); + // TODO(jonahwilliams): remove this error once it is gone from the engine #37625. + if (!message.contains(_kBadError)) { + printStatus(message); + } + }); + websocketUri = Uri.parse(_debugConnection.wsUri); + } + connectionInfoCompleter?.complete( + DebugConnectionInfo(wsUri: websocketUri) + ); + final int result = await waitForAppToFinish(); + await cleanupAtFinish(); + return result; + } + @override Future restart({ bool fullRestart = false, @@ -165,33 +198,162 @@ class ResidentWebRunner extends ResidentRunner { String reason, bool benchmarkMode = false, }) async { + if (!fullRestart) { + return OperationResult(1, 'hot reload not supported on the web.'); + } final Stopwatch timer = Stopwatch()..start(); final Status status = logger.startProgress( 'Performing hot restart...', - timeout: timeoutConfiguration.fastOperation, + timeout: supportsServiceProtocol + ? timeoutConfiguration.fastOperation + : timeoutConfiguration.slowOperation, progressId: 'hot.restart', ); - OperationResult result = OperationResult.ok; - try { - final List invalidatedSources = ProjectFileInvalidator.findInvalidated( - lastCompiled: _lastCompiled, - urisToMonitor: [ - for (FileSystemEntity entity in flutterProject.directory - .childDirectory('lib') - .listSync(recursive: true)) - if (entity is File && entity.path.endsWith('.dart')) entity.uri - ], // Add new class to track this for web. - packagesPath: PackageMap.globalPackagesPath, - ); - await webCompilationProxy.invalidate(inputs: invalidatedSources); - await _connection.sendCommand('Page.reload'); - await Future.delayed(const Duration(milliseconds: 150)); - } catch (err) { - result = OperationResult(1, err.toString()); - } finally { - printStatus('Restarted application in ${getElapsedAsMilliseconds(timer.elapsed)}.'); - status.cancel(); + final bool success = await _webFs.recompile(); + if (!success) { + status.stop(); + return OperationResult(1, 'Failed to recompile application.'); + } + if (supportsServiceProtocol) { + final vmservice.Response reloadResponse = await _vmService.callServiceExtension('hotRestart'); + status.stop(); + printStatus('Restarted application in ${getElapsedAsMilliseconds(timer.elapsed)}.'); + return reloadResponse.type == 'Success' + ? OperationResult.ok + : OperationResult(1, reloadResponse.toString()); + } + // If we're not in hot mode, the only way to restart is to reload the tab. + await _webFs.hardRefresh(); + status.stop(); + return OperationResult.ok; + } + + @override + Future debugDumpApp() async { + try { + await _vmService.callServiceExtension( + 'ext.flutter.debugDumpApp', + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugDumpRenderTree() async { + try { + await _vmService.callServiceExtension( + 'ext.flutter.debugDumpRenderTree', + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugDumpLayerTree() async { + try { + await _vmService.callServiceExtension( + 'ext.flutter.debugDumpLayerTree', + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugDumpSemanticsTreeInTraversalOrder() async { + try { + await _vmService.callServiceExtension( + 'ext.flutter.debugDumpSemanticsTreeInTraversalOrder'); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugDumpSemanticsTreeInInverseHitTestOrder() async { + try { + await _vmService.callServiceExtension( + 'ext.flutter.debugDumpSemanticsTreeInInverseHitTestOrder'); + } on vmservice.RPCError { + return; + } + } + + + @override + Future debugToggleDebugPaintSizeEnabled() async { + try { + final vmservice.Response response = await _vmService.callServiceExtension( + 'ext.flutter.debugPaint', + ); + await _vmService.callServiceExtension( + 'ext.flutter.debugPaint', + args: {'enabled': !(response.json['enabled'] == 'true')}, + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugToggleDebugCheckElevationsEnabled() async { + try { + final vmservice.Response response = await _vmService.callServiceExtension( + 'ext.flutter.debugCheckElevationsEnabled', + ); + await _vmService.callServiceExtension( + 'ext.flutter.debugCheckElevationsEnabled', + args: {'enabled': !(response.json['enabled'] == 'true')}, + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugTogglePerformanceOverlayOverride() async { + try { + final vmservice.Response response = await _vmService.callServiceExtension( + 'ext.flutter.showPerformanceOverlay' + ); + await _vmService.callServiceExtension( + 'ext.flutter.showPerformanceOverlay', + args: {'enabled': !(response.json['enabled'] == 'true')}, + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugToggleWidgetInspector() async { + try { + final vmservice.Response response = await _vmService.callServiceExtension( + 'ext.flutter.debugToggleWidgetInspector' + ); + await _vmService.callServiceExtension( + 'ext.flutter.debugToggleWidgetInspector', + args: {'enabled': !(response.json['enabled'] == 'true')}, + ); + } on vmservice.RPCError { + return; + } + } + + @override + Future debugToggleProfileWidgetBuilds() async { + try { + final vmservice.Response response = await _vmService.callServiceExtension( + 'ext.flutter.profileWidgetBuilds' + ); + await _vmService.callServiceExtension( + 'ext.flutter.profileWidgetBuilds', + args: {'enabled': !(response.json['enabled'] == 'true')}, + ); + } on vmservice.RPCError { + return; } - return result; } } diff --git a/packages/flutter_tools/lib/src/web/asset_server.dart b/packages/flutter_tools/lib/src/web/asset_server.dart deleted file mode 100644 index ebe41bed83..0000000000 --- a/packages/flutter_tools/lib/src/web/asset_server.dart +++ /dev/null @@ -1,186 +0,0 @@ -// Copyright 2019 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import '../artifacts.dart'; -import '../base/file_system.dart'; -import '../base/io.dart'; -import '../build_info.dart'; -import '../dart/package_map.dart'; -import '../globals.dart'; -import '../project.dart'; - -/// Handles mapping requests from a dartdevc compiled application to assets. -/// -/// The server will receive size different kinds of requests: -/// -/// 1. A request to assets in the form of `/assets/foo`. These are resolved -/// relative to `build/flutter_assets`. -/// 2. A request to a bootstrap file, such as `main.dart.js`. These are -/// resolved relative to the dart tool directory. -/// 3. A request to a JavaScript asset in the form of `/packages/foo/bar.js`. -/// These are looked up relative to the correct package root of the -/// dart_tool directory. -/// 4. A request to a Dart asset in the form of `/packages/foo/bar.dart` for -/// sourcemaps. These either need to be looked up from the application lib -/// directory (if the package is the same), or found in the .packages file. -/// 5. A request for a specific dart asset such as `stack_trace_mapper.js` or -/// `dart_sdk.js`. These have fixed locations determined by [artifacts]. -/// 6. A request to `/` which is translated into `index.html`. -class WebAssetServer { - WebAssetServer(this.flutterProject, this.target, this.ipv6); - - /// The flutter project corresponding to this application. - final FlutterProject flutterProject; - - /// The entrypoint we have compiled for. - final String target; - - /// Whether to serve from ipv6 localhost. - final bool ipv6; - - HttpServer _server; - Map _packages; - - /// The port being served, or null if not initialized. - int get port => _server?.port; - - /// Initialize the server. - /// - /// Throws a [StateError] if called multiple times. - Future initialize() async { - if (_server != null) { - throw StateError('Already serving.'); - } - _packages = PackageMap(PackageMap.globalPackagesPath).map; - _server = await HttpServer.bind( - ipv6 ? InternetAddress.loopbackIPv6 : InternetAddress.loopbackIPv4, 0) - ..autoCompress = false; - _server.listen(_onRequest); - } - - /// Clean up the server. - Future dispose() { - return _server.close(); - } - - /// An HTTP server which provides JavaScript and web assets to the browser. - Future _onRequest(HttpRequest request) async { - final String targetName = '${fs.path.basenameWithoutExtension(target)}_web_entrypoint'; - if (request.method != 'GET') { - request.response.statusCode = HttpStatus.forbidden; - await request.response.close(); - return; - } - final Uri uri = request.uri; - if (uri.path == '/') { - final File file = flutterProject.directory - .childDirectory('web') - .childFile('index.html'); - await _completeRequest(request, file, 'text/html'); - } else if (uri.path.contains('stack_trace_mapper')) { - final File file = fs.file(fs.path.join( - artifacts.getArtifactPath(Artifact.engineDartSdkPath), - 'lib', - 'dev_compiler', - 'web', - 'dart_stack_trace_mapper.js' - )); - await _completeRequest(request, file, 'text/javascript'); - } else if (uri.path.contains('require.js')) { - final File file = fs.file(fs.path.join( - artifacts.getArtifactPath(Artifact.engineDartSdkPath), - 'lib', - 'dev_compiler', - 'kernel', - 'amd', - 'require.js' - )); - await _completeRequest(request, file, 'text/javascript'); - } else if (uri.path.endsWith('main.dart.js')) { - final File file = fs.file(fs.path.join( - flutterProject.dartTool.path, - 'build', - 'flutter_web', - flutterProject.manifest.appName, - 'lib', - '$targetName.dart.js', - )); - await _completeRequest(request, file, 'text/javascript'); - } else if (uri.path.endsWith('$targetName.dart.bootstrap.js')) { - final File file = fs.file(fs.path.join( - flutterProject.dartTool.path, - 'build', - 'flutter_web', - flutterProject.manifest.appName, - 'lib', - '$targetName.dart.bootstrap.js', - )); - await _completeRequest(request, file, 'text/javascript'); - } else if (uri.path.contains('dart_sdk')) { - final File file = fs.file(fs.path.join( - artifacts.getArtifactPath(Artifact.flutterWebSdk), - 'kernel', - 'amd', - 'dart_sdk.js', - )); - await _completeRequest(request, file, 'text/javascript'); - } else if (uri.path.startsWith('/packages') && uri.path.endsWith('.dart')) { - await _resolveDart(request); - } else if (uri.path.startsWith('/packages')) { - await _resolveJavascript(request); - } else if (uri.path.contains('assets')) { - await _resolveAsset(request); - } else { - request.response.statusCode = HttpStatus.notFound; - await request.response.close(); - } - } - - /// Resolves requests in the form of `/packages/foo/bar.js` or - /// `/packages/foo/bar.js.map`. - Future _resolveJavascript(HttpRequest request) async { - final List segments = fs.path.split(request.uri.path); - final String packageName = segments[2]; - final String filePath = fs.path.joinAll(segments.sublist(3)); - final Uri packageUri = flutterProject.dartTool - .childDirectory('build') - .childDirectory('flutter_web') - .childDirectory(packageName) - .childDirectory('lib') - .uri; - await _completeRequest( - request, fs.file(packageUri.resolve(filePath)), 'text/javascript'); - } - - /// Resolves requests in the form of `/packages/foo/bar.dart`. - Future _resolveDart(HttpRequest request) async { - final List segments = fs.path.split(request.uri.path); - final String packageName = segments[2]; - final String filePath = fs.path.joinAll(segments.sublist(3)); - final Uri packageUri = _packages[packageName]; - await _completeRequest(request, fs.file(packageUri.resolve(filePath))); - } - - /// Resolves requests in the form of `/assets/foo`. - Future _resolveAsset(HttpRequest request) async { - final String assetPath = request.uri.path.replaceFirst('/assets/', ''); - await _completeRequest( - request, fs.file(fs.path.join(getAssetBuildDirectory(), assetPath))); - } - - Future _completeRequest(HttpRequest request, File file, - [String contentType = 'text']) async { - if (!file.existsSync()) { - request.response.statusCode = HttpStatus.notFound; - await request.response.close(); - return; - } - request.response.statusCode = HttpStatus.ok; - if (contentType != null) { - request.response.headers.add(HttpHeaders.contentTypeHeader, contentType); - } - await request.response.addStream(file.openRead()); - await request.response.close(); - } -} diff --git a/packages/flutter_tools/lib/src/web/web_device.dart b/packages/flutter_tools/lib/src/web/web_device.dart index 689eb721aa..bcd7078246 100644 --- a/packages/flutter_tools/lib/src/web/web_device.dart +++ b/packages/flutter_tools/lib/src/web/web_device.dart @@ -36,6 +36,8 @@ class ChromeDevice extends Device { ephemeral: false, ); + // TODO(jonahwilliams): this is technically false, but requires some refactoring + // to allow hot mode restart only devices. @override bool get supportsHotReload => true; diff --git a/packages/flutter_tools/lib/src/web/web_fs.dart b/packages/flutter_tools/lib/src/web/web_fs.dart new file mode 100644 index 0000000000..76071528f3 --- /dev/null +++ b/packages/flutter_tools/lib/src/web/web_fs.dart @@ -0,0 +1,348 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:build_daemon/client.dart'; +import 'package:build_daemon/constants.dart'; +import 'package:build_daemon/constants.dart' hide BuildMode; +import 'package:build_daemon/constants.dart' as daemon show BuildMode; +import 'package:build_daemon/data/build_status.dart'; +import 'package:build_daemon/data/build_target.dart'; +import 'package:build_daemon/data/server_log.dart'; +import 'package:dwds/dwds.dart'; +import 'package:http_multi_server/http_multi_server.dart'; +import 'package:meta/meta.dart'; +import 'package:shelf/shelf.dart'; +import 'package:shelf/shelf_io.dart' as shelf_io; +import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart' hide StackTrace; + +import '../artifacts.dart'; +import '../asset.dart'; +import '../base/common.dart'; +import '../base/context.dart'; +import '../base/file_system.dart'; +import '../base/io.dart'; +import '../base/os.dart'; +import '../build_info.dart'; +import '../bundle.dart'; +import '../cache.dart'; +import '../globals.dart'; +import '../project.dart'; +import 'chrome.dart'; + +/// The name of the built web project. +const String kBuildTargetName = 'web'; + +/// A factory for creating a [Dwds] instance. +DwdsFactory get dwdsFactpory => context.get() ?? Dwds.start; + +/// The [BuildDaemonCreator] instance. +BuildDaemonCreator get buildDaemonCreator => context.get() ?? const BuildDaemonCreator(); + +/// A factory for creating a [WebFs] instance. +WebFsFactory get webFsFactory => context.get() ?? WebFs.start; + +/// A factory for creating an [HttpMultiServer] instance. +HttpMultiServerFactory get httpMultiServerFactory => context.get() ?? HttpMultiServer.bind; + +/// A function with the same signature as [HttpMultiServier.bind]. +typedef HttpMultiServerFactory = Future Function(dynamic address, int port); + +/// A function with the same signatire as [Dwds.start]. +typedef DwdsFactory = Future Function({ + @required int applicationPort, + @required int assetServerPort, + @required String applicationTarget, + @required Stream buildResults, + @required ConnectionProvider chromeConnection, + String hostname, + ReloadConfiguration reloadConfiguration, + bool serveDevTools, + LogWriter logWriter, + bool verbose, + bool enableDebugExtension, +}); + +/// A function with the same signatuure as [WebFs.start]. +typedef WebFsFactory = Future Function({ + @required String target, + @required FlutterProject flutterProject, + @required BuildInfo buildInfo, +}); + +/// The dev filesystem responsible for building and serving web applications. +class WebFs { + @visibleForTesting + WebFs( + this._client, + this._server, + this._dwds, + this._chrome, + ); + + final HttpServer _server; + final Dwds _dwds; + final Chrome _chrome; + final BuildDaemonClient _client; + + static const String _kHostName = 'localhost'; + + Future stop() async { + await _client.close(); + await _dwds.stop(); + await _server.close(force: true); + await _chrome.close(); + } + + /// Retrieve the [DebugConnection] for the current application. + Future runAndDebug() async { + final AppConnection appConnection = await _dwds.connectedApps.first; + appConnection.runMain(); + return _dwds.debugConnection(appConnection); + } + + /// Perform a hard refresh of all connected browser tabs. + Future hardRefresh() async { + final List tabs = await _chrome.chromeConnection.getTabs(); + for (ChromeTab tab in tabs) { + if (!tab.url.contains('localhost')) { + continue; + } + final WipConnection connection = await tab.connect(); + await connection.sendCommand('Page.reload'); + } + } + + /// Recompile the web application and return whether this was successful. + Future recompile() async { + _client.startBuild(); + await for (BuildResults results in _client.buildResults) { + final BuildResult result = results.results.firstWhere((BuildResult result) { + return result.target == 'web'; + }); + if (result.status == BuildStatus.failed) { + return false; + } + if (result.status == BuildStatus.succeeded) { + return true; + } + } + return true; + } + + /// Start the web compiler and asset server. + static Future start({ + @required String target, + @required FlutterProject flutterProject, + @required BuildInfo buildInfo + }) async { + // Start the build daemon and run an initial build. + final BuildDaemonClient client = await buildDaemonCreator + .startBuildDaemon(fs.currentDirectory.path, release: buildInfo.isRelease); + client.startBuild(); + // Only provide relevant build results + final Stream filteredBuildResults = client.buildResults + .asyncMap((BuildResults results) { + return results.results + .firstWhere((BuildResult result) => result.target == kBuildTargetName); + }); + final int daemonAssetPort = buildDaemonCreator.assetServerPort(fs.currentDirectory); + + // Initialize the asset bundle. + final AssetBundle assetBundle = AssetBundleFactory.instance.createBundle(); + await assetBundle.build(); + await writeBundle(fs.directory(getAssetBuildDirectory()), assetBundle.entries); + + // Initialize the dwds server. + final int port = await os.findFreePort(); + final Dwds dwds = await dwdsFactpory( + hostname: _kHostName, + applicationPort: port, + applicationTarget: kBuildTargetName, + assetServerPort: daemonAssetPort, + buildResults: filteredBuildResults, + chromeConnection: () async { + return (await ChromeLauncher.connectedInstance).chromeConnection; + }, + reloadConfiguration: ReloadConfiguration.none, + serveDevTools: true, + verbose: false, + enableDebugExtension: true, + logWriter: (dynamic level, String message) => printTrace(message), + ); + // Map the bootstrap files to the correct package directory. + final String targetBaseName = fs.path.withoutExtension(target).replaceFirst('lib/', ''); + final Map mappedUrls = { + 'main.dart.js': 'packages/${flutterProject.manifest.appName}/' + '${targetBaseName}_web_entrypoint.dart.js', + '${targetBaseName}_web_entrypoint.dart.bootstrap.js': 'packages/${flutterProject.manifest.appName}/' + '${targetBaseName}_web_entrypoint.dart.bootstrap.js', + '${targetBaseName}_web_entrypoint.digests': 'packages/${flutterProject.manifest.appName}/' + '${targetBaseName}_web_entrypoint.digests', + }; + final Handler handler = const Pipeline().addMiddleware((Handler innerHandler) { + return (Request request) async { + // Redirect the main.dart.js to the target file we decided to serve. + if (mappedUrls.containsKey(request.url.path)) { + final String newPath = mappedUrls[request.url.path]; + return innerHandler( + Request( + request.method, + Uri.parse(request.requestedUri.toString() + .replaceFirst(request.requestedUri.path, '/$newPath')), + headers: request.headers, + url: Uri.parse(request.url.toString() + .replaceFirst(request.url.path, newPath)), + ), + ); + } else { + return innerHandler(request); + } + }; + }) + .addHandler(dwds.handler); + Cascade cascade = Cascade(); + cascade = cascade.add(handler); + cascade = cascade.add(_assetHandler); + final HttpServer server = await httpMultiServerFactory(_kHostName, port); + shelf_io.serveRequests(server, cascade.handler); + final Chrome chrome = await chromeLauncher.launch('http://$_kHostName:$port/'); + return WebFs( + client, + server, + dwds, + chrome, + ); + } + + static Future _assetHandler(Request request) async { + if (request.url.path.contains('stack_trace_mapper')) { + final File file = fs.file(fs.path.join( + artifacts.getArtifactPath(Artifact.engineDartSdkPath), + 'lib', + 'dev_compiler', + 'web', + 'dart_stack_trace_mapper.js' + )); + return Response.ok(file.readAsBytesSync(), headers: { + 'Content-Type': 'text/javascript', + }); + } else if (request.url.path.contains('require.js')) { + final File file = fs.file(fs.path.join( + artifacts.getArtifactPath(Artifact.engineDartSdkPath), + 'lib', + 'dev_compiler', + 'kernel', + 'amd', + 'require.js' + )); + return Response.ok(file.readAsBytesSync(), headers: { + 'Content-Type': 'text/javascript', + }); + } else if (request.url.path.contains('dart_sdk')) { + final File file = fs.file(fs.path.join( + artifacts.getArtifactPath(Artifact.flutterWebSdk), + 'kernel', + 'amd', + 'dart_sdk.js', + )); + return Response.ok(file.readAsBytesSync(), headers: { + 'Content-Type': 'text/javascript', + }); + } else if (request.url.path.contains('assets')) { + final String assetPath = request.url.path.replaceFirst('assets/', ''); + final File file = fs.file(fs.path.join(getAssetBuildDirectory(), assetPath)); + return Response.ok(file.readAsBytesSync()); + } + return Response.notFound(''); + } +} + +/// A testable interface for starting a build daemon. +class BuildDaemonCreator { + const BuildDaemonCreator(); + + /// Start a build daemon and register the web targets. + Future startBuildDaemon(String workingDirectory, {bool release = false}) async { + try { + final BuildDaemonClient client = await _connectClient( + workingDirectory, + release: release, + ); + _registerBuildTargets(client); + return client; + } on OptionsSkew { + throwToolExit( + 'Incompatible options with current running build daemon.\n\n' + 'Please stop other flutter_tool instances running in this directory ' + 'before starting a new instance with these options.'); + } + return null; + } + + void _registerBuildTargets( + BuildDaemonClient client, + ) { + final OutputLocation outputLocation = OutputLocation((OutputLocationBuilder b) => b + ..output = '' + ..useSymlinks = true + ..hoist = false); + client.registerBuildTarget(DefaultBuildTarget((DefaultBuildTargetBuilder b) => b + ..target = 'web' + ..outputLocation = outputLocation?.toBuilder())); + } + + Future _connectClient( + String workingDirectory, + { bool release } + ) { + final String flutterToolsPackages = fs.path.join(Cache.flutterRoot, 'packages', 'flutter_tools', '.packages'); + final String buildScript = fs.path.join(Cache.flutterRoot, 'packages', 'flutter_tools', 'lib', 'src', 'build_runner', 'build_script.dart'); + final String flutterWebSdk = artifacts.getArtifactPath(Artifact.flutterWebSdk); + return BuildDaemonClient.connect( + workingDirectory, + // On Windows we need to call the snapshot directly otherwise + // the process will start in a disjoint cmd without access to + // STDIO. + [ + artifacts.getArtifactPath(Artifact.engineDartBinary), + '--packages=$flutterToolsPackages', + buildScript, + 'daemon', + '--skip-build-script-check', + '--define', 'flutter_tools:ddc=flutterWebSdk=$flutterWebSdk', + '--define', 'flutter_tools:entrypoint=flutterWebSdk=$flutterWebSdk', + '--define', 'flutter_tools:entrypoint=release=$release', + '--define', 'flutter_tools:shell=flutterWebSdk=$flutterWebSdk', + ], + logHandler: (ServerLog serverLog) { + switch (serverLog.level) { + case Level.CONFIG: + case Level.FINE: + case Level.FINER: + case Level.FINEST: + case Level.INFO: + printTrace(serverLog.message); + break; + case Level.SEVERE: + case Level.SHOUT: + printError( + serverLog?.error ?? '', + stackTrace: serverLog.stackTrace != null + ? StackTrace.fromString(serverLog?.stackTrace) + : null, + ); + } + }, + buildMode: daemon.BuildMode.Manual, + ); + } + + /// Retrieve the asset server port for the current daemon. + int assetServerPort(Directory workingDirectory) { + final String portFilePath = fs.path.join(daemonWorkspace(workingDirectory.path), '.asset_server_port'); + return int.tryParse(fs.file(portFilePath).readAsStringSync()); + } +} \ No newline at end of file diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index a73bc45574..6f0a9b1565 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -11,9 +11,9 @@ dependencies: # To update these, use "flutter update-packages --force-upgrade". archive: 2.0.10 args: 1.5.2 - bsdiff: 0.1.0 + dwds: 0.4.0 completion: 0.2.1+1 - coverage: 0.13.2 + coverage: 0.12.4 crypto: 2.0.6 file: 5.0.8+1 http: 0.12.0+2 @@ -21,20 +21,21 @@ dependencies: json_rpc_2: 2.1.0 linter: 0.1.93 meta: 1.1.7 - multicast_dns: 0.1.1 + multicast_dns: 0.2.0 mustache: 1.1.1 package_config: 1.0.5 - platform: 2.2.0 + platform: 2.2.1 plugin: 0.2.0+3 process: 3.0.9 - quiver: 2.0.3 + quiver: 2.0.4 stack_trace: 1.9.3 stream_channel: 2.0.0 usage: 3.4.1 vm_service_client: 0.2.6+2 web_socket_channel: 1.0.14 - webkit_inspection_protocol: 0.5.0 + webkit_inspection_protocol: 0.4.2 xml: 3.5.0 + webdev: 2.3.0 yaml: 2.1.16 flutter_goldens_client: path: ../flutter_goldens_client @@ -47,25 +48,30 @@ dependencies: test_core: 0.2.5 # Code generation dependencies - build_runner_core: 3.0.6 + build_runner_core: 3.0.7 dart_style: 1.2.9 code_builder: 3.2.0 build: 1.1.5 - build_modules: 2.3.0 - build_daemon: 1.1.0 + build_modules: 2.4.1 + build_daemon: 2.0.0 build_web_compilers: 2.1.4 analyzer: 0.36.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" bazel_worker: 0.1.21 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - build_config: 0.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + browser_launcher: 0.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + build_config: 0.4.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" build_resolvers: 1.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" built_collection: 4.2.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" built_value: 6.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + checked_yaml: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + codemirror: 0.5.7+5.48.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + devtools: 0.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + devtools_server: 0.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" fixnum: 0.10.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" front_end: 0.1.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -79,44 +85,54 @@ dependencies: kernel: 0.3.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + octicons_css: 0.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" package_resolver: 1.0.10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" petitparser: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform_detect: 1.3.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + plotly_js: 0.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + polymer_css: 0.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pool: 1.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + primer_css: 0.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pubspec_parse: 0.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - scratch_space: 0.0.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + rxdart: 0.21.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + scratch_space: 0.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + shelf_proxy: 0.1.0+7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_map_stack_trace: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_maps: 0.10.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + split: 0.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + sse: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_transform: 0.0.19 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" timing: 0.1.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + uuid: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + vm_service_lib: 3.20.0+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" watcher: 0.9.7+12 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dev_dependencies: collection: 1.14.11 mockito: 4.1.0 file_testing: 2.1.0 - vm_service_lib: 3.22.2 test: 1.6.3 - build_runner: 1.6.1 - build_vm_compilers: 1.0.1 + build_runner: 1.6.5 + build_vm_compilers: 1.0.2 build_test: 0.10.8 - mime: 0.9.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - node_preamble: 1.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + node_preamble: 1.4.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: f131 +# PUBSPEC CHECKSUM: a0fa diff --git a/packages/flutter_tools/test/general.shard/commands/build_web_test.dart b/packages/flutter_tools/test/general.shard/commands/build_web_test.dart index 3046570dd5..c31a5e98f9 100644 --- a/packages/flutter_tools/test/general.shard/commands/build_web_test.dart +++ b/packages/flutter_tools/test/general.shard/commands/build_web_test.dart @@ -12,7 +12,6 @@ import 'package:flutter_tools/src/commands/build.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/project.dart'; -import 'package:flutter_tools/src/resident_runner.dart'; import 'package:flutter_tools/src/resident_web_runner.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:flutter_tools/src/web/compile.dart'; @@ -71,7 +70,7 @@ void main() { fs.file(fs.path.join('web', 'index.html')).deleteSync(); final ResidentWebRunner runner = ResidentWebRunner( - [], + null, flutterProject: FlutterProject.current(), ipv6: false, debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart new file mode 100644 index 0000000000..186cf708b9 --- /dev/null +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart @@ -0,0 +1,108 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:dwds/dwds.dart'; +import 'package:flutter_tools/src/base/common.dart'; +import 'package:flutter_tools/src/base/file_system.dart'; +import 'package:flutter_tools/src/build_info.dart'; +import 'package:flutter_tools/src/device.dart'; +import 'package:flutter_tools/src/project.dart'; +import 'package:flutter_tools/src/resident_runner.dart'; +import 'package:flutter_tools/src/resident_web_runner.dart'; +import 'package:flutter_tools/src/web/web_fs.dart'; +import 'package:meta/meta.dart'; +import 'package:mockito/mockito.dart'; +import 'package:vm_service_lib/vm_service_lib.dart'; + +import '../src/common.dart'; +import '../src/testbed.dart'; + +void main() { + Testbed testbed; + MockFlutterWebFs mockWebFs; + ResidentWebRunner residentWebRunner; + + setUp(() { + mockWebFs = MockFlutterWebFs(); + final MockWebDevice mockWebDevice = MockWebDevice(); + testbed = Testbed( + setup: () { + residentWebRunner = ResidentWebRunner( + mockWebDevice, + flutterProject: FlutterProject.current(), + debuggingOptions: DebuggingOptions.disabled(BuildInfo.release), + ipv6: true, + ); + }, + overrides: { + WebFsFactory: () => ({ + @required String target, + @required FlutterProject flutterProject, + @required BuildInfo buildInfo, + }) async { + return mockWebFs; + }, + }); + }); + + void _setupMocks() { + fs.file('pubspec.yaml').createSync(); + fs.file(fs.path.join('lib', 'main.dart')).createSync(recursive: true); + fs.file(fs.path.join('web', 'index.html')).createSync(recursive: true); + when(mockWebFs.runAndDebug()).thenThrow(StateError('debugging not supported')); + } + + test('Can successfully run and connect without vmservice', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + final DebugConnectionInfo debugConnectionInfo = await connectionInfoCompleter.future; + + expect(debugConnectionInfo.wsUri, null); + })); + + test('Can full restart after attaching', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockWebFs.recompile()).thenAnswer((Invocation _) async { + return true; + }); + when(mockWebFs.hardRefresh()).thenAnswer((Invocation _) async { }); + final OperationResult result = await residentWebRunner.restart(fullRestart: true); + + expect(result.code, 0); + })); + + test('Fails on compilation errors in hot restart', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockWebFs.recompile()).thenAnswer((Invocation _) async { + return false; + }); + final OperationResult result = await residentWebRunner.restart(fullRestart: true); + + expect(result.code, 1); + expect(result.message, contains('Failed to recompile application.')); + })); + +} + + +class MockWebDevice extends Mock implements Device {} +class MockBuildDaemonCreator extends Mock implements BuildDaemonCreator {} +class MockFlutterWebFs extends Mock implements WebFs {} +class MockDebugConnection extends Mock implements DebugConnection {} +class MockVmService extends Mock implements VmService {} diff --git a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart new file mode 100644 index 0000000000..f9291fc77b --- /dev/null +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart @@ -0,0 +1,311 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'dart:async'; + +import 'package:dwds/dwds.dart'; +import 'package:flutter_tools/src/base/common.dart'; +import 'package:flutter_tools/src/base/file_system.dart'; +import 'package:flutter_tools/src/base/logger.dart'; +import 'package:flutter_tools/src/build_info.dart'; +import 'package:flutter_tools/src/device.dart'; +import 'package:flutter_tools/src/globals.dart'; +import 'package:flutter_tools/src/project.dart'; +import 'package:flutter_tools/src/resident_runner.dart'; +import 'package:flutter_tools/src/resident_web_runner.dart'; +import 'package:flutter_tools/src/web/web_fs.dart'; +import 'package:meta/meta.dart'; +import 'package:mockito/mockito.dart'; +import 'package:vm_service_lib/vm_service_lib.dart'; + +import '../src/common.dart'; +import '../src/testbed.dart'; + +void main() { + Testbed testbed; + MockFlutterWebFs mockWebFs; + ResidentWebRunner residentWebRunner; + MockDebugConnection mockDebugConnection; + MockVmService mockVmService; + + setUp(() { + mockWebFs = MockFlutterWebFs(); + mockDebugConnection = MockDebugConnection(); + mockVmService = MockVmService(); + final MockWebDevice mockWebDevice = MockWebDevice(); + testbed = Testbed( + setup: () { + residentWebRunner = ResidentWebRunner( + mockWebDevice, + flutterProject: FlutterProject.current(), + debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), + ipv6: true, + ); + }, + overrides: { + WebFsFactory: () => ({ + @required String target, + @required FlutterProject flutterProject, + @required BuildInfo buildInfo, + }) async { + return mockWebFs; + }, + }); + }); + + void _setupMocks() { + fs.file('pubspec.yaml').createSync(); + fs.file(fs.path.join('lib', 'main.dart')).createSync(recursive: true); + fs.file(fs.path.join('web', 'index.html')).createSync(recursive: true); + when(mockWebFs.runAndDebug()).thenAnswer((Invocation _) async { + return mockDebugConnection; + }); + when(mockDebugConnection.vmService).thenReturn(mockVmService); + when(mockVmService.onStdoutEvent).thenAnswer((Invocation _) { + return const Stream.empty(); + }); + when(mockDebugConnection.wsUri).thenReturn('ws://127.0.0.1/abcd/'); + } + + test('Exits on run if application does not support the web', () => testbed.run(() async { + fs.file('pubspec.yaml').createSync(); + final BufferLogger bufferLogger = logger; + + expect(await residentWebRunner.run(), 1); + expect(bufferLogger.errorText, contains('No application found for TargetPlatform.web_javascript')); + })); + + test('Exits on run if target file does not exist', () => testbed.run(() async { + fs.file('pubspec.yaml').createSync(); + fs.file(fs.path.join('web', 'index.html')).createSync(recursive: true); + final BufferLogger bufferLogger = logger; + + expect(await residentWebRunner.run(), 1); + final String absoluteMain = fs.path.absolute(fs.path.join('lib', 'main.dart')); + expect(bufferLogger.errorText, contains('Tried to run $absoluteMain, but that file does not exist.')); + })); + + test('Can successfully run and connect to vmservice', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + final DebugConnectionInfo debugConnectionInfo = await connectionInfoCompleter.future; + + expect(debugConnectionInfo.wsUri.toString(), 'ws://127.0.0.1/abcd/'); + })); + + test('Can not hot reload after attaching', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + final OperationResult result = await residentWebRunner.restart(fullRestart: false); + + expect(result.code, 1); + expect(result.message, contains('hot reload not supported on the web.')); + })); + + test('Can hot restart after attaching', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockWebFs.recompile()).thenAnswer((Invocation _) async { + return true; + }); + when(mockVmService.callServiceExtension('hotRestart')).thenAnswer((Invocation _) async { + return Response.parse({'type': 'Success'}); + }); + final OperationResult result = await residentWebRunner.restart(fullRestart: true); + + expect(result.code, 0); + })); + + test('Fails on compilation errors in hot restart', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockWebFs.recompile()).thenAnswer((Invocation _) async { + return false; + }); + final OperationResult result = await residentWebRunner.restart(fullRestart: true); + + expect(result.code, 1); + expect(result.message, contains('Failed to recompile application.')); + })); + + test('Fails on vmservice response error', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockWebFs.recompile()).thenAnswer((Invocation _) async { + return true; + }); + when(mockVmService.callServiceExtension('hotRestart')).thenAnswer((Invocation _) async { + return Response.parse({'type': 'Failed'}); + }); + final OperationResult result = await residentWebRunner.restart(fullRestart: true); + + expect(result.code, 1); + expect(result.message, contains('Failed')); + })); + + test('printHelp without details is spoopy', () => testbed.run(() async { + residentWebRunner.printHelp(details: false); + final BufferLogger bufferLogger = logger; + + expect(bufferLogger.statusText, contains('👻')); + })); + + test('debugDumpApp', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + await residentWebRunner.debugDumpApp(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugDumpApp')).called(1); + })); + + test('debugDumpLayerTree', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + await residentWebRunner.debugDumpLayerTree(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugDumpLayerTree')).called(1); + })); + + test('debugDumpRenderTree', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + await residentWebRunner.debugDumpRenderTree(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugDumpRenderTree')).called(1); + })); + + test('debugDumpSemanticsTreeInTraversalOrder', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + await residentWebRunner.debugDumpSemanticsTreeInTraversalOrder(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugDumpSemanticsTreeInTraversalOrder')).called(1); + })); + + test('debugDumpSemanticsTreeInInverseHitTestOrder', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + await residentWebRunner.debugDumpSemanticsTreeInInverseHitTestOrder(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugDumpSemanticsTreeInInverseHitTestOrder')).called(1); + })); + + test('debugToggleDebugPaintSizeEnabled', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockVmService.callServiceExtension('ext.flutter.debugPaint')) + .thenAnswer((Invocation _) async { + return Response.parse({'enabled': false}); + }); + await residentWebRunner.debugToggleDebugPaintSizeEnabled(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugPaint', + args: {'enabled': true})).called(1); + })); + + + test('debugTogglePerformanceOverlayOverride', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockVmService.callServiceExtension('ext.flutter.showPerformanceOverlay')) + .thenAnswer((Invocation _) async { + return Response.parse({'enabled': false}); + }); + + await residentWebRunner.debugTogglePerformanceOverlayOverride(); + + verify(mockVmService.callServiceExtension('ext.flutter.showPerformanceOverlay', + args: {'enabled': true})).called(1); + })); + + test('debugToggleWidgetInspector', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockVmService.callServiceExtension('ext.flutter.debugToggleWidgetInspector')) + .thenAnswer((Invocation _) async { + return Response.parse({'enabled': false}); + }); + + await residentWebRunner.debugToggleWidgetInspector(); + + verify(mockVmService.callServiceExtension('ext.flutter.debugToggleWidgetInspector', + args: {'enabled': true})).called(1); + })); + + test('debugToggleProfileWidgetBuilds', () => testbed.run(() async { + _setupMocks(); + final Completer connectionInfoCompleter = Completer(); + unawaited(residentWebRunner.run( + connectionInfoCompleter: connectionInfoCompleter, + )); + await connectionInfoCompleter.future; + when(mockVmService.callServiceExtension('ext.flutter.profileWidgetBuilds')) + .thenAnswer((Invocation _) async { + return Response.parse({'enabled': false}); + }); + + await residentWebRunner.debugToggleProfileWidgetBuilds(); + + verify(mockVmService.callServiceExtension('ext.flutter.profileWidgetBuilds', + args: {'enabled': true})).called(1); + })); +} + + +class MockWebDevice extends Mock implements Device {} +class MockBuildDaemonCreator extends Mock implements BuildDaemonCreator {} +class MockFlutterWebFs extends Mock implements WebFs {} +class MockDebugConnection extends Mock implements DebugConnection {} +class MockVmService extends Mock implements VmService {} diff --git a/packages/flutter_tools/test/general.shard/web/web_fs_test.dart b/packages/flutter_tools/test/general.shard/web/web_fs_test.dart new file mode 100644 index 0000000000..0f198677f0 --- /dev/null +++ b/packages/flutter_tools/test/general.shard/web/web_fs_test.dart @@ -0,0 +1,95 @@ +// Copyright 2019 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import 'package:build_daemon/client.dart'; +import 'package:build_daemon/data/build_status.dart'; +import 'package:dwds/dwds.dart'; +import 'package:flutter_tools/src/base/file_system.dart'; +import 'package:flutter_tools/src/base/os.dart'; +import 'package:flutter_tools/src/build_info.dart'; +import 'package:flutter_tools/src/project.dart'; +import 'package:flutter_tools/src/web/chrome.dart'; +import 'package:flutter_tools/src/web/web_fs.dart'; +import 'package:http_multi_server/http_multi_server.dart'; +import 'package:meta/meta.dart'; +import 'package:mockito/mockito.dart'; + +import '../../src/common.dart'; +import '../../src/testbed.dart'; + +void main() { + Testbed testbed; + MockBuildDaemonCreator mockBuildDaemonCreator; + MockDwds mockDwds; + MockChromeLauncher mockChromeLauncher; + MockHttpMultiServer mockHttpMultiServer; + MockBuildDaemonClient mockBuildDaemonClient; + MockOperatingSystemUtils mockOperatingSystemUtils; + + setUp(() { + mockBuildDaemonCreator = MockBuildDaemonCreator(); + mockChromeLauncher = MockChromeLauncher(); + mockHttpMultiServer = MockHttpMultiServer(); + mockBuildDaemonClient = MockBuildDaemonClient(); + mockOperatingSystemUtils = MockOperatingSystemUtils(); + mockDwds = MockDwds(); + when(mockBuildDaemonCreator.startBuildDaemon(any, release: anyNamed('release'))) + .thenAnswer((Invocation _) async { + return mockBuildDaemonClient; + }); + when(mockOperatingSystemUtils.findFreePort()).thenAnswer((Invocation _) async { + return 1234; + }); + when(mockBuildDaemonClient.buildResults).thenAnswer((Invocation _) { + return const Stream.empty(); + }); + when(mockBuildDaemonCreator.assetServerPort(any)).thenReturn(4321); + testbed = Testbed( + overrides: { + OperatingSystemUtils: () => mockOperatingSystemUtils, + BuildDaemonCreator: () => mockBuildDaemonCreator, + ChromeLauncher: () => mockChromeLauncher, + HttpMultiServerFactory: () => (dynamic address, int port) async { + return mockHttpMultiServer; + }, + DwdsFactory: () => ({ + @required int applicationPort, + @required int assetServerPort, + @required String applicationTarget, + @required Stream buildResults, + @required ConnectionProvider chromeConnection, + String hostname, + ReloadConfiguration reloadConfiguration, + bool serveDevTools, + LogWriter logWriter, + bool verbose, + bool enableDebugExtension}) async { + return mockDwds; + }, + } + ); + }); + + test('Can create webFs from mocked interfaces', () => testbed.run(() async { + await WebFs.start( + target: fs.path.join('lib', 'main.dart'), + buildInfo: BuildInfo.debug, + flutterProject: FlutterProject.current(), + ); + + // The build daemon is told to build once. + verify(mockBuildDaemonClient.startBuild()).called(1); + + // Chrome is launched based on port from above. + verify(mockChromeLauncher.launch('http://localhost:1234/')).called(1); + })); +} + +class MockBuildDaemonCreator extends Mock implements BuildDaemonCreator {} +class MockBuildDaemonClient extends Mock implements BuildDaemonClient {} +class MockDwds extends Mock implements Dwds {} +class MockHttpMultiServer extends Mock implements HttpMultiServer {} +class MockChromeLauncher extends Mock implements ChromeLauncher {} +class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {} + diff --git a/packages/flutter_tools/tool/tool_coverage.dart b/packages/flutter_tools/tool/tool_coverage.dart index 865ef6ca53..60c2cafbf3 100644 --- a/packages/flutter_tools/tool/tool_coverage.dart +++ b/packages/flutter_tools/tool/tool_coverage.dart @@ -16,7 +16,7 @@ import 'package:stream_channel/isolate_channel.dart'; import 'package:stream_channel/stream_channel.dart'; import 'package:test_core/src/runner/hack_register_platform.dart' as hack; // ignore: implementation_imports import 'package:test_core/src/executable.dart' as test; // ignore: implementation_imports -import 'package:vm_service_client/vm_service_client.dart'; +import 'package:vm_service_client/vm_service_client.dart'; // ignore: deprecated_member_use import 'package:test_api/src/backend/runtime.dart'; // ignore: implementation_imports import 'package:test_api/src/backend/suite_platform.dart'; // ignore: implementation_imports import 'package:test_core/src/runner/platform.dart'; // ignore: implementation_imports diff --git a/packages/fuchsia_remote_debug_protocol/pubspec.yaml b/packages/fuchsia_remote_debug_protocol/pubspec.yaml index 370705d9a2..f2856fb37c 100644 --- a/packages/fuchsia_remote_debug_protocol/pubspec.yaml +++ b/packages/fuchsia_remote_debug_protocol/pubspec.yaml @@ -26,15 +26,15 @@ dependencies: intl: 0.15.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pedantic: 1.8.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - platform: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + platform: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" pub_semver: 1.4.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - quiver: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + quiver: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stack_trace: 1.9.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_channel: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - string_scanner: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + string_scanner: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" test_api: 0.2.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -44,4 +44,4 @@ dependencies: dev_dependencies: mockito: 4.1.0 -# PUBSPEC CHECKSUM: e14c +# PUBSPEC CHECKSUM: 8d51