diff --git a/dev/automated_tests/pubspec.yaml b/dev/automated_tests/pubspec.yaml index 400d874952..7f456c2ba6 100644 --- a/dev/automated_tests/pubspec.yaml +++ b/dev/automated_tests/pubspec.yaml @@ -11,8 +11,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -31,7 +31,7 @@ dependencies: image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -73,4 +73,4 @@ flutter: assets: - icon/ -# PUBSPEC CHECKSUM: b497 +# PUBSPEC CHECKSUM: 203d diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 3298601dbe..486ab5a2e2 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -47,8 +47,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -60,7 +60,7 @@ dev_dependencies: image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # 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_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -92,4 +92,4 @@ flutter: - packages/flutter_gallery_assets/people/square/ali.png - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png -# PUBSPEC CHECKSUM: a305 +# PUBSPEC CHECKSUM: adaa diff --git a/dev/benchmarks/macrobenchmarks/pubspec.yaml b/dev/benchmarks/macrobenchmarks/pubspec.yaml index 1e0ff22944..9acd4185f8 100644 --- a/dev/benchmarks/macrobenchmarks/pubspec.yaml +++ b/dev/benchmarks/macrobenchmarks/pubspec.yaml @@ -47,8 +47,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -60,7 +60,7 @@ dev_dependencies: image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # 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_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -93,4 +93,4 @@ flutter: - packages/flutter_gallery_assets/food/cherry_pie.png - assets/999x1000.png -# PUBSPEC CHECKSUM: a305 +# PUBSPEC CHECKSUM: adaa diff --git a/dev/benchmarks/microbenchmarks/pubspec.yaml b/dev/benchmarks/microbenchmarks/pubspec.yaml index ee525e6606..9f44298faf 100644 --- a/dev/benchmarks/microbenchmarks/pubspec.yaml +++ b/dev/benchmarks/microbenchmarks/pubspec.yaml @@ -15,8 +15,8 @@ dependencies: path: ../../../examples/stocks test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,11 +35,11 @@ dependencies: http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" intl: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - intl_translation: 0.17.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + intl_translation: 0.17.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" isolate: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -78,4 +78,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 28ef +# PUBSPEC CHECKSUM: a196 diff --git a/dev/bots/pubspec.yaml b/dev/bots/pubspec.yaml index f0b484e6a3..830a3e16d8 100644 --- a/dev/bots/pubspec.yaml +++ b/dev/bots/pubspec.yaml @@ -19,8 +19,8 @@ dependencies: test: 1.9.4 _discoveryapis_commons: 0.1.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.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" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,7 +35,7 @@ dependencies: intl: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -69,4 +69,4 @@ dev_dependencies: mockito: 4.1.1 test_api: 0.2.11 -# PUBSPEC CHECKSUM: de61 +# PUBSPEC CHECKSUM: 2a07 diff --git a/dev/devicelab/pubspec.yaml b/dev/devicelab/pubspec.yaml index f1b4880331..92a88612fe 100644 --- a/dev/devicelab/pubspec.yaml +++ b/dev/devicelab/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: stack_trace: 1.9.3 vm_service_client: 0.2.6+2 - logging: 0.11.3+2 + logging: 0.11.4 archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -41,8 +41,8 @@ dev_dependencies: # See packages/flutter_test/pubspec.yaml for why we're pinning this version. test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -76,4 +76,4 @@ dev_dependencies: watcher: 0.9.7+13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 5416 +# PUBSPEC CHECKSUM: 29bb diff --git a/dev/integration_tests/android_semantics_testing/pubspec.yaml b/dev/integration_tests/android_semantics_testing/pubspec.yaml index 30ec21f90e..346a0eefb5 100644 --- a/dev/integration_tests/android_semantics_testing/pubspec.yaml +++ b/dev/integration_tests/android_semantics_testing/pubspec.yaml @@ -8,8 +8,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -30,7 +30,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -70,4 +70,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ef1f +# PUBSPEC CHECKSUM: 87c4 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 b96b3c11a6..246288387f 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 @@ -42,8 +42,8 @@ dev_dependencies: # The following section is specific to Flutter. - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -64,7 +64,7 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -139,4 +139,4 @@ flutter: # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages -# PUBSPEC CHECKSUM: 3bab +# PUBSPEC CHECKSUM: 8651 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 baec5a3fbb..cd3f66dec1 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 @@ -42,8 +42,8 @@ dev_dependencies: # The following section is specific to Flutter. - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -64,7 +64,7 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -139,4 +139,4 @@ flutter: # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages -# PUBSPEC CHECKSUM: 3bab +# PUBSPEC CHECKSUM: 8651 diff --git a/dev/integration_tests/android_views/pubspec.yaml b/dev/integration_tests/android_views/pubspec.yaml index 69c5e3b9ef..97e528b36b 100644 --- a/dev/integration_tests/android_views/pubspec.yaml +++ b/dev/integration_tests/android_views/pubspec.yaml @@ -45,8 +45,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -58,7 +58,7 @@ dev_dependencies: image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # 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_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -87,4 +87,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: a885 +# PUBSPEC CHECKSUM: 7d2b diff --git a/dev/integration_tests/channels/pubspec.yaml b/dev/integration_tests/channels/pubspec.yaml index cc7f138efc..932d55d18f 100644 --- a/dev/integration_tests/channels/pubspec.yaml +++ b/dev/integration_tests/channels/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -34,7 +34,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -74,4 +74,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ef1f +# PUBSPEC CHECKSUM: 87c4 diff --git a/dev/integration_tests/codegen/pubspec.yaml b/dev/integration_tests/codegen/pubspec.yaml index 9d36b49719..5d9e571e3d 100644 --- a/dev/integration_tests/codegen/pubspec.yaml +++ b/dev/integration_tests/codegen/pubspec.yaml @@ -39,8 +39,8 @@ dependencies: dev_dependencies: test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -51,7 +51,7 @@ dev_dependencies: http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # 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_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -81,4 +81,4 @@ builders: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ef1f +# PUBSPEC CHECKSUM: 87c4 diff --git a/dev/integration_tests/external_ui/pubspec.yaml b/dev/integration_tests/external_ui/pubspec.yaml index 43508fd35e..2398772524 100644 --- a/dev/integration_tests/external_ui/pubspec.yaml +++ b/dev/integration_tests/external_ui/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -34,7 +34,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -74,4 +74,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ef1f +# PUBSPEC CHECKSUM: 87c4 diff --git a/dev/integration_tests/flavors/pubspec.yaml b/dev/integration_tests/flavors/pubspec.yaml index fbf6ec2fc1..bffd47c171 100644 --- a/dev/integration_tests/flavors/pubspec.yaml +++ b/dev/integration_tests/flavors/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -34,7 +34,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -74,4 +74,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ef1f +# PUBSPEC CHECKSUM: 87c4 diff --git a/dev/integration_tests/flutter_driver_screenshot_test/pubspec.yaml b/dev/integration_tests/flutter_driver_screenshot_test/pubspec.yaml index 496b838fd6..3439a66754 100644 --- a/dev/integration_tests/flutter_driver_screenshot_test/pubspec.yaml +++ b/dev/integration_tests/flutter_driver_screenshot_test/pubspec.yaml @@ -40,8 +40,8 @@ dependencies: dev_dependencies: test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -52,7 +52,7 @@ dev_dependencies: http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # 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_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -80,4 +80,4 @@ flutter: assets: - assets/ -# PUBSPEC CHECKSUM: 4fef +# PUBSPEC CHECKSUM: 4c95 diff --git a/dev/integration_tests/image_loading/pubspec.yaml b/dev/integration_tests/image_loading/pubspec.yaml index f546b3ae29..9c575912a3 100644 --- a/dev/integration_tests/image_loading/pubspec.yaml +++ b/dev/integration_tests/image_loading/pubspec.yaml @@ -7,8 +7,8 @@ dependencies: test: 1.9.4 mockito: 4.1.1 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.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" @@ -25,7 +25,7 @@ dependencies: http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -62,4 +62,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: a196 +# PUBSPEC CHECKSUM: 7e3c diff --git a/dev/integration_tests/platform_interaction/pubspec.yaml b/dev/integration_tests/platform_interaction/pubspec.yaml index 1c1e39b8ef..134eaad3f7 100644 --- a/dev/integration_tests/platform_interaction/pubspec.yaml +++ b/dev/integration_tests/platform_interaction/pubspec.yaml @@ -12,8 +12,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -34,7 +34,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -74,4 +74,4 @@ dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: ef1f +# PUBSPEC CHECKSUM: 87c4 diff --git a/dev/integration_tests/release_smoke_test/pubspec.yaml b/dev/integration_tests/release_smoke_test/pubspec.yaml index 828f1f52dc..ca59315ff0 100644 --- a/dev/integration_tests/release_smoke_test/pubspec.yaml +++ b/dev/integration_tests/release_smoke_test/pubspec.yaml @@ -17,7 +17,7 @@ dev_dependencies: flutter_test: sdk: flutter - e2e: 0.2.2+3 + e2e: 0.2.3 archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -40,4 +40,4 @@ dev_dependencies: test_api: 0.2.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" xml: 3.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: b430 +# PUBSPEC CHECKSUM: b7d2 diff --git a/dev/integration_tests/simple_codegen/pubspec.yaml b/dev/integration_tests/simple_codegen/pubspec.yaml index 856e9aec59..67b7356251 100644 --- a/dev/integration_tests/simple_codegen/pubspec.yaml +++ b/dev/integration_tests/simple_codegen/pubspec.yaml @@ -4,8 +4,8 @@ description: A package for testing codegen dependencies: build: 1.2.2 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.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" @@ -16,7 +16,7 @@ dependencies: glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_io: 1.0.1+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,4 +35,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: 1591 +# PUBSPEC CHECKSUM: 0537 diff --git a/dev/integration_tests/ui/pubspec.yaml b/dev/integration_tests/ui/pubspec.yaml index 57406cd571..a41e4add37 100644 --- a/dev/integration_tests/ui/pubspec.yaml +++ b/dev/integration_tests/ui/pubspec.yaml @@ -13,8 +13,8 @@ dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -35,7 +35,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.8 # 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" @@ -83,4 +83,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 9f06 +# PUBSPEC CHECKSUM: 29ab diff --git a/dev/snippets/pubspec.yaml b/dev/snippets/pubspec.yaml index 8556988c81..6003631d14 100644 --- a/dev/snippets/pubspec.yaml +++ b/dev/snippets/pubspec.yaml @@ -18,8 +18,8 @@ dependencies: meta: 1.1.8 platform: 2.2.1 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.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" collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -51,7 +51,7 @@ dev_dependencies: http_multi_server: 2.1.0 # 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" io: 0.3.3 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -100,4 +100,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: 16a0 +# PUBSPEC CHECKSUM: 0146 diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index 75a520ccc2..6a4faecb01 100644 --- a/dev/tools/pubspec.yaml +++ b/dev/tools/pubspec.yaml @@ -33,8 +33,8 @@ dev_dependencies: test_api: 0.2.11 mockito: 4.1.1 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # 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" coverage: 0.13.3+3 # 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" @@ -43,7 +43,7 @@ dev_dependencies: http_multi_server: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -68,4 +68,4 @@ dev_dependencies: web_socket_channel: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" yaml: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" -# PUBSPEC CHECKSUM: 3560 +# PUBSPEC CHECKSUM: 1406 diff --git a/examples/catalog/pubspec.yaml b/examples/catalog/pubspec.yaml index 61c8fec287..2c973bf9bf 100644 --- a/examples/catalog/pubspec.yaml +++ b/examples/catalog/pubspec.yaml @@ -22,8 +22,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -44,7 +44,7 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -83,4 +83,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 9f06 +# PUBSPEC CHECKSUM: 29ab diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 5c71a88521..f26b5133ca 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: string_scanner: 1.0.5 url_launcher: 5.4.1 cupertino_icons: 0.1.3 - video_player: 0.10.5+1 + video_player: 0.10.5+2 scoped_model: 1.0.1 shrine_images: 1.1.2 @@ -45,8 +45,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -65,7 +65,7 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -271,4 +271,4 @@ flutter: - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf -# PUBSPEC CHECKSUM: 95d9 +# PUBSPEC CHECKSUM: 4680 diff --git a/examples/flutter_gallery/test_driver/scroll_perf_web_test.dart b/examples/flutter_gallery/test_driver/scroll_perf_web_test.dart index 485bf7cba8..c8aa2e502c 100644 --- a/examples/flutter_gallery/test_driver/scroll_perf_web_test.dart +++ b/examples/flutter_gallery/test_driver/scroll_perf_web_test.dart @@ -12,7 +12,7 @@ void main() { FlutterDriver driver; setUpAll(() async { - driver = await FlutterDriver.connect(browser: true); + driver = await FlutterDriver.connect(); }); tearDownAll(() async { @@ -21,28 +21,23 @@ void main() { }); test('measure', () async { - final Timeline timeline = await driver.traceAction(() async { - await driver.tap(find.text('Material')); + await driver.tap(find.text('Material')); - final SerializableFinder demoList = find.byValueKey('GalleryDemoList'); + final SerializableFinder demoList = find.byValueKey('GalleryDemoList'); - // TODO(eseidel): These are very artificial scrolls, we should use better - // https://github.com/flutter/flutter/issues/3316 - // Scroll down - for (int i = 0; i < 5; i++) { - await driver.scroll(demoList, 0.0, -300.0, const Duration(milliseconds: 300)); - await Future.delayed(const Duration(milliseconds: 500)); - } + // TODO(eseidel): These are very artificial scrolls, we should use better + // https://github.com/flutter/flutter/issues/3316 + // Scroll down + for (int i = 0; i < 5; i++) { + await driver.scroll(demoList, 0.0, -300.0, const Duration(milliseconds: 300)); + await Future.delayed(const Duration(milliseconds: 500)); + } - // Scroll up - for (int i = 0; i < 5; i++) { - await driver.scroll(demoList, 0.0, 300.0, const Duration(milliseconds: 300)); - await Future.delayed(const Duration(milliseconds: 500)); - } - }); - - TimelineSummary.summarize(timeline) - ..writeTimelineToFile('home_scroll_perf', pretty: true); + // Scroll up + for (int i = 0; i < 5; i++) { + await driver.scroll(demoList, 0.0, 300.0, const Duration(milliseconds: 300)); + await Future.delayed(const Duration(milliseconds: 500)); + } }); }); } diff --git a/examples/platform_channel/pubspec.yaml b/examples/platform_channel/pubspec.yaml index a79c8fa2a0..a16a7429ac 100644 --- a/examples/platform_channel/pubspec.yaml +++ b/examples/platform_channel/pubspec.yaml @@ -20,8 +20,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -42,7 +42,7 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -82,4 +82,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 9f06 +# PUBSPEC CHECKSUM: 29ab diff --git a/examples/platform_channel_swift/pubspec.yaml b/examples/platform_channel_swift/pubspec.yaml index e06848bf05..f626757f4c 100644 --- a/examples/platform_channel_swift/pubspec.yaml +++ b/examples/platform_channel_swift/pubspec.yaml @@ -20,8 +20,8 @@ dev_dependencies: sdk: flutter test: 1.9.4 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -42,7 +42,7 @@ dev_dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -82,4 +82,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: 9f06 +# PUBSPEC CHECKSUM: 29ab diff --git a/examples/stocks/pubspec.yaml b/examples/stocks/pubspec.yaml index 118100b94c..5a2b68d143 100644 --- a/examples/stocks/pubspec.yaml +++ b/examples/stocks/pubspec.yaml @@ -10,12 +10,12 @@ dependencies: flutter_localizations: sdk: flutter intl: 0.16.1 - intl_translation: 0.17.8 + intl_translation: 0.17.9 http: 0.12.0+4 isolate: 2.0.2 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.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" @@ -59,7 +59,7 @@ dev_dependencies: image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" io: 0.3.3 # 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" - logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" @@ -87,4 +87,4 @@ dev_dependencies: flutter: uses-material-design: true -# PUBSPEC CHECKSUM: f026 +# PUBSPEC CHECKSUM: cfcc diff --git a/packages/flutter_driver/lib/src/driver/driver.dart b/packages/flutter_driver/lib/src/driver/driver.dart index 0a81556e29..96debdeb5c 100644 --- a/packages/flutter_driver/lib/src/driver/driver.dart +++ b/packages/flutter_driver/lib/src/driver/driver.dart @@ -3,6 +3,7 @@ // found in the LICENSE file. import 'dart:async'; +import 'dart:io'; import 'package:json_rpc_2/json_rpc_2.dart' as rpc; import 'package:meta/meta.dart'; @@ -86,18 +87,17 @@ abstract class FlutterDriver { FlutterDriver(); /// Creates a driver that uses a connection provided by either the combination - /// of [webConnection] and [browser], or the combination of [serviceClient], + /// of [webConnection], or the combination of [serviceClient], /// [peer] and [appIsolate] @visibleForTesting factory FlutterDriver.connectedTo({ FlutterWebConnection webConnection, - Browser browser, VMServiceClient serviceClient, rpc.Peer peer, VMIsolate appIsolate, }) { - if (webConnection != null && browser != null) { - return WebFlutterDriver.connectedTo(webConnection, browser); + if (webConnection != null) { + return WebFlutterDriver.connectedTo(webConnection); } return VMServiceFlutterDriver.connectedTo(serviceClient, peer, appIsolate); } @@ -140,11 +140,9 @@ abstract class FlutterDriver { bool logCommunicationToFile = true, int isolateNumber, Pattern fuchsiaModuleTarget, - bool browser = false, Duration timeout, }) async { - - if (browser) { + if (Platform.environment['FLUTTER_WEB_TEST'] != null) { return WebFlutterDriver.connectWeb(hostUrl: dartVmServiceUrl, timeout: timeout); } return VMServiceFlutterDriver.connect( @@ -561,7 +559,9 @@ abstract class FlutterDriver { /// In practice, sometimes the device gets really busy for a while and /// even two seconds isn't enough, which means that this is still racy /// and a source of flakes. - Future> screenshot() => throw UnimplementedError(); + Future> screenshot() { + throw UnimplementedError(); + } /// Returns the Flags set in the Dart VM as JSON. /// @@ -584,8 +584,9 @@ abstract class FlutterDriver { /// [getFlagList]: https://github.com/dart-lang/sdk/blob/master/runtime/vm/service/service.md#getflaglist /// /// Throws [UnimplementedError] on [WebFlutterDriver] instances. - Future>> getVmFlags() => throw UnimplementedError(); - + Future>> getVmFlags() { + throw UnimplementedError(); + } /// Starts recording performance traces. /// /// The `timeout` argument causes a warning to be displayed to the user if the @@ -596,7 +597,9 @@ abstract class FlutterDriver { Future startTracing({ List streams = const [TimelineStream.all], Duration timeout = kUnusuallyLongTimeout, - }) => throw UnimplementedError(); + }) { + throw UnimplementedError(); + } /// Stops recording performance traces and downloads the timeline. /// @@ -607,8 +610,9 @@ abstract class FlutterDriver { /// For [WebFlutterDriver], this is only supported for Chrome. Future stopTracingAndDownloadTimeline({ Duration timeout = kUnusuallyLongTimeout, - }) => throw UnimplementedError(); - + }) { + throw UnimplementedError(); + } /// Runs [action] and outputs a performance trace for it. /// /// Waits for the `Future` returned by [action] to complete prior to stopping @@ -632,7 +636,9 @@ abstract class FlutterDriver { Future action(), { List streams = const [TimelineStream.all], bool retainPriorEvents = false, - }) => throw UnimplementedError(); + }) { + throw UnimplementedError(); + } /// Clears all timeline events recorded up until now. /// @@ -643,8 +649,9 @@ abstract class FlutterDriver { /// For [WebFlutterDriver], this is only supported for Chrome. Future clearTimeline({ Duration timeout = kUnusuallyLongTimeout, - }) => throw UnimplementedError(); - + }) { + throw UnimplementedError(); + } /// [action] will be executed with the frame sync mechanism disabled. /// /// By default, Flutter Driver waits until there is no pending frame scheduled @@ -675,12 +682,16 @@ abstract class FlutterDriver { /// Force a garbage collection run in the VM. /// /// Throws [UnimplementedError] on [WebFlutterDriver] instances. - Future forceGC() => throw UnimplementedError(); + Future forceGC() { + throw UnimplementedError(); + } /// Closes the underlying connection to the VM service. /// /// Returns a [Future] that fires once the connection has been closed. - Future close() => throw UnimplementedError(); + Future close() { + throw UnimplementedError(); + } } /// Provides convenient accessors to frequently used finders. diff --git a/packages/flutter_driver/lib/src/driver/web_driver.dart b/packages/flutter_driver/lib/src/driver/web_driver.dart index a11c93957c..c85eee0888 100644 --- a/packages/flutter_driver/lib/src/driver/web_driver.dart +++ b/packages/flutter_driver/lib/src/driver/web_driver.dart @@ -5,7 +5,6 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'dart:math' as math; import 'package:matcher/matcher.dart'; import 'package:meta/meta.dart'; @@ -17,9 +16,6 @@ import '../common/error.dart'; import '../common/message.dart'; import 'driver.dart'; import 'timeline.dart'; -import 'web_driver_config.dart'; - -export 'web_driver_config.dart'; /// An implementation of the Flutter Driver using the WebDriver. /// @@ -27,15 +23,14 @@ export 'web_driver_config.dart'; /// 1. Have Selenium server (https://bit.ly/2TlkRyu) and WebDriver binary (https://chromedriver.chromium.org/downloads) downloaded and placed under the same folder /// 2. Launch WebDriver Server: java -jar selenium-server-standalone-3.141.59.jar /// 3. Launch Flutter Web application: flutter run -v -d chrome --target=test_driver/scroll_perf_web.dart -/// 4. Run test script: flutter drive --target=test_driver/scroll_perf.dart -v --use-existing-app=/application address/ +/// 4. Run test script: flutter drive --target=test_driver/scroll_perf_web.dart -v --use-existing-app=/application address/ class WebFlutterDriver extends FlutterDriver { /// Creates a driver that uses a connection provided by the given - /// [_connection] and [_browserName]. - WebFlutterDriver.connectedTo(this._connection, this._browser) : + /// [_connection]. + WebFlutterDriver.connectedTo(this._connection) : _startTime = DateTime.now(); final FlutterWebConnection _connection; - final Browser _browser; DateTime _startTime; /// Start time for tracing @@ -50,21 +45,22 @@ class WebFlutterDriver extends FlutterDriver { /// Creates a driver that uses a connection provided by the given /// [hostUrl] which would fallback to environment variable VM_SERVICE_URL. - /// Driver also depends on environment variables BROWSER_NAME, - /// BROWSER_DIMENSION, HEADLESS and SELENIUM_PORT for configurations. + /// Driver also depends on environment variables DRIVER_SESSION_ID, + /// BROWSER_SUPPORTS_TIMELINE, DRIVER_SESSION_URI, DRIVER_SESSION_SPEC + /// and DRIVER_SESSION_CAPABILITIES for configurations. static Future connectWeb( {String hostUrl, Duration timeout}) async { hostUrl ??= Platform.environment['VM_SERVICE_URL']; - final Browser browser = browserNameToEnum(Platform.environment['BROWSER_NAME']); final Map settings = { - 'browser': browser, - 'browser-dimension': Platform.environment['BROWSER_DIMENSION'], - 'headless': Platform.environment['HEADLESS']?.toLowerCase() == 'true', - 'selenium-port': Platform.environment['SELENIUM_PORT'], + 'support-timeline-action': Platform.environment['SUPPORT_TIMELINE_ACTION'] == 'true', + 'session-id': Platform.environment['DRIVER_SESSION_ID'], + 'session-uri': Platform.environment['DRIVER_SESSION_URI'], + 'session-spec': Platform.environment['DRIVER_SESSION_SPEC'], + 'session-capabilities': Platform.environment['DRIVER_SESSION_CAPABILITIES'], }; final FlutterWebConnection connection = await FlutterWebConnection.connect (hostUrl, settings, timeout: timeout); - return WebFlutterDriver.connectedTo(connection, browser); + return WebFlutterDriver.connectedTo(connection); } @override @@ -160,8 +156,8 @@ class WebFlutterDriver extends FlutterDriver { /// Checks whether browser supports Timeline related operations void _checkBrowserSupportsTimeline() { - if (_browser != Browser.chrome) { - throw UnimplementedError(); + if (_connection.supportsTimelineAction) { + throw UnsupportedError('Timeline action is not supported by current testing browser'); } } } @@ -169,10 +165,24 @@ class WebFlutterDriver extends FlutterDriver { /// Encapsulates connection information to an instance of a Flutter Web application. class FlutterWebConnection { /// Creates a FlutterWebConnection with WebDriver - FlutterWebConnection(this._driver); + /// and whether the WebDriver supports timeline action + FlutterWebConnection(this._driver, this._supportsTimelineAction); final sync_io.WebDriver _driver; + + bool _supportsTimelineAction; + /// Whether the connected WebDriver supports timeline action for Flutter Web Driver + // ignore: unnecessary_getters_setters + bool get supportsTimelineAction => _supportsTimelineAction; + + /// Setter for _supportsTimelineAction + @visibleForTesting + // ignore: unnecessary_getters_setters + set supportsTimelineAction(bool value) { + _supportsTimelineAction = value; + } + /// Starts WebDriver with the given [capabilities] and /// establishes the connection to Flutter Web application. static Future connect( @@ -181,13 +191,15 @@ class FlutterWebConnection { {Duration timeout}) async { // Use sync WebDriver because async version will create a 15 seconds // overhead when quitting. - final sync_io.WebDriver driver = createDriver(settings); + final sync_io.WebDriver driver = sync_io.fromExistingSession( + settings['session-id'].toString(), + uri: Uri.parse(settings['session-uri'].toString()), + spec: _convertToSpec(settings['session-spec'].toString().toLowerCase()), + capabilities: jsonDecode(settings['session-capabilities'].toString()) as Map); driver.get(url); - setDriverLocationAndDimension(driver, settings); - await waitUntilExtensionInstalled(driver, timeout); - return FlutterWebConnection(driver); + return FlutterWebConnection(driver, settings['support-timeline-action'] as bool); } /// Sends command via WebDriver to Flutter web application @@ -224,24 +236,7 @@ class FlutterWebConnection { /// Closes the WebDriver. Future close() async { - _driver.quit(); - } -} - -/// Configures the location and dimension of WebDriver. -void setDriverLocationAndDimension(sync_io.WebDriver driver, Map settings) { - final List dimensions = settings['browser-dimension'].split(',') as List; - if (dimensions.length != 2) { - throw DriverError('Invalid browser window size.'); - } - final int x = int.parse(dimensions[0]); - final int y = int.parse(dimensions[1]); - final sync_io.Window window = driver.window; - try { - window.setLocation(const math.Point(0, 0)); - window.setSize(math.Rectangle(0, 0, x, y)); - } catch (_) { - // Error might be thrown in some browsers. + _driver.quit(closeSession: false); } } @@ -252,3 +247,14 @@ Future waitUntilExtensionInstalled(sync_io.WebDriver driver, Duration time matcher: 'function', timeout: timeout ?? const Duration(days: 365)); } + +sync_io.WebDriverSpec _convertToSpec(String specString) { + switch (specString.toLowerCase()) { + case 'webdriverspec.w3c': + return sync_io.WebDriverSpec.W3c; + case 'webdriverspec.jsonwire': + return sync_io.WebDriverSpec.JsonWire; + default: + return sync_io.WebDriverSpec.Auto; + } +} diff --git a/packages/flutter_driver/lib/src/driver/web_driver_config.dart b/packages/flutter_driver/lib/src/driver/web_driver_config.dart deleted file mode 100644 index f2a7a5fc86..0000000000 --- a/packages/flutter_driver/lib/src/driver/web_driver_config.dart +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright 2014 The Flutter 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:meta/meta.dart'; -import 'package:webdriver/sync_io.dart' as sync_io; - -import '../common/error.dart'; - -/// A list of supported browsers -enum Browser { - /// Chrome: https://www.google.com/chrome/ - chrome, - /// Edge: https://www.microsoft.com/en-us/windows/microsoft-edge - edge, - /// Firefox: https://www.mozilla.org/en-US/firefox/ - firefox, - /// Safari in iOS: https://www.apple.com/safari/ - iosSafari, - /// Safari in macOS: https://www.apple.com/safari/ - safari, -} - -/// Converts [browserName] string to [Browser] -Browser browserNameToEnum(String browserName){ - switch (browserName) { - case 'chrome': return Browser.chrome; - case 'edge': return Browser.edge; - case 'firefox': return Browser.firefox; - case 'ios-safari': return Browser.iosSafari; - case 'safari': return Browser.safari; - } - throw DriverError('Browser $browserName not supported'); -} - -/// Creates a WebDriver instance with the given [settings]. -sync_io.WebDriver createDriver(Map settings) { - return _createDriver( - settings['selenium-port'] as String, - settings['browser'] as Browser, - settings['headless'] as bool - ); -} - -sync_io.WebDriver _createDriver(String seleniumPort, Browser browser, bool headless) { - return sync_io.createDriver( - uri: Uri.parse('http://localhost:$seleniumPort/wd/hub/'), - desired: getDesiredCapabilities(browser, headless), - spec: browser != Browser.iosSafari ? sync_io.WebDriverSpec.JsonWire : sync_io.WebDriverSpec.W3c - ); -} - -/// Returns desired capabilities for given [browser] and [headless]. -@visibleForTesting -Map getDesiredCapabilities(Browser browser, bool headless) { - switch (browser) { - case Browser.chrome: - return { - 'acceptInsecureCerts': true, - 'browserName': 'chrome', - 'goog:loggingPrefs': { sync_io.LogType.performance: 'ALL'}, - 'chromeOptions': { - 'args': [ - '--bwsi', - '--disable-background-timer-throttling', - '--disable-default-apps', - '--disable-extensions', - '--disable-popup-blocking', - '--disable-translate', - '--no-default-browser-check', - '--no-sandbox', - '--no-first-run', - if (headless) '--headless' - ], - 'perfLoggingPrefs': { - 'traceCategories': - 'devtools.timeline,' - 'v8,blink.console,benchmark,blink,' - 'blink.user_timing' - } - } - }; - break; - case Browser.firefox: - return { - 'acceptInsecureCerts': true, - 'browserName': 'firefox', - 'moz:firefoxOptions' : { - 'args': [ - if (headless) '-headless' - ], - 'prefs': { - 'dom.file.createInChild': true, - 'dom.timeout.background_throttling_max_budget': -1, - 'media.autoplay.default': 0, - 'media.gmp-manager.url': '', - 'media.gmp-provider.enabled': false, - 'network.captive-portal-service.enabled': false, - 'security.insecure_field_warning.contextual.enabled': false, - 'test.currentTimeOffsetSeconds': 11491200 - }, - 'log': {'level': 'trace'} - } - }; - break; - case Browser.edge: - return { - 'acceptInsecureCerts': true, - 'browserName': 'edge', - }; - break; - case Browser.safari: - return { - 'browserName': 'safari', - 'safari.options': { - 'skipExtensionInstallation': true, - 'cleanSession': true - } - }; - break; - case Browser.iosSafari: - return { - 'platformName': 'ios', - 'browserName': 'safari', - 'safari:useSimulator': true - }; - default: - throw DriverError('Browser $browser not supported.'); - } -} diff --git a/packages/flutter_driver/test/flutter_driver_test.dart b/packages/flutter_driver/test/flutter_driver_test.dart index 894ed5182b..a4eacc4318 100644 --- a/packages/flutter_driver/test/flutter_driver_test.dart +++ b/packages/flutter_driver/test/flutter_driver_test.dart @@ -694,7 +694,8 @@ void main() { setUp(() { mockConnection = MockFlutterWebConnection(); - driver = WebFlutterDriver.connectedTo(mockConnection, Browser.chrome); + mockConnection.supportsTimelineAction = true; + driver = WebFlutterDriver.connectedTo(mockConnection); }); test('closes connection', () async { @@ -1033,7 +1034,8 @@ void main() { setUp(() { mockConnection = MockFlutterWebConnection(); - driver = WebFlutterDriver.connectedTo(mockConnection, Browser.edge); + mockConnection.supportsTimelineAction = false; + driver = WebFlutterDriver.connectedTo(mockConnection); }); test('tracing', () async { diff --git a/packages/flutter_driver/test/src/real_tests/web_driver_config_test.dart b/packages/flutter_driver/test/src/real_tests/web_driver_config_test.dart deleted file mode 100644 index b6afbf8cc0..0000000000 --- a/packages/flutter_driver/test/src/real_tests/web_driver_config_test.dart +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright 2014 The Flutter 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:flutter_driver/src/driver/web_driver_config.dart'; -import 'package:webdriver/sync_io.dart' as sync_io; - -import '../../common.dart'; - -void main() { - group('getDesiredCapabilities', () { - test('Chrome with headless on', () { - final Map expected = { - 'acceptInsecureCerts': true, - 'browserName': 'chrome', - 'goog:loggingPrefs': { sync_io.LogType.performance: 'ALL'}, - 'chromeOptions': { - 'args': [ - '--bwsi', - '--disable-background-timer-throttling', - '--disable-default-apps', - '--disable-extensions', - '--disable-popup-blocking', - '--disable-translate', - '--no-default-browser-check', - '--no-sandbox', - '--no-first-run', - '--headless' - ], - 'perfLoggingPrefs': { - 'traceCategories': - 'devtools.timeline,' - 'v8,blink.console,benchmark,blink,' - 'blink.user_timing' - } - } - }; - - expect(getDesiredCapabilities(Browser.chrome, true), expected); - }); - - test('Chrome with headless off', () { - final Map expected = { - 'acceptInsecureCerts': true, - 'browserName': 'chrome', - 'goog:loggingPrefs': { sync_io.LogType.performance: 'ALL'}, - 'chromeOptions': { - 'args': [ - '--bwsi', - '--disable-background-timer-throttling', - '--disable-default-apps', - '--disable-extensions', - '--disable-popup-blocking', - '--disable-translate', - '--no-default-browser-check', - '--no-sandbox', - '--no-first-run', - ], - 'perfLoggingPrefs': { - 'traceCategories': - 'devtools.timeline,' - 'v8,blink.console,benchmark,blink,' - 'blink.user_timing' - } - } - }; - - expect(getDesiredCapabilities(Browser.chrome, false), expected); - - }); - - test('Firefox with headless on', () { - final Map expected = { - 'acceptInsecureCerts': true, - 'browserName': 'firefox', - 'moz:firefoxOptions' : { - 'args': ['-headless'], - 'prefs': { - 'dom.file.createInChild': true, - 'dom.timeout.background_throttling_max_budget': -1, - 'media.autoplay.default': 0, - 'media.gmp-manager.url': '', - 'media.gmp-provider.enabled': false, - 'network.captive-portal-service.enabled': false, - 'security.insecure_field_warning.contextual.enabled': false, - 'test.currentTimeOffsetSeconds': 11491200 - }, - 'log': {'level': 'trace'} - } - }; - - expect(getDesiredCapabilities(Browser.firefox, true), expected); - }); - - test('Firefox with headless off', () { - final Map expected = { - 'acceptInsecureCerts': true, - 'browserName': 'firefox', - 'moz:firefoxOptions' : { - 'args': [], - 'prefs': { - 'dom.file.createInChild': true, - 'dom.timeout.background_throttling_max_budget': -1, - 'media.autoplay.default': 0, - 'media.gmp-manager.url': '', - 'media.gmp-provider.enabled': false, - 'network.captive-portal-service.enabled': false, - 'security.insecure_field_warning.contextual.enabled': false, - 'test.currentTimeOffsetSeconds': 11491200 - }, - 'log': {'level': 'trace'} - } - }; - - expect(getDesiredCapabilities(Browser.firefox, false), expected); - }); - - test('Edge', () { - final Map expected = { - 'acceptInsecureCerts': true, - 'browserName': 'edge', - }; - - expect(getDesiredCapabilities(Browser.edge, false), expected); - }); - - test('macOS Safari', () { - final Map expected = { - 'browserName': 'safari', - 'safari.options': { - 'skipExtensionInstallation': true, - 'cleanSession': true - } - }; - - expect(getDesiredCapabilities(Browser.safari, false), expected); - }); - - test('iOS Safari', () { - final Map expected = { - 'platformName': 'ios', - 'browserName': 'safari', - 'safari:useSimulator': true - }; - - expect(getDesiredCapabilities(Browser.iosSafari, false), expected); - }); - }); -} diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 2321d8a544..e33f9befcf 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart @@ -3,12 +3,18 @@ // found in the LICENSE file. import 'dart:async'; +import 'dart:math' as math; + +import 'package:webdriver/sync_io.dart' as sync_io; +import 'package:meta/meta.dart'; import '../application_package.dart'; import '../base/common.dart'; import '../base/file_system.dart'; import '../base/process.dart'; +import '../build_info.dart'; import '../cache.dart'; +import '../convert.dart'; import '../dart/package_map.dart'; import '../dart/sdk.dart'; import '../device.dart'; @@ -136,13 +142,15 @@ class DriveCommand extends RunCommandBase { } String observatoryUri; + final bool isWebPlatform = await device.targetPlatform == TargetPlatform.web_javascript; if (argResults['use-existing-app'] == null) { globals.printStatus('Starting application: $targetFile'); - if (getBuildInfo().isRelease) { + if (getBuildInfo().isRelease && !isWebPlatform) { // This is because we need VM service to be able to drive the app. + // For Flutter Web, testing in release mode is allowed. throwToolExit( - 'Flutter Driver does not support running in release mode.\n' + 'Flutter Driver (non-web) does not support running in release mode.\n' '\n' 'Use --profile mode for testing application performance.\n' 'Use --debug (default) mode for testing correctness (with assertions).' @@ -163,12 +171,44 @@ class DriveCommand extends RunCommandBase { final Map environment = { 'VM_SERVICE_URL': observatoryUri, - 'SELENIUM_PORT': argResults['driver-port'].toString(), - 'BROWSER_NAME': argResults['browser-name'].toString(), - 'BROWSER_DIMENSION': argResults['browser-dimension'].toString(), - 'HEADLESS': argResults['headless'].toString(), }; + sync_io.WebDriver driver; + // For web device, WebDriver session will be launched beforehand + // so that FlutterDriver can reuse it. + if (isWebPlatform) { + // start WebDriver + final Browser browser = _browserNameToEnum(argResults['browser-name'].toString()); + driver = _createDriver( + argResults['driver-port'].toString(), + browser, + argResults['headless'].toString() == 'true', + ); + + // set window size + final List dimensions = argResults['browser-dimension'].split(',') as List; + assert(dimensions.length == 2); + final int x = int.parse(dimensions[0]); + final int y = int.parse(dimensions[1]); + final sync_io.Window window = driver.window; + try { + window.setLocation(const math.Point(0, 0)); + window.setSize(math.Rectangle(0, 0, x, y)); + } catch (_) { + // Error might be thrown in some browsers. + } + + // add driver info to environment variables + environment.addAll( { + 'DRIVER_SESSION_ID': driver.id, + 'DRIVER_SESSION_URI': driver.uri.toString(), + 'DRIVER_SESSION_SPEC': driver.spec.toString(), + 'DRIVER_SESSION_CAPABILITIES': jsonEncode(driver.capabilities), + 'SUPPORT_TIMELINE_ACTION': (browser == Browser.chrome).toString(), + 'FLUTTER_WEB_TEST': 'true', + }); + } + try { await testRunner([testFile], environment); } catch (error, stackTrace) { @@ -177,6 +217,7 @@ class DriveCommand extends RunCommandBase { } throwToolExit('CAUGHT EXCEPTION: $error\n$stackTrace'); } finally { + driver?.quit(); if (boolArg('keep-app-running') ?? (argResults['use-existing-app'] != null)) { globals.printStatus('Leaving the application running.'); } else { @@ -368,3 +409,118 @@ Future _stopApp(DriveCommand command) async { await command._deviceLogSubscription?.cancel(); return stopped; } + +/// A list of supported browsers +@visibleForTesting +enum Browser { + /// Chrome: https://www.google.com/chrome/ + chrome, + /// Edge: https://www.microsoft.com/en-us/windows/microsoft-edge + edge, + /// Firefox: https://www.mozilla.org/en-US/firefox/ + firefox, + /// Safari in iOS: https://www.apple.com/safari/ + iosSafari, + /// Safari in macOS: https://www.apple.com/safari/ + safari, +} + +/// Converts [browserName] string to [Browser] +Browser _browserNameToEnum(String browserName){ + switch (browserName) { + case 'chrome': return Browser.chrome; + case 'edge': return Browser.edge; + case 'firefox': return Browser.firefox; + case 'ios-safari': return Browser.iosSafari; + case 'safari': return Browser.safari; + } + throw UnsupportedError('Browser $browserName not supported'); +} + +sync_io.WebDriver _createDriver(String driverPort, Browser browser, bool headless) { + return sync_io.createDriver( + uri: Uri.parse('http://localhost:$driverPort/wd/hub/'), + desired: getDesiredCapabilities(browser, headless), + spec: browser != Browser.iosSafari ? sync_io.WebDriverSpec.JsonWire : sync_io.WebDriverSpec.W3c + ); +} + +/// Returns desired capabilities for given [browser] and [headless]. +@visibleForTesting +Map getDesiredCapabilities(Browser browser, bool headless) { + switch (browser) { + case Browser.chrome: + return { + 'acceptInsecureCerts': true, + 'browserName': 'chrome', + 'goog:loggingPrefs': { sync_io.LogType.performance: 'ALL'}, + 'chromeOptions': { + 'w3c': false, + 'args': [ + '--bwsi', + '--disable-background-timer-throttling', + '--disable-default-apps', + '--disable-extensions', + '--disable-popup-blocking', + '--disable-translate', + '--no-default-browser-check', + '--no-sandbox', + '--no-first-run', + if (headless) '--headless' + ], + 'perfLoggingPrefs': { + 'traceCategories': + 'devtools.timeline,' + 'v8,blink.console,benchmark,blink,' + 'blink.user_timing' + } + } + }; + break; + case Browser.firefox: + return { + 'acceptInsecureCerts': true, + 'browserName': 'firefox', + 'moz:firefoxOptions' : { + 'args': [ + if (headless) '-headless' + ], + 'prefs': { + 'dom.file.createInChild': true, + 'dom.timeout.background_throttling_max_budget': -1, + 'media.autoplay.default': 0, + 'media.gmp-manager.url': '', + 'media.gmp-provider.enabled': false, + 'network.captive-portal-service.enabled': false, + 'security.insecure_field_warning.contextual.enabled': false, + 'test.currentTimeOffsetSeconds': 11491200 + }, + 'log': {'level': 'trace'} + } + }; + break; + case Browser.edge: + return { + 'acceptInsecureCerts': true, + 'browserName': 'edge', + }; + break; + case Browser.safari: + return { + 'browserName': 'safari', + 'safari.options': { + 'skipExtensionInstallation': true, + 'cleanSession': true + } + }; + break; + case Browser.iosSafari: + return { + 'platformName': 'ios', + 'browserName': 'safari', + 'safari:useSimulator': true + }; + default: + throw UnsupportedError('Browser $browser not supported.'); + } +} diff --git a/packages/flutter_tools/pubspec.yaml b/packages/flutter_tools/pubspec.yaml index 934b086d2e..5d3529f989 100644 --- a/packages/flutter_tools/pubspec.yaml +++ b/packages/flutter_tools/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: # To update these, use "flutter update-packages --force-upgrade". archive: 2.0.11 args: 1.5.2 - dwds: 0.8.5 + dwds: 0.9.0 completion: 0.2.1+1 coverage: 0.13.3+3 crypto: 2.1.3 @@ -19,7 +19,7 @@ dependencies: http: 0.12.0+4 intl: 0.16.1 json_rpc_2: 2.1.0 - linter: 0.1.107 + linter: 0.1.109 meta: 1.1.8 multicast_dns: 0.2.2 mustache: 1.1.1 @@ -32,6 +32,7 @@ dependencies: stream_channel: 2.0.0 usage: 3.4.1 vm_service_client: 0.2.6+2 + webdriver: 2.1.1 web_socket_channel: 1.1.0 webkit_inspection_protocol: 0.5.0 xml: 3.5.0 @@ -52,18 +53,18 @@ dependencies: build: 1.2.2 build_modules: 2.7.0 build_daemon: 2.1.3 - build_web_compilers: 2.7.2 + build_web_compilers: 2.8.0 - _fe_analyzer_shared: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - analyzer: 0.39.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" bazel_worker: 0.1.23 # 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" browser_launcher: 0.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" build_config: 0.4.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - build_resolvers: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + build_resolvers: 1.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" built_collection: 4.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" - built_value: 7.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" + built_value: 7.0.8 # 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.2 # 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" @@ -79,7 +80,7 @@ dependencies: io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" json_annotation: 3.0.1 # 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" + logging: 0.11.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" matcher: 0.12.6 # 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" node_interop: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -103,6 +104,7 @@ dependencies: sse: 3.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" stream_transform: 1.1.0 # 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" + sync_http: 0.1.4 # 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+2 # 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" @@ -117,7 +119,7 @@ dev_dependencies: test: 1.9.4 build_runner: 1.7.3 build_vm_compilers: 1.0.4 - build_test: 0.10.11 + build_test: 0.10.12 multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" node_preamble: 1.4.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -127,4 +129,4 @@ dartdoc: # Exclude this package from the hosted API docs. nodoc: true -# PUBSPEC CHECKSUM: f341 +# PUBSPEC CHECKSUM: 8f2f diff --git a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart index 75c2424a3d..3801cf51a7 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/drive_test.dart @@ -17,6 +17,7 @@ import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/build_info.dart'; import 'package:mockito/mockito.dart'; import 'package:flutter_tools/src/globals.dart' as globals; +import 'package:webdriver/sync_io.dart' as sync_io; import '../../src/common.dart'; import '../../src/context.dart'; @@ -177,10 +178,6 @@ void main() { // VM_SERVICE_URL is not set by drive command arguments expect(environment, { 'VM_SERVICE_URL': 'null', - 'SELENIUM_PORT': '4567', - 'BROWSER_NAME': 'firefox', - 'BROWSER_DIMENSION': '1024,768', - 'HEADLESS': 'false', }); return null; }); @@ -196,10 +193,6 @@ void main() { 'drive', '--target=$testApp', '--no-pub', - '--no-headless', - '--driver-port=4567', - '--browser-name=firefox', - '--browser-dimension=1024,768', ]; await createTestCommandRunner(command).run(args); expect(testLogger.errorText, isEmpty); @@ -584,6 +577,147 @@ void main() { ); }); }); + + group('getDesiredCapabilities', () { + test('Chrome with headless on', () { + final Map expected = { + 'acceptInsecureCerts': true, + 'browserName': 'chrome', + 'goog:loggingPrefs': { sync_io.LogType.performance: 'ALL'}, + 'chromeOptions': { + 'w3c': false, + 'args': [ + '--bwsi', + '--disable-background-timer-throttling', + '--disable-default-apps', + '--disable-extensions', + '--disable-popup-blocking', + '--disable-translate', + '--no-default-browser-check', + '--no-sandbox', + '--no-first-run', + '--headless' + ], + 'perfLoggingPrefs': { + 'traceCategories': + 'devtools.timeline,' + 'v8,blink.console,benchmark,blink,' + 'blink.user_timing' + } + } + }; + + expect(getDesiredCapabilities(Browser.chrome, true), expected); + }); + + test('Chrome with headless off', () { + final Map expected = { + 'acceptInsecureCerts': true, + 'browserName': 'chrome', + 'goog:loggingPrefs': { sync_io.LogType.performance: 'ALL'}, + 'chromeOptions': { + 'w3c': false, + 'args': [ + '--bwsi', + '--disable-background-timer-throttling', + '--disable-default-apps', + '--disable-extensions', + '--disable-popup-blocking', + '--disable-translate', + '--no-default-browser-check', + '--no-sandbox', + '--no-first-run', + ], + 'perfLoggingPrefs': { + 'traceCategories': + 'devtools.timeline,' + 'v8,blink.console,benchmark,blink,' + 'blink.user_timing' + } + } + }; + + expect(getDesiredCapabilities(Browser.chrome, false), expected); + + }); + + test('Firefox with headless on', () { + final Map expected = { + 'acceptInsecureCerts': true, + 'browserName': 'firefox', + 'moz:firefoxOptions' : { + 'args': ['-headless'], + 'prefs': { + 'dom.file.createInChild': true, + 'dom.timeout.background_throttling_max_budget': -1, + 'media.autoplay.default': 0, + 'media.gmp-manager.url': '', + 'media.gmp-provider.enabled': false, + 'network.captive-portal-service.enabled': false, + 'security.insecure_field_warning.contextual.enabled': false, + 'test.currentTimeOffsetSeconds': 11491200 + }, + 'log': {'level': 'trace'} + } + }; + + expect(getDesiredCapabilities(Browser.firefox, true), expected); + }); + + test('Firefox with headless off', () { + final Map expected = { + 'acceptInsecureCerts': true, + 'browserName': 'firefox', + 'moz:firefoxOptions' : { + 'args': [], + 'prefs': { + 'dom.file.createInChild': true, + 'dom.timeout.background_throttling_max_budget': -1, + 'media.autoplay.default': 0, + 'media.gmp-manager.url': '', + 'media.gmp-provider.enabled': false, + 'network.captive-portal-service.enabled': false, + 'security.insecure_field_warning.contextual.enabled': false, + 'test.currentTimeOffsetSeconds': 11491200 + }, + 'log': {'level': 'trace'} + } + }; + + expect(getDesiredCapabilities(Browser.firefox, false), expected); + }); + + test('Edge', () { + final Map expected = { + 'acceptInsecureCerts': true, + 'browserName': 'edge', + }; + + expect(getDesiredCapabilities(Browser.edge, false), expected); + }); + + test('macOS Safari', () { + final Map expected = { + 'browserName': 'safari', + 'safari.options': { + 'skipExtensionInstallation': true, + 'cleanSession': true + } + }; + + expect(getDesiredCapabilities(Browser.safari, false), expected); + }); + + test('iOS Safari', () { + final Map expected = { + 'platformName': 'ios', + 'browserName': 'safari', + 'safari:useSimulator': true + }; + + expect(getDesiredCapabilities(Browser.iosSafari, false), expected); + }); + }); } class MockDevice extends Mock implements Device {