From 9d3533ff72d99da63ecc7efbd9f9328e335f7417 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Mon, 25 Jun 2018 21:36:15 +0000 Subject: [PATCH] snapshot the kernel worker in dart 2 mode and fix some dart 2 errors Change-Id: Icf4e123e61bc265ba1d4c6620826e5f23241add0 Reviewed-on: https://dart-review.googlesource.com/62120 Reviewed-by: Sigmund Cherem Commit-Queue: Jake Macdonald --- utils/bazel/BUILD.gn | 1 + utils/bazel/kernel_worker.dart | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/utils/bazel/BUILD.gn b/utils/bazel/BUILD.gn index 6f6d3dad6b0..eb754ab9968 100644 --- a/utils/bazel/BUILD.gn +++ b/utils/bazel/BUILD.gn @@ -7,4 +7,5 @@ import("../application_snapshot.gni") application_snapshot("kernel_worker") { main_dart = "kernel_worker.dart" training_args = [ "--help" ] + dart_version = 2 } diff --git a/utils/bazel/kernel_worker.dart b/utils/bazel/kernel_worker.dart index 27bfd22e07f..f069fcb0889 100644 --- a/utils/bazel/kernel_worker.dart +++ b/utils/bazel/kernel_worker.dart @@ -128,7 +128,7 @@ Future computeKernel(List args, if (multiRoots.isEmpty) multiRoots.add(Uri.base); var fileSystem = new MultiRootFileSystem(parsedArgs['multi-root-scheme'], multiRoots, fe.StandardFileSystem.instance); - var sources = parsedArgs['source'].map(Uri.parse).toList(); + var sources = (parsedArgs['source'] as List).map(Uri.parse).toList(); Target target; var summaryOnly = parsedArgs['summary-only'] as bool; var excludeNonSources = parsedArgs['exclude-non-sources'] as bool; @@ -143,8 +143,12 @@ Future computeKernel(List args, null, Uri.base.resolve(parsedArgs['dart-sdk-summary']), Uri.base.resolve(parsedArgs['packages-file']), - parsedArgs['input-summary'].map(Uri.base.resolve).toList(), - parsedArgs['input-linked'].map(Uri.base.resolve).toList(), + (parsedArgs['input-summary'] as List) + .map(Uri.base.resolve) + .toList(), + (parsedArgs['input-linked'] as List) + .map(Uri.base.resolve) + .toList(), target, fileSystem);