From 0c81077582c8d22779ca6d01ab10b749cf294cae Mon Sep 17 00:00:00 2001 From: Darren Austin Date: Tue, 13 Jul 2021 16:41:06 -0700 Subject: [PATCH] Migrate devicelab tasks i-z to null safety. (#85998) --- .../tasks/ios_app_with_extensions_test.dart | 18 +++++----- .../tasks/ios_content_validation_test.dart | 4 +-- dev/devicelab/bin/tasks/ios_defines_test.dart | 2 -- .../bin/tasks/ios_platform_view_tests.dart | 2 -- .../large_image_changer_perf_android.dart | 2 -- .../tasks/large_image_changer_perf_ios.dart | 2 -- .../bin/tasks/linux_chrome_dev_mode.dart | 2 -- .../bin/tasks/macos_chrome_dev_mode.dart | 2 -- dev/devicelab/bin/tasks/microbenchmarks.dart | 2 -- .../bin/tasks/microbenchmarks_ios.dart | 2 -- .../module_custom_host_app_name_test.dart | 4 +-- .../module_host_with_custom_build_test.dart | 4 +-- dev/devicelab/bin/tasks/module_test.dart | 8 ++--- dev/devicelab/bin/tasks/module_test_ios.dart | 6 ++-- ...widget_construction_perf__e2e_summary.dart | 2 -- .../bin/tasks/native_ui_tests_ios32.dart | 8 ++--- .../bin/tasks/new_gallery__crane_perf.dart | 2 -- .../tasks/new_gallery__transition_perf.dart | 2 -- .../new_gallery_ios__transition_perf.dart | 2 -- .../picture_cache_perf__e2e_summary.dart | 2 -- .../picture_cache_perf__timeline_summary.dart | 2 -- .../tasks/platform_channel_sample_test.dart | 2 -- .../platform_channel_sample_test_ios.dart | 2 -- .../platform_channel_sample_test_swift.dart | 2 -- .../tasks/platform_channels_benchmarks.dart | 2 -- .../platform_channels_benchmarks_ios.dart | 2 -- .../bin/tasks/platform_interaction_test.dart | 2 -- .../tasks/platform_interaction_test_ios.dart | 2 -- .../bin/tasks/platform_view__start_up.dart | 2 -- .../tasks/platform_view_ios__start_up.dart | 2 -- ...m_views_scroll_perf__timeline_summary.dart | 2 -- ...ews_scroll_perf_ios__timeline_summary.dart | 2 -- .../bin/tasks/plugin_dependencies_test.dart | 4 +-- dev/devicelab/bin/tasks/plugin_lint_mac.dart | 2 -- dev/devicelab/bin/tasks/plugin_test.dart | 2 -- dev/devicelab/bin/tasks/plugin_test_ios.dart | 2 -- dev/devicelab/bin/tasks/plugin_test_win.dart | 2 -- ...rop_filter_perf_ios__timeline_summary.dart | 2 -- dev/devicelab/bin/tasks/routing_test.dart | 8 ++--- dev/devicelab/bin/tasks/run_release_test.dart | 4 +-- .../bin/tasks/service_extensions_test.dart | 36 +++++++++---------- .../bin/tasks/simple_animation_perf_ios.dart | 2 -- ...ina_hot_mode_dev_cycle_ios__benchmark.dart | 2 -- .../bin/tasks/smoke_catalina_start_up.dart | 2 -- .../bin/tasks/smoke_test_build_test.dart | 2 -- .../bin/tasks/smoke_test_device.dart | 2 -- .../bin/tasks/smoke_test_failure.dart | 2 -- .../bin/tasks/smoke_test_success.dart | 2 -- .../bin/tasks/smoke_test_throws.dart | 2 -- .../bin/tasks/technical_debt__cost.dart | 10 +++--- dev/devicelab/bin/tasks/textfield_perf.dart | 2 -- .../tasks/textfield_perf__e2e_summary.dart | 2 -- .../textfield_perf__timeline_summary.dart | 2 -- .../tiles_scroll_perf__timeline_summary.dart | 2 -- ...les_scroll_perf_ios__timeline_summary.dart | 2 -- ...croll_perf_iphonexs__timeline_summary.dart | 2 -- .../bin/tasks/web_benchmarks_canvaskit.dart | 2 -- .../bin/tasks/web_benchmarks_html.dart | 2 -- .../bin/tasks/web_incremental_test.dart | 2 -- .../bin/tasks/web_size__compile_test.dart | 2 -- .../bin/tasks/windows_chrome_dev_mode.dart | 2 -- 61 files changed, 45 insertions(+), 167 deletions(-) diff --git a/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart b/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart index b12e3975bb..11b21b390e 100644 --- a/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart +++ b/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:convert'; import 'dart:io'; @@ -18,8 +16,8 @@ Future main() async { await task(() async { section('Copy test Flutter App with watchOS Companion'); - String watchDeviceID; - String phoneDeviceID; + String? watchDeviceID; + String? phoneDeviceID; final Directory tempDir = Directory.systemTemp .createTempSync('flutter_ios_app_with_extensions_test.'); final Directory projectDir = @@ -127,8 +125,8 @@ Future main() async { // iOS 13.4 (13.4 - 17E255) - com.apple.CoreSimulator.SimRuntime.iOS-13-4 // tvOS 13.4 (13.4 - 17L255) - com.apple.CoreSimulator.SimRuntime.tvOS-13-4 // watchOS 6.2 (6.2 - 17T256) - com.apple.CoreSimulator.SimRuntime.watchOS-6-2 - String iOSSimRuntime; - String watchSimRuntime; + String? iOSSimRuntime; + String? watchSimRuntime; final RegExp iOSRuntimePattern = RegExp(r'iOS .*\) - (.*)'); final RegExp watchOSRuntimePattern = RegExp(r'watchOS .*\) - (.*)'); @@ -136,14 +134,14 @@ Future main() async { for (final String runtime in LineSplitter.split(availableRuntimes)) { // These seem to be in order, so allow matching multiple lines so it grabs // the last (hopefully latest) one. - final RegExpMatch iOSRuntimeMatch = iOSRuntimePattern.firstMatch(runtime); + final RegExpMatch? iOSRuntimeMatch = iOSRuntimePattern.firstMatch(runtime); if (iOSRuntimeMatch != null) { - iOSSimRuntime = iOSRuntimeMatch.group(1).trim(); + iOSSimRuntime = iOSRuntimeMatch.group(1)!.trim(); continue; } - final RegExpMatch watchOSRuntimeMatch = watchOSRuntimePattern.firstMatch(runtime); + final RegExpMatch? watchOSRuntimeMatch = watchOSRuntimePattern.firstMatch(runtime); if (watchOSRuntimeMatch != null) { - watchSimRuntime = watchOSRuntimeMatch.group(1).trim(); + watchSimRuntime = watchOSRuntimeMatch.group(1)!.trim(); } } if (iOSSimRuntime == null || watchSimRuntime == null) { diff --git a/dev/devicelab/bin/tasks/ios_content_validation_test.dart b/dev/devicelab/bin/tasks/ios_content_validation_test.dart index caf61c5821..c42325186a 100644 --- a/dev/devicelab/bin/tasks/ios_content_validation_test.dart +++ b/dev/devicelab/bin/tasks/ios_content_validation_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/apk_utils.dart'; @@ -46,7 +44,7 @@ Future main() async { final Directory appBundle = applications .listSync() .whereType() - .singleWhere((Directory directory) => path.extension(directory.path) == '.app', orElse: () => null); + .singleWhere((Directory directory) => path.extension(directory.path) == '.app'); final String flutterFramework = path.join( appBundle.path, diff --git a/dev/devicelab/bin/tasks/ios_defines_test.dart b/dev/devicelab/bin/tasks/ios_defines_test.dart index 12a5c112ca..534e079acf 100644 --- a/dev/devicelab/bin/tasks/ios_defines_test.dart +++ b/dev/devicelab/bin/tasks/ios_defines_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/ios_platform_view_tests.dart b/dev/devicelab/bin/tasks/ios_platform_view_tests.dart index d08087e59a..102990ba9f 100644 --- a/dev/devicelab/bin/tasks/ios_platform_view_tests.dart +++ b/dev/devicelab/bin/tasks/ios_platform_view_tests.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart b/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart index 8e0f268ba8..21ae350c1b 100644 --- a/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart +++ b/dev/devicelab/bin/tasks/large_image_changer_perf_android.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart b/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart index 241986bcf3..8c49133625 100644 --- a/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart +++ b/dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/utils.dart'; diff --git a/dev/devicelab/bin/tasks/linux_chrome_dev_mode.dart b/dev/devicelab/bin/tasks/linux_chrome_dev_mode.dart index 503d780ac7..da3e622646 100644 --- a/dev/devicelab/bin/tasks/linux_chrome_dev_mode.dart +++ b/dev/devicelab/bin/tasks/linux_chrome_dev_mode.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/web_dev_mode_tests.dart'; diff --git a/dev/devicelab/bin/tasks/macos_chrome_dev_mode.dart b/dev/devicelab/bin/tasks/macos_chrome_dev_mode.dart index 503d780ac7..da3e622646 100644 --- a/dev/devicelab/bin/tasks/macos_chrome_dev_mode.dart +++ b/dev/devicelab/bin/tasks/macos_chrome_dev_mode.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/web_dev_mode_tests.dart'; diff --git a/dev/devicelab/bin/tasks/microbenchmarks.dart b/dev/devicelab/bin/tasks/microbenchmarks.dart index 39bc0c9221..4340547ed7 100644 --- a/dev/devicelab/bin/tasks/microbenchmarks.dart +++ b/dev/devicelab/bin/tasks/microbenchmarks.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/microbenchmarks.dart'; diff --git a/dev/devicelab/bin/tasks/microbenchmarks_ios.dart b/dev/devicelab/bin/tasks/microbenchmarks_ios.dart index a85fdfbee7..a4838f4754 100644 --- a/dev/devicelab/bin/tasks/microbenchmarks_ios.dart +++ b/dev/devicelab/bin/tasks/microbenchmarks_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/microbenchmarks.dart'; diff --git a/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart b/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart index d3a3da962c..006744beb8 100644 --- a/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart +++ b/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/apk_utils.dart'; @@ -24,7 +22,7 @@ Future main() async { section('Find Java'); - final String javaHome = await findJavaHome(); + final String? javaHome = await findJavaHome(); if (javaHome == null) return TaskResult.failure('Could not find Java'); print('\nUsing JAVA_HOME=$javaHome'); diff --git a/dev/devicelab/bin/tasks/module_host_with_custom_build_test.dart b/dev/devicelab/bin/tasks/module_host_with_custom_build_test.dart index 000a82218d..c8c996e8ab 100644 --- a/dev/devicelab/bin/tasks/module_host_with_custom_build_test.dart +++ b/dev/devicelab/bin/tasks/module_host_with_custom_build_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/apk_utils.dart'; @@ -22,7 +20,7 @@ Future main() async { section('Find Java'); - final String javaHome = await findJavaHome(); + final String? javaHome = await findJavaHome(); if (javaHome == null) { return TaskResult.failure('Could not find Java'); } diff --git a/dev/devicelab/bin/tasks/module_test.dart b/dev/devicelab/bin/tasks/module_test.dart index bac5b08cf1..a9fbb58f17 100644 --- a/dev/devicelab/bin/tasks/module_test.dart +++ b/dev/devicelab/bin/tasks/module_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; @@ -27,7 +25,7 @@ Future main() async { section('Find Java'); - final String javaHome = await findJavaHome(); + final String? javaHome = await findJavaHome(); if (javaHome == null) return TaskResult.failure('Could not find Java'); print('\nUsing JAVA_HOME=$javaHome'); @@ -325,9 +323,9 @@ Future main() async { final File apkFile = File(releaseHostApk); final Archive apk = ZipDecoder().decodeBytes(apkFile.readAsBytesSync()); // Shouldn't be missing since we already checked it exists above. - final ArchiveFile noticesFile = apk.findFile('assets/flutter_assets/NOTICES.Z'); + final ArchiveFile? noticesFile = apk.findFile('assets/flutter_assets/NOTICES.Z'); - final Uint8List licenseData = noticesFile.content as Uint8List; + final Uint8List licenseData = noticesFile?.content as Uint8List; if (licenseData == null) { return TaskResult.failure('Invalid license file.'); } diff --git a/dev/devicelab/bin/tasks/module_test_ios.dart b/dev/devicelab/bin/tasks/module_test_ios.dart index 76fd41dc92..afd5201e12 100644 --- a/dev/devicelab/bin/tasks/module_test_ios.dart +++ b/dev/devicelab/bin/tasks/module_test_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; @@ -20,7 +18,7 @@ import 'package:path/path.dart' as path; /// adding Flutter to an existing iOS app. Future main() async { await task(() async { - String simulatorDeviceId; + late String simulatorDeviceId; section('Create Flutter module project'); final Directory tempDir = Directory.systemTemp.createTempSync('flutter_module_test.'); @@ -360,7 +358,7 @@ Future main() async { ); if (testResultExit != 0) { - final Directory dumpDirectory = hostAgent.dumpDirectory; + final Directory? dumpDirectory = hostAgent.dumpDirectory; if (dumpDirectory != null) { // Zip the test results to the artifacts directory for upload. await inDirectory(resultBundleTemp, () { diff --git a/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart index e4995e91ec..78a80a5db0 100644 --- a/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/multi_widget_construction_perf__e2e_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart b/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart index 800632d9bc..1924df3d2b 100644 --- a/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart +++ b/dev/devicelab/bin/tasks/native_ui_tests_ios32.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/devices.dart'; @@ -43,8 +41,8 @@ Future main() async { final Map environment = Platform.environment; // If not running on CI, inject the Flutter team code signing properties. final String developmentTeam = environment['FLUTTER_XCODE_DEVELOPMENT_TEAM'] ?? 'S8QB4VV633'; - final String codeSignStyle = environment['FLUTTER_XCODE_CODE_SIGN_STYLE']; - final String provisioningProfile = environment['FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER']; + final String? codeSignStyle = environment['FLUTTER_XCODE_CODE_SIGN_STYLE']; + final String? provisioningProfile = environment['FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER']; final String resultBundleTemp = Directory.systemTemp.createTempSync('flutter_native_ui_tests_ios32_xcresult.').path; final String resultBundlePath = path.join(resultBundleTemp, 'result'); @@ -74,7 +72,7 @@ Future main() async { ); if (testResultExit != 0) { - final Directory dumpDirectory = hostAgent.dumpDirectory; + final Directory? dumpDirectory = hostAgent.dumpDirectory; if (dumpDirectory != null) { // Zip the test results to the artifacts directory for upload. final String zipPath = path.join(dumpDirectory.path, diff --git a/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart b/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart index 681a1f5e3c..92f7c84720 100644 --- a/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart +++ b/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/devices.dart'; diff --git a/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart b/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart index 0c403094a9..ae07dc99ac 100644 --- a/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart +++ b/dev/devicelab/bin/tasks/new_gallery__transition_perf.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/devices.dart'; diff --git a/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart b/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart index 3f7c286d5c..aab083fedd 100644 --- a/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart +++ b/dev/devicelab/bin/tasks/new_gallery_ios__transition_perf.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/devices.dart'; diff --git a/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart index baaa4683e5..131cdbcc39 100644 --- a/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/picture_cache_perf__e2e_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart index ac6d4d8ada..d203c5f364 100644 --- a/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channel_sample_test.dart b/dev/devicelab/bin/tasks/platform_channel_sample_test.dart index 78be52a01f..02257de206 100644 --- a/dev/devicelab/bin/tasks/platform_channel_sample_test.dart +++ b/dev/devicelab/bin/tasks/platform_channel_sample_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart b/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart index 94aa03df79..7c0b11e481 100644 --- a/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart +++ b/dev/devicelab/bin/tasks/platform_channel_sample_test_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart b/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart index 7339940046..0e2110c148 100644 --- a/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart +++ b/dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart b/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart index aad574e188..99d8dd9be1 100644 --- a/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart +++ b/dev/devicelab/bin/tasks/platform_channels_benchmarks.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart' show DeviceOperatingSystem; import 'package:flutter_devicelab/framework/framework.dart' show task; import 'package:flutter_devicelab/tasks/platform_channels_benchmarks.dart' as platform_channels_benchmarks; diff --git a/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart b/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart index fb9608bbe2..de62c39090 100644 --- a/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart +++ b/dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart' show DeviceOperatingSystem; import 'package:flutter_devicelab/framework/framework.dart' show task; import 'package:flutter_devicelab/tasks/platform_channels_benchmarks.dart' as platform_channels_benchmarks; diff --git a/dev/devicelab/bin/tasks/platform_interaction_test.dart b/dev/devicelab/bin/tasks/platform_interaction_test.dart index 6a2d3e7b97..1a4bb47934 100644 --- a/dev/devicelab/bin/tasks/platform_interaction_test.dart +++ b/dev/devicelab/bin/tasks/platform_interaction_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart b/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart index 057b49519f..8a5121d176 100644 --- a/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart +++ b/dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/integration_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_view__start_up.dart b/dev/devicelab/bin/tasks/platform_view__start_up.dart index dbf6f758f1..3f964f99df 100644 --- a/dev/devicelab/bin/tasks/platform_view__start_up.dart +++ b/dev/devicelab/bin/tasks/platform_view__start_up.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart b/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart index e48fe7b738..8b9cf2bad8 100644 --- a/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart +++ b/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/devices.dart'; diff --git a/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart index 81cc591c00..2e45e16d5b 100644 --- a/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart index dfd05b5e05..12c1c9b676 100644 --- a/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart index bd36df7ad9..26d8dada3a 100644 --- a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart +++ b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:convert'; import 'dart:io'; @@ -24,7 +22,7 @@ Future main() async { section('Find Java'); - final String javaHome = await findJavaHome(); + final String? javaHome = await findJavaHome(); if (javaHome == null) { return TaskResult.failure('Could not find Java'); } diff --git a/dev/devicelab/bin/tasks/plugin_lint_mac.dart b/dev/devicelab/bin/tasks/plugin_lint_mac.dart index 50879d331e..37aadafc43 100644 --- a/dev/devicelab/bin/tasks/plugin_lint_mac.dart +++ b/dev/devicelab/bin/tasks/plugin_lint_mac.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:io'; import 'package:flutter_devicelab/framework/framework.dart'; diff --git a/dev/devicelab/bin/tasks/plugin_test.dart b/dev/devicelab/bin/tasks/plugin_test.dart index f4057c4b17..d7b5e536f5 100644 --- a/dev/devicelab/bin/tasks/plugin_test.dart +++ b/dev/devicelab/bin/tasks/plugin_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/plugin_tests.dart'; diff --git a/dev/devicelab/bin/tasks/plugin_test_ios.dart b/dev/devicelab/bin/tasks/plugin_test_ios.dart index ba212f8e39..bff25a2120 100644 --- a/dev/devicelab/bin/tasks/plugin_test_ios.dart +++ b/dev/devicelab/bin/tasks/plugin_test_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/plugin_tests.dart'; diff --git a/dev/devicelab/bin/tasks/plugin_test_win.dart b/dev/devicelab/bin/tasks/plugin_test_win.dart index 3faef3966b..c2b3060d91 100644 --- a/dev/devicelab/bin/tasks/plugin_test_win.dart +++ b/dev/devicelab/bin/tasks/plugin_test_win.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/plugin_tests.dart'; diff --git a/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart index aa9245e725..066a033acf 100644 --- a/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/post_backdrop_filter_perf_ios__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/routing_test.dart b/dev/devicelab/bin/tasks/routing_test.dart index 2b981a50e9..cdd956f45e 100644 --- a/dev/devicelab/bin/tasks/routing_test.dart +++ b/dev/devicelab/bin/tasks/routing_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:async'; import 'dart:convert'; import 'dart:io'; @@ -17,7 +15,7 @@ import 'package:path/path.dart' as path; void main() { task(() async { - int vmServicePort; + int? vmServicePort; final Device device = await devices.workingDevice; await device.unlock(); @@ -40,7 +38,7 @@ void main() { section('TEST WHETHER `flutter run --route` WORKS'); await inDirectory(appDir, () async { final Completer ready = Completer(); - bool ok; + late bool ok; print('run: starting...'); final Process run = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), @@ -58,7 +56,7 @@ void main() { print('service protocol connection available at port $vmServicePort'); print('run: ready!'); ready.complete(); - ok ??= true; + ok = true; } } }); diff --git a/dev/devicelab/bin/tasks/run_release_test.dart b/dev/devicelab/bin/tasks/run_release_test.dart index 412a280782..cd1050ae19 100644 --- a/dev/devicelab/bin/tasks/run_release_test.dart +++ b/dev/devicelab/bin/tasks/run_release_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:async'; import 'dart:convert'; import 'dart:io'; @@ -52,7 +50,7 @@ void main() { ['--suppress-analytics', 'run', '--release', '-d', device.deviceId, 'lib/main.dart'], isBot: false, // we just want to test the output, not have any debugging info ); - int runExitCode; + int? runExitCode; run.stdout .transform(utf8.decoder) .transform(const LineSplitter()) diff --git a/dev/devicelab/bin/tasks/service_extensions_test.dart b/dev/devicelab/bin/tasks/service_extensions_test.dart index e45b0016e7..6f8464dab7 100644 --- a/dev/devicelab/bin/tasks/service_extensions_test.dart +++ b/dev/devicelab/bin/tasks/service_extensions_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:async'; import 'dart:convert'; import 'dart:io'; @@ -19,14 +17,14 @@ import 'package:vm_service/vm_service_io.dart'; void main() { task(() async { - int vmServicePort; + int? vmServicePort; final Device device = await devices.workingDevice; await device.unlock(); final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui')); await inDirectory(appDir, () async { final Completer ready = Completer(); - bool ok; + late bool ok; print('run: starting...'); final Process run = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), @@ -43,7 +41,7 @@ void main() { print('service protocol connection available at port $vmServicePort'); print('run: ready!'); ready.complete(); - ok ??= true; + ok = true; } } }); @@ -60,7 +58,7 @@ void main() { final VmService client = await vmServiceConnectUri('ws://localhost:$vmServicePort/ws'); final VM vm = await client.getVM(); - final IsolateRef isolate = vm.isolates.first; + final IsolateRef isolate = vm.isolates!.first; final StreamController frameEventsController = StreamController(); final StreamController navigationEventsController = StreamController(); @@ -90,17 +88,17 @@ void main() { // validate the fields // {number: 8, startTime: 0, elapsed: 1437, build: 600, raster: 800} - print(event.extensionData.data); - expect(event.extensionData.data['number'] is int); - expect((event.extensionData.data['number'] as int) >= 0); - expect(event.extensionData.data['startTime'] is int); - expect((event.extensionData.data['startTime'] as int) >= 0); - expect(event.extensionData.data['elapsed'] is int); - expect((event.extensionData.data['elapsed'] as int) >= 0); - expect(event.extensionData.data['build'] is int); - expect((event.extensionData.data['build'] as int) >= 0); - expect(event.extensionData.data['raster'] is int); - expect((event.extensionData.data['raster'] as int) >= 0); + print(event.extensionData!.data); + expect(event.extensionData!.data['number'] is int); + expect((event.extensionData!.data['number'] as int) >= 0); + expect(event.extensionData!.data['startTime'] is int); + expect((event.extensionData!.data['startTime'] as int) >= 0); + expect(event.extensionData!.data['elapsed'] is int); + expect((event.extensionData!.data['elapsed'] as int) >= 0); + expect(event.extensionData!.data['build'] is int); + expect((event.extensionData!.data['build'] as int) >= 0); + expect(event.extensionData!.data['raster'] is int); + expect((event.extensionData!.data['raster'] as int) >= 0); final Future navigationFuture = navigationEvents.first; // This tap triggers a navigation event. @@ -108,8 +106,8 @@ void main() { final Event navigationEvent = await navigationFuture; // validate the fields - expect(navigationEvent.extensionData.data['route'] is Map); - final Map route = navigationEvent.extensionData.data['route'] as Map; + expect(navigationEvent.extensionData!.data['route'] is Map); + final Map route = navigationEvent.extensionData!.data['route'] as Map; expect(route['description'] is String); expect(route['settings'] is Map); final Map settings = route['settings'] as Map; diff --git a/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart b/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart index 8f49a8efc3..56d8431d79 100644 --- a/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart +++ b/dev/devicelab/bin/tasks/simple_animation_perf_ios.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart index 353f03385b..ee71995dca 100644 --- a/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart +++ b/dev/devicelab/bin/tasks/smoke_catalina_hot_mode_dev_cycle_ios__benchmark.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/hot_mode_tests.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart b/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart index 0a77372449..c3251993ed 100644 --- a/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart +++ b/dev/devicelab/bin/tasks/smoke_catalina_start_up.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_build_test.dart b/dev/devicelab/bin/tasks/smoke_test_build_test.dart index 5051a8b6e0..20af941541 100644 --- a/dev/devicelab/bin/tasks/smoke_test_build_test.dart +++ b/dev/devicelab/bin/tasks/smoke_test_build_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_device.dart b/dev/devicelab/bin/tasks/smoke_test_device.dart index 044c62fd07..61733344fd 100644 --- a/dev/devicelab/bin/tasks/smoke_test_device.dart +++ b/dev/devicelab/bin/tasks/smoke_test_device.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_failure.dart b/dev/devicelab/bin/tasks/smoke_test_failure.dart index 4864010bf8..dc509acf87 100644 --- a/dev/devicelab/bin/tasks/smoke_test_failure.dart +++ b/dev/devicelab/bin/tasks/smoke_test_failure.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_success.dart b/dev/devicelab/bin/tasks/smoke_test_success.dart index e223d0141e..852545e429 100644 --- a/dev/devicelab/bin/tasks/smoke_test_success.dart +++ b/dev/devicelab/bin/tasks/smoke_test_success.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/framework/task_result.dart'; diff --git a/dev/devicelab/bin/tasks/smoke_test_throws.dart b/dev/devicelab/bin/tasks/smoke_test_throws.dart index 7f7d77ee66..4b02d1b22a 100644 --- a/dev/devicelab/bin/tasks/smoke_test_throws.dart +++ b/dev/devicelab/bin/tasks/smoke_test_throws.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; /// Smoke test of a task that fails with an exception. diff --git a/dev/devicelab/bin/tasks/technical_debt__cost.dart b/dev/devicelab/bin/tasks/technical_debt__cost.dart index 1c6d007173..146d7648cc 100644 --- a/dev/devicelab/bin/tasks/technical_debt__cost.dart +++ b/dev/devicelab/bin/tasks/technical_debt__cost.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:convert'; import 'dart:io'; @@ -71,23 +69,23 @@ Future findCostsForFile(File file) async { } bool isOptingOutOfNullSafety(String line) { - final RegExpMatch match = dartVersionPattern.firstMatch(line); + final RegExpMatch? match = dartVersionPattern.firstMatch(line); if (match == null) { return false; } assert(match.groupCount == 2); - return Version(int.parse(match.group(1)), int.parse(match.group(2)), 0) < firstNullSafeDartVersion; + return Version(int.parse(match.group(1)!), int.parse(match.group(2)!), 0) < firstNullSafeDartVersion; } bool packageIsNullSafe(File file) { assert(path.basename(file.path) == 'pubspec.yaml'); final Pubspec pubspec = Pubspec.parse(file.readAsStringSync()); - final VersionConstraint constraint = pubspec.environment == null ? null : pubspec.environment['sdk']; + final VersionConstraint? constraint = pubspec.environment == null ? null : pubspec.environment!['sdk']; final bool hasConstraint = constraint != null && !constraint.isAny && !constraint.isEmpty; return hasConstraint && constraint is VersionRange && constraint.min != null && - Version(constraint.min.major, constraint.min.minor, 0) >= firstNullSafeDartVersion; + Version(constraint.min!.major, constraint.min!.minor, 0) >= firstNullSafeDartVersion; } Future findGlobalsForFile(File file) async { diff --git a/dev/devicelab/bin/tasks/textfield_perf.dart b/dev/devicelab/bin/tasks/textfield_perf.dart index 3d5d945591..b69a724bb1 100644 --- a/dev/devicelab/bin/tasks/textfield_perf.dart +++ b/dev/devicelab/bin/tasks/textfield_perf.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart b/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart index b2510ffea1..03222bc6ef 100644 --- a/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart +++ b/dev/devicelab/bin/tasks/textfield_perf__e2e_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'dart:async'; import 'package:flutter_devicelab/framework/devices.dart'; diff --git a/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart index 3d5d945591..b69a724bb1 100644 --- a/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/textfield_perf__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart index 414f4cb0e5..3a3b79997f 100644 --- a/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/tiles_scroll_perf__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart index aa434df792..8761321017 100644 --- a/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/tiles_scroll_perf_ios__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart b/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart index aa434df792..8761321017 100644 --- a/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart +++ b/dev/devicelab/bin/tasks/tiles_scroll_perf_iphonexs__timeline_summary.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/devices.dart'; import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart b/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart index 2bcef8a72e..313f7e27af 100644 --- a/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart +++ b/dev/devicelab/bin/tasks/web_benchmarks_canvaskit.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/web_benchmarks.dart'; diff --git a/dev/devicelab/bin/tasks/web_benchmarks_html.dart b/dev/devicelab/bin/tasks/web_benchmarks_html.dart index a1431e4b13..8cca0d6092 100644 --- a/dev/devicelab/bin/tasks/web_benchmarks_html.dart +++ b/dev/devicelab/bin/tasks/web_benchmarks_html.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/web_benchmarks.dart'; diff --git a/dev/devicelab/bin/tasks/web_incremental_test.dart b/dev/devicelab/bin/tasks/web_incremental_test.dart index bdc9d25af8..1a32cbd730 100644 --- a/dev/devicelab/bin/tasks/web_incremental_test.dart +++ b/dev/devicelab/bin/tasks/web_incremental_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/web_dev_mode_tests.dart'; diff --git a/dev/devicelab/bin/tasks/web_size__compile_test.dart b/dev/devicelab/bin/tasks/web_size__compile_test.dart index e30f04d1d3..e43fc2a640 100644 --- a/dev/devicelab/bin/tasks/web_size__compile_test.dart +++ b/dev/devicelab/bin/tasks/web_size__compile_test.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/perf_tests.dart'; diff --git a/dev/devicelab/bin/tasks/windows_chrome_dev_mode.dart b/dev/devicelab/bin/tasks/windows_chrome_dev_mode.dart index 503d780ac7..da3e622646 100644 --- a/dev/devicelab/bin/tasks/windows_chrome_dev_mode.dart +++ b/dev/devicelab/bin/tasks/windows_chrome_dev_mode.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 - import 'package:flutter_devicelab/framework/framework.dart'; import 'package:flutter_devicelab/tasks/web_dev_mode_tests.dart';