diff --git a/analysis_options.yaml b/analysis_options.yaml index 86371c8849..84a7d94b09 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -33,11 +33,11 @@ analyzer: # Please see https://github.com/flutter/flutter/pull/24528 for details. sdk_version_async_exported_from_core: ignore exclude: - - 'bin/cache/**' + - "bin/cache/**" # the following two are relative to the stocks example and the flutter package respectively # see https://github.com/dart-lang/sdk/issues/28463 - - 'lib/i18n/stock_messages_*.dart' - - 'lib/src/http/**' + - "lib/i18n/stock_messages_*.dart" + - "lib/src/http/**" linter: rules: @@ -143,7 +143,7 @@ linter: # - prefer_if_elements_to_conditional_expressions # not yet tested # - prefer_if_null_operators # not yet tested - prefer_initializing_formals - # - prefer_inlined_adds # not yet tested + - prefer_inlined_adds # - prefer_int_literals # not yet tested # - prefer_interpolation_to_compose_strings # not yet tested - prefer_is_empty @@ -152,7 +152,7 @@ linter: # - prefer_mixin # https://github.com/dart-lang/language/issues/32 # - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932 - prefer_single_quotes - # - prefer_spread_collections # not yet tested + - prefer_spread_collections - prefer_typing_uninitialized_variables - prefer_void_to_null # - provide_deprecation_message # not yet tested diff --git a/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart b/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart index 8237d7e40e..37e88ff878 100644 --- a/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart +++ b/dev/benchmarks/macrobenchmarks/lib/src/cubic_bezier.dart @@ -117,11 +117,12 @@ class AnimatedBezierState extends State AnimationController controller; CurvedAnimation curve; bool isPlaying = false; - List> pointList = >[] - ..add([]) - ..add([]) - ..add([]) - ..add([]); + List> pointList = >[ + [], + [], + [], + [], + ]; bool isReversed = false; List _playForward() { diff --git a/dev/bots/analyze-sample-code.dart b/dev/bots/analyze-sample-code.dart index f26fc544d6..e07905f13d 100644 --- a/dev/bots/analyze-sample-code.dart +++ b/dev/bots/analyze-sample-code.dart @@ -286,13 +286,14 @@ class SampleChecker { '--snapshot=$_snippetsSnapshotPath', '--snapshot-kind=app-jit', path.canonicalize(_snippetsExecutable), - ]..addAll(args), + ...args, + ], workingDirectory: workingDirectory, ); } else { return Process.runSync( _dartExecutable, - [path.canonicalize(_snippetsSnapshotPath)]..addAll(args), + [path.canonicalize(_snippetsSnapshotPath), ...args], workingDirectory: workingDirectory, ); } @@ -311,7 +312,8 @@ class SampleChecker { final List args = [ '--output=${outputFile.absolute.path}', '--input=${inputFile.absolute.path}', - ]..addAll(snippet.args); + ...snippet.args, + ]; print('Generating snippet for ${snippet.start?.filename}:${snippet.start?.line}'); final ProcessResult process = _runSnippetsScript(args); if (process.exitCode != 0) { @@ -854,9 +856,11 @@ class Section { ), ); } - return Section([Line(prefix)] - ..addAll(codeLines) - ..add(Line(postfix))); + return Section([ + Line(prefix), + ...codeLines, + Line(postfix), + ]); } Line get start => code.firstWhere((Line line) => line.filename != null); final List code; @@ -868,8 +872,8 @@ class Section { /// analyzed. class Snippet { Snippet({this.start, List input, List args, this.serial}) { - this.input = []..addAll(input); - this.args = []..addAll(args); + this.input = input.toList(); + this.args = args.toList(); } final Line start; final int serial; diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart index ffa96e2f13..4397e65e47 100644 --- a/dev/bots/analyze.dart +++ b/dev/bots/analyze.dart @@ -260,7 +260,9 @@ Future _evalCommand(String executable, List arguments, { Future _runFlutterAnalyze(String workingDirectory, { List options = const [], }) { - return runCommand(flutter, ['analyze', '--dartdocs']..addAll(options), + return runCommand( + flutter, + ['analyze', '--dartdocs', ...options], workingDirectory: workingDirectory, ); } @@ -456,7 +458,10 @@ List _deepSearch(Map> map, T start, [ Set seen ]) { final List result = _deepSearch( map, key, - (seen == null ? {start} : Set.from(seen))..add(key), + { + if (seen == null) start else ...seen, + key, + }, ); if (result != null) { result.insert(0, start); diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart index cd4993999c..d36eaf2e71 100644 --- a/dev/bots/prepare_package.dart +++ b/dev/bots/prepare_package.dart @@ -381,14 +381,14 @@ class ArchiveCreator { Future _runFlutter(List args, {Directory workingDirectory}) { return _processRunner.runProcess( - [_flutter]..addAll(args), + [_flutter, ...args], workingDirectory: workingDirectory ?? flutterRoot, ); } Future _runGit(List args, {Directory workingDirectory}) { return _processRunner.runProcess( - ['git']..addAll(args), + ['git', ...args], workingDirectory: workingDirectory ?? flutterRoot, ); } @@ -574,14 +574,14 @@ class ArchivePublisher { }) async { if (platform.isWindows) { return _processRunner.runProcess( - ['python', path.join(platform.environment['DEPOT_TOOLS'], 'gsutil.py'), '--']..addAll(args), + ['python', path.join(platform.environment['DEPOT_TOOLS'], 'gsutil.py'), '--', ...args], workingDirectory: workingDirectory, failOk: failOk, ); } return _processRunner.runProcess( - ['gsutil.py', '--']..addAll(args), + ['gsutil.py', '--', ...args], workingDirectory: workingDirectory, failOk: failOk, ); diff --git a/dev/bots/pubspec.yaml b/dev/bots/pubspec.yaml index 21dacf863a..865e3ffcfc 100644 --- a/dev/bots/pubspec.yaml +++ b/dev/bots/pubspec.yaml @@ -3,7 +3,7 @@ description: Scripts which run on bots. environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. - sdk: ">=2.2.0 <3.0.0" + sdk: ">=2.2.2 <3.0.0" dependencies: path: 1.6.2 diff --git a/dev/bots/test.dart b/dev/bots/test.dart index 8efc6ca2ac..e16480059b 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -220,7 +220,7 @@ Future _runToolCoverage() async { final List testGroup = tests[i]; await runCommand( dart, - [path.join('tool', 'tool_coverage.dart'), '--']..addAll(testGroup), + [path.join('tool', 'tool_coverage.dart'), '--', ...testGroup], workingDirectory: toolRoot, environment: { 'FLUTTER_ROOT': flutterRoot, @@ -791,7 +791,7 @@ Future _runFlutterTest(String workingDirectory, { Map environment, List tests = const [], }) async { - final List args = ['test']..addAll(options); + final List args = ['test', ...options]; if (flutterTestArgs != null && flutterTestArgs.isNotEmpty) args.addAll(flutterTestArgs); diff --git a/dev/bots/test/fake_process_manager.dart b/dev/bots/test/fake_process_manager.dart index 6a4136cedc..29f3cda807 100644 --- a/dev/bots/test/fake_process_manager.dart +++ b/dev/bots/test/fake_process_manager.dart @@ -35,8 +35,7 @@ class FakeProcessManager extends Mock implements ProcessManager { set fakeResults(Map> value) { _fakeResults = >{}; for (String key in value.keys) { - _fakeResults[key] = [] - ..addAll(value[key] ?? [ProcessResult(0, 0, '', '')]); + _fakeResults[key] = (value[key] ?? [ProcessResult(0, 0, '', '')]).toList(); } } diff --git a/dev/bots/unpublish_package.dart b/dev/bots/unpublish_package.dart index cd097196df..a91ce398d6 100644 --- a/dev/bots/unpublish_package.dart +++ b/dev/bots/unpublish_package.dart @@ -334,7 +334,7 @@ class ArchiveUnpublisher { bool failOk = false, bool confirm = false, }) async { - final List command = ['gsutil', '--']..addAll(args); + final List command = ['gsutil', '--', ...args]; if (confirm) { return _processRunner.runProcess( command, @@ -358,7 +358,7 @@ class ArchiveUnpublisher { print(' $file'); } } - await _runGsUtil(['rm']..addAll(files), failOk: true, confirm: confirmed); + await _runGsUtil(['rm', ...files], failOk: true, confirm: confirmed); } Future _cloudReplaceDest(String src, String dest) async { diff --git a/dev/devicelab/bin/tasks/build_mode_test.dart b/dev/devicelab/bin/tasks/build_mode_test.dart index c152afb287..b6a0dfce89 100644 --- a/dev/devicelab/bin/tasks/build_mode_test.dart +++ b/dev/devicelab/bin/tasks/build_mode_test.dart @@ -17,7 +17,7 @@ Future runFlutterAndQuit(List args, Device device) async { print('run: starting...'); final Process run = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run', '--suppress-analytics']..addAll(args), + ['run', '--suppress-analytics', ...args], isBot: false, // we just want to test the output, not have any debugging info ); final List stdout = []; @@ -61,8 +61,13 @@ void main() { Future checkMode(String mode, {bool releaseExpected = false, bool dynamic = false}) async { await inDirectory(appDir, () async { print('run: starting $mode test...'); - final List args = ['--$mode']..addAll(dynamic ? ['--dynamic'] : const []); - args.addAll(['-d', device.deviceId, 'lib/build_mode.dart']); + final List args = [ + '--$mode', + if (dynamic) '--dynamic', + '-d', + device.deviceId, + 'lib/build_mode.dart', + ]; final String stdout = await runFlutterAndQuit(args, device); if (!stdout.contains('>>> Release: $releaseExpected <<<')) { throw "flutter run --$mode ${dynamic ? '--dynamic ' : ''}didn't set kReleaseMode properly"; diff --git a/dev/devicelab/bin/tasks/flutter_run_test.dart b/dev/devicelab/bin/tasks/flutter_run_test.dart index 940e05b88c..6106fdee03 100644 --- a/dev/devicelab/bin/tasks/flutter_run_test.dart +++ b/dev/devicelab/bin/tasks/flutter_run_test.dart @@ -40,7 +40,7 @@ Future createFlutterRunTask() async { await inDirectory(flutterGalleryDir, () async { startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options), + ['run', ...options], environment: null, ); final Completer finished = Completer(); diff --git a/dev/devicelab/bin/tasks/uncaught_image_error_linux.dart b/dev/devicelab/bin/tasks/uncaught_image_error_linux.dart index 6b9567f7ec..04ca28c415 100644 --- a/dev/devicelab/bin/tasks/uncaught_image_error_linux.dart +++ b/dev/devicelab/bin/tasks/uncaught_image_error_linux.dart @@ -29,8 +29,9 @@ Future main() async { deviceId, ]; final Process process = await startProcess( - path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options)); + path.join(flutterDirectory.path, 'bin', 'flutter'), + ['run', ...options], + ); final Stream lines = process.stdout .transform(utf8.decoder) diff --git a/dev/devicelab/lib/framework/adb.dart b/dev/devicelab/lib/framework/adb.dart index 9e4b8f0748..e6765c6ab2 100644 --- a/dev/devicelab/lib/framework/adb.dart +++ b/dev/devicelab/lib/framework/adb.dart @@ -262,17 +262,17 @@ class AndroidDevice implements Device { /// Executes [command] on `adb shell` and returns its exit code. Future shellExec(String command, List arguments, { Map environment }) async { - await adb(['shell', command]..addAll(arguments), environment: environment); + await adb(['shell', command, ...arguments], environment: environment); } /// Executes [command] on `adb shell` and returns its standard output as a [String]. Future shellEval(String command, List arguments, { Map environment }) { - return adb(['shell', command]..addAll(arguments), environment: environment); + return adb(['shell', command, ...arguments], environment: environment); } /// Runs `adb` with the given [arguments], selecting this device. Future adb(List arguments, { Map environment }) { - return eval(adbPath, ['-s', deviceId]..addAll(arguments), environment: environment, canFail: false); + return eval(adbPath, ['-s', deviceId, ...arguments], environment: environment, canFail: false); } @override diff --git a/dev/devicelab/lib/framework/apk_utils.dart b/dev/devicelab/lib/framework/apk_utils.dart index d4780f827c..bbbfa08fb3 100644 --- a/dev/devicelab/lib/framework/apk_utils.dart +++ b/dev/devicelab/lib/framework/apk_utils.dart @@ -194,7 +194,7 @@ android { Future resultOfFlutterCommand(String command, List options) { return Process.run( path.join(flutterDirectory.path, 'bin', 'flutter'), - [command]..addAll(options), + [command, ...options], workingDirectory: rootPath, ); } diff --git a/dev/devicelab/lib/framework/utils.dart b/dev/devicelab/lib/framework/utils.dart index 42613a3548..68ef7987ab 100644 --- a/dev/devicelab/lib/framework/utils.dart +++ b/dev/devicelab/lib/framework/utils.dart @@ -235,7 +235,7 @@ Future startProcess( environment ??= {}; environment['BOT'] = isBot ? 'true' : 'false'; final Process process = await _processManager.start( - [executable]..addAll(arguments), + [executable, ...arguments], environment: environment, workingDirectory: workingDirectory ?? cwd, ); diff --git a/dev/devicelab/lib/tasks/hot_mode_tests.dart b/dev/devicelab/lib/tasks/hot_mode_tests.dart index 10fa92488e..1b245bfe91 100644 --- a/dev/devicelab/lib/tasks/hot_mode_tests.dart +++ b/dev/devicelab/lib/tasks/hot_mode_tests.dart @@ -39,7 +39,7 @@ TaskFunction createHotModeTest() { { final Process process = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options), + ['run', ...options], environment: null, ); @@ -93,7 +93,7 @@ TaskFunction createHotModeTest() { { final Process process = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options), + ['run', ...options], environment: null, ); final Completer stdoutDone = Completer(); diff --git a/dev/devicelab/lib/tasks/microbenchmarks.dart b/dev/devicelab/lib/tasks/microbenchmarks.dart index 2a3153bde1..2436c76d8e 100644 --- a/dev/devicelab/lib/tasks/microbenchmarks.dart +++ b/dev/devicelab/lib/tasks/microbenchmarks.dart @@ -65,7 +65,7 @@ Future _startFlutter({ bool canFail = false, Map environment, }) { - final List args = ['run']..addAll(options); + final List args = ['run', ...options]; return startProcess(path.join(flutterDirectory.path, 'bin', 'flutter'), args, environment: environment); } diff --git a/dev/devicelab/lib/tasks/plugin_tests.dart b/dev/devicelab/lib/tasks/plugin_tests.dart index cc9e7b2849..45681da086 100644 --- a/dev/devicelab/lib/tasks/plugin_tests.dart +++ b/dev/devicelab/lib/tasks/plugin_tests.dart @@ -65,7 +65,7 @@ class FlutterProject { await inDirectory(directory, () async { await flutter( 'create', - options: ['--template=app', '--org', 'io.flutter.devicelab']..addAll(options)..add('plugintest'), + options: ['--template=app', '--org', 'io.flutter.devicelab', ...options, 'plugintest'], ); }); return FlutterProject(directory, 'plugintest'); diff --git a/dev/devicelab/lib/tasks/run_without_leak.dart b/dev/devicelab/lib/tasks/run_without_leak.dart index eb9ff50115..b06364aac4 100644 --- a/dev/devicelab/lib/tasks/run_without_leak.dart +++ b/dev/devicelab/lib/tasks/run_without_leak.dart @@ -24,7 +24,7 @@ TaskFunction createRunWithoutLeakTest(dynamic dir) { await inDirectory(dir, () async { final Process process = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options), + ['run', ...options], environment: null, ); final Completer stdoutDone = Completer(); diff --git a/dev/devicelab/lib/tasks/web_dev_mode_tests.dart b/dev/devicelab/lib/tasks/web_dev_mode_tests.dart index cd5685e50d..dbb5e0090e 100644 --- a/dev/devicelab/lib/tasks/web_dev_mode_tests.dart +++ b/dev/devicelab/lib/tasks/web_dev_mode_tests.dart @@ -37,7 +37,7 @@ TaskFunction createWebDevModeTest() { await packagesGet.exitCode; final Process process = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options), + ['run', ...options], environment: { 'FLUTTER_WEB': 'true', }, @@ -96,7 +96,7 @@ TaskFunction createWebDevModeTest() { { final Process process = await startProcess( path.join(flutterDirectory.path, 'bin', 'flutter'), - ['run']..addAll(options), + ['run', ...options], environment: { 'FLUTTER_WEB': 'true', }, diff --git a/dev/devicelab/test/run_test.dart b/dev/devicelab/test/run_test.dart index 772202326f..c877e98858 100644 --- a/dev/devicelab/test/run_test.dart +++ b/dev/devicelab/test/run_test.dart @@ -21,7 +21,7 @@ void main() { } final String dart = path.absolute(path.join('..', '..', 'bin', 'cache', 'dart-sdk', 'bin', 'dart')); final ProcessResult scriptProcess = processManager.runSync( - [dart]..addAll(options) + [dart, ...options] ); return scriptProcess; } diff --git a/dev/snippets/lib/snippets.dart b/dev/snippets/lib/snippets.dart index f4dd8d6559..20f5da7c7c 100644 --- a/dev/snippets/lib/snippets.dart +++ b/dev/snippets/lib/snippets.dart @@ -175,7 +175,8 @@ class SnippetGenerator { } return <_ComponentTuple>[ _ComponentTuple('description', description), - ]..addAll(components); + ...components, + ]; } String _loadFileAsUtf8(File file) { diff --git a/dev/snippets/pubspec.yaml b/dev/snippets/pubspec.yaml index 6f8fa69abb..59d06d62bd 100644 --- a/dev/snippets/pubspec.yaml +++ b/dev/snippets/pubspec.yaml @@ -6,7 +6,7 @@ homepage: https://github.com/flutter/flutter 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" + sdk: ">=2.2.2 <3.0.0" dartdoc: # Exclude this package from the hosted API docs (Ironically...). diff --git a/dev/tools/dartdoc.dart b/dev/tools/dartdoc.dart index 840a020e51..774ad3c5b5 100644 --- a/dev/tools/dartdoc.dart +++ b/dev/tools/dartdoc.dart @@ -117,7 +117,7 @@ Future main(List arguments) async { // Verify which version of dartdoc we're using. final ProcessResult result = Process.runSync( pubExecutable, - []..addAll(dartdocBaseArgs)..add('--version'), + [...dartdocBaseArgs, '--version'], workingDirectory: kDocsRoot, environment: pubEnvironment, ); @@ -137,7 +137,8 @@ Future main(List arguments) async { // Generate the documentation. // We don't need to exclude flutter_tools in this list because it's not in the // recursive dependencies of the package defined at dev/docs/pubspec.yaml - final List dartdocArgs = []..addAll(dartdocBaseArgs)..addAll([ + final List dartdocArgs = [ + ...dartdocBaseArgs, '--inject-html', '--header', 'styles.html', '--header', 'analytics.html', @@ -145,7 +146,8 @@ Future main(List arguments) async { '--header', 'snippets.html', '--header', 'opensearch.html', '--footer-text', 'lib/footer.html', - '--allow-warnings-in-packages', [ + '--allow-warnings-in-packages', + [ 'Flutter', 'flutter', 'platform_integration', @@ -198,7 +200,7 @@ Future main(List arguments) async { '--favicon=favicon.ico', '--package-order', 'flutter,Dart,platform_integration,flutter_test,flutter_driver', '--auto-include-dependencies', - ]); + ]; String quote(String arg) => arg.contains(' ') ? "'$arg'" : arg; print('Executing: (cd $kDocsRoot ; $pubExecutable ${dartdocArgs.map(quote).join(' ')})'); diff --git a/dev/tools/pubspec.yaml b/dev/tools/pubspec.yaml index b441205fa6..d346ff68ac 100644 --- a/dev/tools/pubspec.yaml +++ b/dev/tools/pubspec.yaml @@ -3,7 +3,7 @@ description: Various repository development tools for flutter. environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. - sdk: ">=2.2.0 <3.0.0" + sdk: ">=2.2.2 <3.0.0" dependencies: archive: 2.0.10 diff --git a/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart b/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart index 43eb73fd5f..5f842a0f78 100644 --- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart +++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart @@ -434,7 +434,8 @@ class CupertinoDemoTab2 extends StatelessWidget { child: ListView( children: [ Tab2Header(), - ]..addAll(buildTab2Conversation()), + ...buildTab2Conversation(), + ], ), ), ); diff --git a/examples/flutter_gallery/lib/demo/pesto_demo.dart b/examples/flutter_gallery/lib/demo/pesto_demo.dart index f8829501fe..cff30f0682 100644 --- a/examples/flutter_gallery/lib/demo/pesto_demo.dart +++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart @@ -493,11 +493,9 @@ class RecipeSheet extends StatelessWidget { ), ] ), - ]..addAll(recipe.ingredients.map( - (RecipeIngredient ingredient) { + ...recipe.ingredients.map((RecipeIngredient ingredient) { return _buildItemRow(ingredient.amount, ingredient.description); - } - ))..add( + }), TableRow( children: [ const SizedBox(), @@ -506,12 +504,11 @@ class RecipeSheet extends StatelessWidget { child: Text('Steps', style: headingStyle), ), ] - ) - )..addAll(recipe.steps.map( - (RecipeStep step) { + ), + ...recipe.steps.map((RecipeStep step) { return _buildItemRow(step.duration ?? '', step.description); - } - )), + }), + ], ), ), ), diff --git a/examples/flutter_gallery/lib/gallery/options.dart b/examples/flutter_gallery/lib/gallery/options.dart index fb1bb2fa4b..c5642be7b0 100644 --- a/examples/flutter_gallery/lib/gallery/options.dart +++ b/examples/flutter_gallery/lib/gallery/options.dart @@ -455,18 +455,14 @@ class GalleryOptionsPage extends StatelessWidget { const Divider(), const _Heading('Platform mechanics'), _PlatformItem(options, onOptionsChanged), - ]..addAll( - _enabledDiagnosticItems(), - )..addAll( - [ - const Divider(), - const _Heading('Flutter gallery'), - _ActionItem('About Flutter Gallery', () { - showGalleryAboutDialog(context); - }), - _ActionItem('Send feedback', onSendFeedback), - ], - ), + ..._enabledDiagnosticItems(), + const Divider(), + const _Heading('Flutter gallery'), + _ActionItem('About Flutter Gallery', () { + showGalleryAboutDialog(context); + }), + _ActionItem('Send feedback', onSendFeedback), + ], ), ); } diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index d7b0ebd8d3..10f9ac4476 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -2,7 +2,7 @@ name: flutter_gallery environment: # The pub client defaults to an <2.0.0 sdk constraint which we need to explicitly overwrite. - sdk: ">=2.2.0 <3.0.0" + sdk: ">=2.2.2 <3.0.0" dependencies: flutter: diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart index 5b3babc814..99e03b2972 100644 --- a/packages/flutter/lib/src/rendering/box.dart +++ b/packages/flutter/lib/src/rendering/box.dart @@ -2010,13 +2010,13 @@ abstract class RenderBox extends RenderObject { // TODO(jacobr): consider nesting the failures object so it is collapsible. throw FlutterError.fromParts([ ErrorSummary('The intrinsic dimension methods of the $runtimeType class returned values that violate the intrinsic protocol contract.'), - ErrorDescription('The following ${failures.length > 1 ? "failures" : "failure"} was detected:') // should this be tagged as an error or not? - ]..addAll(failures) - ..add(ErrorHint( + ErrorDescription('The following ${failures.length > 1 ? "failures" : "failure"} was detected:'), // should this be tagged as an error or not? + ...failures, + ErrorHint( 'If you are not writing your own RenderBox subclass, then this is not\n' 'your fault. Contact support: https://github.com/flutter/flutter/issues/new?template=BUG.md' - )) - ); + ), + ]); } } return true; diff --git a/packages/flutter/lib/src/rendering/flex.dart b/packages/flutter/lib/src/rendering/flex.dart index e2abfe9cc5..2db99f0ca7 100644 --- a/packages/flutter/lib/src/rendering/flex.dart +++ b/packages/flutter/lib/src/rendering/flex.dart @@ -708,12 +708,13 @@ class RenderFlex extends RenderBox with ContainerRenderObjectMixin('The creator information is set to', debugCreator, style: DiagnosticsTreeStyle.errorProperty) - ]..addAll(addendum) - ..add(ErrorDescription( - 'If none of the above helps enough to fix this problem, please don\'t hesitate to file a bug:\n' - ' https://github.com/flutter/flutter/issues/new?template=BUG.md' - ))); + DiagnosticsProperty('The creator information is set to', debugCreator, style: DiagnosticsTreeStyle.errorProperty), + ...addendum, + ErrorDescription( + 'If none of the above helps enough to fix this problem, please don\'t hesitate to file a bug:\n' + ' https://github.com/flutter/flutter/issues/new?template=BUG.md' + ) + ]); }()); totalFlex += childParentData.flex; lastFlexChild = child; diff --git a/packages/flutter/lib/src/rendering/sliver.dart b/packages/flutter/lib/src/rendering/sliver.dart index e8b6b23a3b..f79ca92c70 100644 --- a/packages/flutter/lib/src/rendering/sliver.dart +++ b/packages/flutter/lib/src/rendering/sliver.dart @@ -1204,15 +1204,16 @@ abstract class RenderSliver extends RenderObject { if (geometry.paintExtent > constraints.remainingPaintExtent) { throw FlutterError.fromParts([ ErrorSummary('SliverGeometry has a paintOffset that exceeds the remainingPaintExtent from the constraints.'), - describeForError('The render object whose geometry violates the constraints is the following') - ]..addAll(_debugCompareFloats( + describeForError('The render object whose geometry violates the constraints is the following'), + ..._debugCompareFloats( 'remainingPaintExtent', constraints.remainingPaintExtent, 'paintExtent', geometry.paintExtent, - )) - ..add(ErrorDescription( - 'The paintExtent must cause the child sliver to paint within the viewport, and so ' - 'cannot exceed the remainingPaintExtent.', - ))); + ), + ErrorDescription( + 'The paintExtent must cause the child sliver to paint within the viewport, and so ' + 'cannot exceed the remainingPaintExtent.', + ), + ]); } return true; }()); diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart index b986bb3bb7..b7be8e9470 100644 --- a/packages/flutter/lib/src/widgets/editable_text.dart +++ b/packages/flutter/lib/src/widgets/editable_text.dart @@ -344,10 +344,10 @@ class EditableText extends StatefulWidget { _strutStyle = strutStyle, keyboardType = keyboardType ?? (maxLines == 1 ? TextInputType.text : TextInputType.multiline), inputFormatters = maxLines == 1 - ? ( - [BlacklistingTextInputFormatter.singleLineFormatter] - ..addAll(inputFormatters ?? const Iterable.empty()) - ) + ? [ + BlacklistingTextInputFormatter.singleLineFormatter, + ...inputFormatters ?? const Iterable.empty(), + ] : inputFormatters, showCursor = showCursor ?? !readOnly, super(key: key); diff --git a/packages/flutter/test/services/message_codecs_test.dart b/packages/flutter/test/services/message_codecs_test.dart index c5c38459a5..c69d0d6896 100644 --- a/packages/flutter/test/services/message_codecs_test.dart +++ b/packages/flutter/test/services/message_codecs_test.dart @@ -122,22 +122,22 @@ void main() { _checkEncoding( standard, Uint8List(253), - [8, 253]..addAll(List.filled(253, 0)), + [8, 253, ...List.filled(253, 0)], ); _checkEncoding( standard, Uint8List(254), - [8, 254, 254, 0]..addAll(List.filled(254, 0)), + [8, 254, 254, 0, ...List.filled(254, 0)], ); _checkEncoding( standard, Uint8List(0xffff), - [8, 254, 0xff, 0xff]..addAll(List.filled(0xffff, 0)), + [8, 254, 0xff, 0xff, ...List.filled(0xffff, 0)], ); _checkEncoding( standard, Uint8List(0xffff + 1), - [8, 255, 0, 0, 1, 0]..addAll(List.filled(0xffff + 1, 0)), + [8, 255, 0, 0, 1, 0, ...List.filled(0xffff + 1, 0)], ); }); test('should encode and decode simple messages', () { diff --git a/packages/flutter/test/widgets/scrollable_semantics_test.dart b/packages/flutter/test/widgets/scrollable_semantics_test.dart index 0f28aa987c..52088690d6 100644 --- a/packages/flutter/test/widgets/scrollable_semantics_test.dart +++ b/packages/flutter/test/widgets/scrollable_semantics_test.dart @@ -196,7 +196,8 @@ void main() { title: Text('App Bar'), ), ), - ]..addAll(slivers), + ...slivers, + ], ); }, ), diff --git a/packages/flutter/test/widgets/scrollbar_test.dart b/packages/flutter/test/widgets/scrollbar_test.dart index f05994a319..b6a85b098f 100644 --- a/packages/flutter/test/widgets/scrollbar_test.dart +++ b/packages/flutter/test/widgets/scrollbar_test.dart @@ -113,16 +113,17 @@ void main() { scrollMetrics: defaultMetrics, ); - final List metricsList = - [startingMetrics.copyWith(pixels: 0.01)] - ..addAll(List.generate( - (maxExtent/viewportDimension).round(), - (int index) => startingMetrics.copyWith(pixels: (index + 1) * viewportDimension), - ).where((ScrollMetrics metrics) => !metrics.outOfRange)) - ..add(startingMetrics.copyWith(pixels: maxExtent - 0.01)); + final List metricsList = [ + startingMetrics.copyWith(pixels: 0.01), + ...List.generate( + (maxExtent / viewportDimension).round(), + (int index) => startingMetrics.copyWith(pixels: (index + 1) * viewportDimension), + ).where((ScrollMetrics metrics) => !metrics.outOfRange), + startingMetrics.copyWith(pixels: maxExtent - 0.01), + ]; double lastCoefficient; - for(ScrollMetrics metrics in metricsList) { + for (ScrollMetrics metrics in metricsList) { painter.update(metrics, metrics.axisDirection); painter.paint(testCanvas, size); diff --git a/packages/flutter/test/widgets/sliver_semantics_test.dart b/packages/flutter/test/widgets/sliver_semantics_test.dart index 5e6dbdc6a9..c1ef222217 100644 --- a/packages/flutter/test/widgets/sliver_semantics_test.dart +++ b/packages/flutter/test/widgets/sliver_semantics_test.dart @@ -599,7 +599,8 @@ void _tests() { expandedHeight: 100.0, title: Text('AppBar'), ), - ]..addAll(slivers), + ...slivers, + ], ), ), ), @@ -824,7 +825,8 @@ void _tests() { expandedHeight: 100.0, title: Text('AppBar'), ), - ]..addAll(slivers), + ...slivers, + ], ), ), ), diff --git a/packages/flutter_tools/lib/src/android/android_device.dart b/packages/flutter_tools/lib/src/android/android_device.dart index 4a5397b3e0..6ebd461bbf 100644 --- a/packages/flutter_tools/lib/src/android/android_device.dart +++ b/packages/flutter_tools/lib/src/android/android_device.dart @@ -219,7 +219,7 @@ class AndroidDevice extends Device { _AndroidDevicePortForwarder _portForwarder; List adbCommandForDevice(List args) { - return [getAdbPath(androidSdk), '-s', id]..addAll(args); + return [getAdbPath(androidSdk), '-s', id, ...args]; } String runAdbCheckedSync( diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 184ea17678..30a734fced 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -458,7 +458,7 @@ List _parsePackageFonts( )); } else { packageFontAssets.add(FontAsset( - Uri(pathSegments: ['packages', packageName]..addAll(assetUri.pathSegments)), + Uri(pathSegments: ['packages', packageName, ...assetUri.pathSegments]), weight: fontAsset.weight, style: fontAsset.style, )); @@ -677,7 +677,7 @@ _Asset _resolveAsset( baseDir: assetsBaseDir, entryUri: packageName == null ? assetUri // Asset from the current application. - : Uri(pathSegments: ['packages', packageName]..addAll(assetUri.pathSegments)), // Asset from, and declared in $packageName. + : Uri(pathSegments: ['packages', packageName, ...assetUri.pathSegments]), // Asset from, and declared in $packageName. relativeUri: assetUri, ); } diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart index fb85ba3eac..8dded9789b 100644 --- a/packages/flutter_tools/lib/src/base/build.dart +++ b/packages/flutter_tools/lib/src/base/build.dart @@ -51,7 +51,8 @@ class GenSnapshot { }) { final List args = [ '--causal_async_stacks', - ]..addAll(additionalArgs); + ...additionalArgs, + ]; final String snapshotterPath = getSnapshotterPath(snapshotType); @@ -61,7 +62,7 @@ class GenSnapshot { // architecture. if (snapshotType.platform == TargetPlatform.ios) { final String hostArch = iosArch == IOSArch.armv7 ? '-i386' : '-x86_64'; - return runCommandAndStreamOutput(['/usr/bin/arch', hostArch, snapshotterPath]..addAll(args)); + return runCommandAndStreamOutput(['/usr/bin/arch', hostArch, snapshotterPath, ...args]); } StringConverter outputFilter; @@ -72,8 +73,7 @@ class GenSnapshot { outputFilter = (String line) => line != kStripWarning ? line : null; } - return runCommandAndStreamOutput([snapshotterPath]..addAll(args), - mapFunction: outputFilter); + return runCommandAndStreamOutput([snapshotterPath, ...args], mapFunction: outputFilter); } } @@ -168,7 +168,7 @@ class AOTSnapshotter { // If inputs and outputs have not changed since last run, skip the build. final Fingerprinter fingerprinter = Fingerprinter( fingerprintPath: '$depfilePath.fingerprint', - paths: [mainPath]..addAll(inputPaths)..addAll(outputPaths), + paths: [mainPath, ...inputPaths, ...outputPaths], properties: { 'buildMode': buildMode.toString(), 'targetPlatform': platform.toString(), @@ -422,7 +422,7 @@ class JITSnapshotter { // If inputs and outputs have not changed since last run, skip the build. final Fingerprinter fingerprinter = Fingerprinter( fingerprintPath: '$depfilePath.fingerprint', - paths: [mainPath]..addAll(inputPaths)..addAll(outputPaths), + paths: [mainPath, ...inputPaths, ...outputPaths], properties: { 'buildMode': buildMode.toString(), 'targetPlatform': platform.toString(), diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart index 52e1ca72fb..d310d10bbf 100644 --- a/packages/flutter_tools/lib/src/cache.dart +++ b/packages/flutter_tools/lib/src/cache.dart @@ -923,7 +923,7 @@ String _flattenNameNoSubdirs(String fileName) { @visibleForTesting String flattenNameSubdirs(Uri url) { - final List pieces = [url.host]..addAll(url.pathSegments); + final List pieces = [url.host, ...url.pathSegments]; final Iterable convertedPieces = pieces.map(_flattenNameNoSubdirs); return fs.path.joinAll(convertedPieces); } diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index 7dfd45b26c..4a86582b7f 100644 --- a/packages/flutter_tools/lib/src/commands/build_aot.dart +++ b/packages/flutter_tools/lib/src/commands/build_aot.dart @@ -127,10 +127,13 @@ class BuildAotCommand extends BuildSubCommand with TargetPlatformBasedDevelopmen if ((await Future.wait(exitCodes.values)).every((int buildExitCode) => buildExitCode == 0)) { final Iterable dylibs = iosBuilds.values.map((String outputDir) => fs.path.join(outputDir, 'App.framework', 'App')); fs.directory(fs.path.join(outputPath, 'App.framework'))..createSync(); - await runCheckedAsync(['lipo'] - ..addAll(dylibs) - ..addAll(['-create', '-output', fs.path.join(outputPath, 'App.framework', 'App')]), - ); + await runCheckedAsync([ + 'lipo', + ...dylibs, + '-create', + '-output', + fs.path.join(outputPath, 'App.framework', 'App'), + ]); } else { status?.cancel(); exitCodes.forEach((IOSArch iosArch, Future exitCodeFuture) async { diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 22232abd97..76332c0629 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart @@ -182,7 +182,7 @@ class DriveCommand extends RunCommandBase { // if the application is `lib/foo/bar.dart`, the test file is expected to // be `test_driver/foo/bar_test.dart`. final String pathWithNoExtension = fs.path.withoutExtension(fs.path.joinAll( - [packageDir, 'test_driver']..addAll(parts.skip(1)))); + [packageDir, 'test_driver', ...parts.skip(1)])); return '${pathWithNoExtension}_test${fs.path.extension(appFile)}'; } } @@ -297,13 +297,13 @@ Future _runTests(List testArgs, String observatoryUri) async { PackageMap.globalPackagesPath = fs.path.normalize(fs.path.absolute(PackageMap.globalPackagesPath)); final String dartVmPath = fs.path.join(dartSdkPath, 'bin', 'dart'); final int result = await runCommandAndStreamOutput( - [dartVmPath] - ..addAll(dartVmFlags) - ..addAll(testArgs) - ..addAll([ - '--packages=${PackageMap.globalPackagesPath}', - '-rexpanded', - ]), + [ + dartVmPath, + ...dartVmFlags, + ...testArgs, + '--packages=${PackageMap.globalPackagesPath}', + '-rexpanded', + ], environment: {'VM_SERVICE_URL': observatoryUri}, ); if (result != 0) diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart index 4a3da9f158..bb3607a42c 100644 --- a/packages/flutter_tools/lib/src/commands/packages.dart +++ b/packages/flutter_tools/lib/src/commands/packages.dart @@ -163,7 +163,7 @@ class PackagesTestCommand extends FlutterCommand { @override Future runCommand() async { - await pub(['run', 'test']..addAll(argResults.rest), context: PubContext.runTest, retry: false); + await pub(['run', 'test', ...argResults.rest], context: PubContext.runTest, retry: false); return null; } } @@ -193,7 +193,7 @@ class PackagesForwardCommand extends FlutterCommand { @override Future runCommand() async { - await pub([_commandName]..addAll(argResults.rest), context: PubContext.pubForward, retry: false); + await pub([_commandName, ...argResults.rest], context: PubContext.pubForward, retry: false); return null; } diff --git a/packages/flutter_tools/lib/src/dart/pub.dart b/packages/flutter_tools/lib/src/dart/pub.dart index 7cd554b9b7..ebbb02d740 100644 --- a/packages/flutter_tools/lib/src/dart/pub.dart +++ b/packages/flutter_tools/lib/src/dart/pub.dart @@ -192,7 +192,7 @@ Future pubInteractively( /// The command used for running pub. List _pubCommand(List arguments) { - return [ sdkBinaryName('pub') ]..addAll(arguments); + return [sdkBinaryName('pub'), ...arguments]; } /// The full environment used when running pub. diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart index 3377b57561..736e237f41 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart @@ -84,9 +84,10 @@ class FuchsiaKernelCompiler { ]; final List command = [ - artifacts.getArtifactPath(Artifact.engineDartBinary), - fuchsiaArtifacts.kernelCompiler.path, - ]..addAll(flags); + artifacts.getArtifactPath(Artifact.engineDartBinary), + fuchsiaArtifacts.kernelCompiler.path, + ...flags, + ]; final Process process = await runCommand(command); final Status status = logger.startProgress( 'Building Fuchsia application...', diff --git a/packages/flutter_tools/lib/src/macos/xcode.dart b/packages/flutter_tools/lib/src/macos/xcode.dart index 4cb57c705f..7cb7d04f81 100644 --- a/packages/flutter_tools/lib/src/macos/xcode.dart +++ b/packages/flutter_tools/lib/src/macos/xcode.dart @@ -90,11 +90,11 @@ class Xcode { } Future cc(List args) { - return runCheckedAsync(['xcrun', 'cc']..addAll(args)); + return runCheckedAsync(['xcrun', 'cc', ...args]); } Future clang(List args) { - return runCheckedAsync(['xcrun', 'clang']..addAll(args)); + return runCheckedAsync(['xcrun', 'clang', ...args]); } String getSimulatorPath() { diff --git a/packages/flutter_tools/test/base/flags_test.dart b/packages/flutter_tools/test/base/flags_test.dart index e49a7afbe7..0bea2ab334 100644 --- a/packages/flutter_tools/test/base/flags_test.dart +++ b/packages/flutter_tools/test/base/flags_test.dart @@ -17,7 +17,7 @@ void main() { Cache.disableLocking(); Future runCommand(Iterable flags, _TestMethod testMethod) async { - final List args = ['test']..addAll(flags); + final List args = ['test', ...flags]; final _TestCommand command = _TestCommand(testMethod); await createTestCommandRunner(command).run(args); } diff --git a/packages/flutter_tools/test/commands/create_test.dart b/packages/flutter_tools/test/commands/create_test.dart index 5ea6689de6..4da6a9c434 100644 --- a/packages/flutter_tools/test/commands/create_test.dart +++ b/packages/flutter_tools/test/commands/create_test.dart @@ -1169,10 +1169,11 @@ Future _analyzeProject(String workingDir) async { 'flutter_tools.dart', )); - final List args = [] - ..addAll(dartVmFlags) - ..add(flutterToolsPath) - ..add('analyze'); + final List args = [ + ...dartVmFlags, + flutterToolsPath, + 'analyze', + ]; final ProcessResult exec = await Process.run( '$dartSdkPath/bin/dart', @@ -1196,21 +1197,22 @@ Future _runFlutterTest(Directory workingDir, { String target }) async { // files anymore. await Process.run( '$dartSdkPath/bin/dart', - [] - ..addAll(dartVmFlags) - ..add(flutterToolsPath) - ..addAll(['packages', 'get']), + [ + ...dartVmFlags, + flutterToolsPath, + 'packages', + 'get', + ], workingDirectory: workingDir.path, ); - final List args = [] - ..addAll(dartVmFlags) - ..add(flutterToolsPath) - ..add('test') - ..add('--no-color'); - if (target != null) { - args.add(target); - } + final List args = [ + ...dartVmFlags, + flutterToolsPath, + 'test', + '--no-color', + if (target != null) target, + ]; final ProcessResult exec = await Process.run( '$dartSdkPath/bin/dart', diff --git a/packages/flutter_tools/test/commands/test_test.dart b/packages/flutter_tools/test/commands/test_test.dart index 8b7ad9d44b..e8b5070188 100644 --- a/packages/flutter_tools/test/commands/test_test.dart +++ b/packages/flutter_tools/test/commands/test_test.dart @@ -172,13 +172,14 @@ Future _runFlutterTest( if (!testFile.existsSync()) fail('missing test file: $testFile'); - final List args = [] - ..addAll(dartVmFlags) - ..add(fs.path.absolute(fs.path.join('bin', 'flutter_tools.dart'))) - ..add('test') - ..add('--no-color') - ..addAll(extraArgs) - ..add(testFilePath); + final List args = [ + ...dartVmFlags, + fs.path.absolute(fs.path.join('bin', 'flutter_tools.dart')), + 'test', + '--no-color', + ...extraArgs, + testFilePath + ]; while (_testExclusionLock != null) await _testExclusionLock; diff --git a/packages/flutter_tools/test/src/common.dart b/packages/flutter_tools/test/src/common.dart index 27fe71c415..75f95c9b1b 100644 --- a/packages/flutter_tools/test/src/common.dart +++ b/packages/flutter_tools/test/src/common.dart @@ -131,7 +131,7 @@ Future createProject(Directory temp, { List arguments }) async { final String projectPath = fs.path.join(temp.path, 'flutter_project'); final CreateCommand command = CreateCommand(); final CommandRunner runner = createTestCommandRunner(command); - await runner.run(['create']..addAll(arguments)..add(projectPath)); + await runner.run(['create', ...arguments, projectPath]); return projectPath; }