Version 2.12.0-192.0.dev
Merge commit '5ece7f3a6eb2f60c5cd1da359400051df9b97202' into 'dev'
diff --git a/DEPS b/DEPS
index 027149c..59207c6 100644
--- a/DEPS
+++ b/DEPS
@@ -161,7 +161,7 @@
"typed_data_tag": "f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719",
"usage_rev": "6c64d9e7b6b3758d06d030efcb5afe20bfc04dde",
"vector_math_rev": "0c9f5d68c047813a6dcdeb88ba7a42daddf25025",
- "watcher_rev": "1fb0a84acd8d195103f10aba03ba6bd6fdb424e5",
+ "watcher_rev": "1e154d0900eabd5aed4b540e0416b8367e5c0248",
"webdriver_rev": "5a8d6805d9cf8a3cbb4fcd64849b538b7491e50e",
"web_components_rev": "8f57dac273412a7172c8ade6f361b407e2e4ed02",
"web_socket_channel_rev": "680358915e331fda823908234f80beba1ed4ec83",
diff --git a/pkg/analyzer/test/src/workspace/gn_test.dart b/pkg/analyzer/test/src/workspace/gn_test.dart
index 9c06fd4..122391c 100644
--- a/pkg/analyzer/test/src/workspace/gn_test.dart
+++ b/pkg/analyzer/test/src/workspace/gn_test.dart
@@ -196,7 +196,8 @@
expect(workspace, isNotNull);
expect(workspace.root, convertPath('/workspace'));
expect(workspace.packageMap.length, 1);
- expect(workspace.packageMap['flutter'][0].path, "$packageLocation/lib");
+ expect(workspace.packageMap['flutter'][0].path,
+ convertPath("$packageLocation/lib"));
}
void test_packages_absoluteBuildDir() {
@@ -225,7 +226,8 @@
expect(workspace, isNotNull);
expect(workspace.root, convertPath('/workspace'));
expect(workspace.packageMap.length, 1);
- expect(workspace.packageMap['flutter'][0].path, "$packageLocation/lib");
+ expect(workspace.packageMap['flutter'][0].path,
+ convertPath("$packageLocation/lib"));
}
void test_packages_fallbackBuildDir() {
@@ -252,7 +254,8 @@
expect(workspace, isNotNull);
expect(workspace.root, convertPath('/workspace'));
expect(workspace.packageMap.length, 1);
- expect(workspace.packageMap['flutter'][0].path, "$packageLocation/lib");
+ expect(workspace.packageMap['flutter'][0].path,
+ convertPath("$packageLocation/lib"));
}
void test_packages_fallbackBuildDirWithUselessConfig() {
@@ -280,7 +283,8 @@
expect(workspace, isNotNull);
expect(workspace.root, convertPath('/workspace'));
expect(workspace.packageMap.length, 1);
- expect(workspace.packageMap['flutter'][0].path, "$packageLocation/lib");
+ expect(workspace.packageMap['flutter'][0].path,
+ convertPath("$packageLocation/lib"));
}
void test_packages_multipleCandidates() {
@@ -325,8 +329,8 @@
expect(workspace, isNotNull);
expect(workspace.root, convertPath('/workspace'));
expect(workspace.packageMap.length, 1);
- expect(
- workspace.packageMap['rettulf'][0].path, "$otherPackageLocation/lib2");
+ expect(workspace.packageMap['rettulf'][0].path,
+ convertPath("$otherPackageLocation/lib2"));
}
void test_packages_multipleFiles() {
@@ -371,9 +375,9 @@
expect(workspace, isNotNull);
expect(workspace.root, convertPath('/workspace'));
expect(workspace.packageMap.length, 2);
- expect(
- workspace.packageMap['flutter'][0].path, "$packageOneLocation/one/lib");
- expect(
- workspace.packageMap['rettulf'][0].path, "$packageTwoLocation/two/lib");
+ expect(workspace.packageMap['flutter'][0].path,
+ convertPath("$packageOneLocation/one/lib"));
+ expect(workspace.packageMap['rettulf'][0].path,
+ convertPath("$packageTwoLocation/two/lib"));
}
}
diff --git a/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart b/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart
index 20253e5..6af9fa0 100644
--- a/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart
+++ b/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart
@@ -15,7 +15,6 @@
import 'package:dev_compiler/src/js_ast/js_ast.dart' as js_ast;
import 'package:dev_compiler/src/kernel/compiler.dart';
-import 'package:front_end/src/api_prototype/compiler_options.dart';
import 'package:front_end/src/api_unstable/ddc.dart';
import 'package:kernel/ast.dart'
diff --git a/pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart b/pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart
index fbd7ba6..d90969a 100644
--- a/pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart
+++ b/pkg/dev_compiler/lib/src/kernel/expression_compiler_worker.dart
@@ -8,12 +8,8 @@
import 'dart:convert';
import 'dart:io';
-import 'package:_fe_analyzer_shared/src/messages/diagnostic_message.dart';
-import 'package:_fe_analyzer_shared/src/messages/severity.dart';
import 'package:args/args.dart';
import 'package:build_integration/file_system/multi_root.dart';
-import 'package:front_end/src/api_prototype/compiler_options.dart';
-import 'package:front_end/src/api_prototype/experimental_flags.dart';
import 'package:front_end/src/api_prototype/file_system.dart';
import 'package:front_end/src/api_unstable/ddc.dart';
import 'package:kernel/ast.dart' show Component, Library;
diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart
index bd36fbb..dea8b77 100644
--- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart
+++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_test.dart
@@ -10,8 +10,6 @@
import 'package:dev_compiler/dev_compiler.dart';
import 'package:dev_compiler/src/compiler/module_builder.dart';
import 'package:front_end/src/api_unstable/ddc.dart';
-import 'package:front_end/src/api_prototype/compiler_options.dart'
- show CompilerOptions;
import 'package:front_end/src/compute_platform_binaries_location.dart';
import 'package:front_end/src/fasta/incremental_serializer.dart';
import 'package:kernel/ast.dart' show Component, Library;
diff --git a/pkg/dev_compiler/test/expression_compiler/scope_offset_test.dart b/pkg/dev_compiler/test/expression_compiler/scope_offset_test.dart
index 09c1b79..5fa3f1f 100644
--- a/pkg/dev_compiler/test/expression_compiler/scope_offset_test.dart
+++ b/pkg/dev_compiler/test/expression_compiler/scope_offset_test.dart
@@ -5,7 +5,6 @@
// @dart = 2.9
import 'package:dev_compiler/src/kernel/expression_compiler.dart';
-import 'package:front_end/src/api_prototype/standard_file_system.dart';
import 'package:front_end/src/api_unstable/ddc.dart';
import 'package:front_end/src/compute_platform_binaries_location.dart';
import 'package:kernel/ast.dart';
diff --git a/pkg/dev_compiler/test/sourcemap/common.dart b/pkg/dev_compiler/test/sourcemap/common.dart
index 3e9564d..19972c4 100644
--- a/pkg/dev_compiler/test/sourcemap/common.dart
+++ b/pkg/dev_compiler/test/sourcemap/common.dart
@@ -4,8 +4,6 @@
// @dart = 2.9
-import 'dart:async' show Future;
-
import 'dart:io';
import 'package:_fe_analyzer_shared/src/testing/annotated_code_helper.dart';
diff --git a/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart b/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart
index 0a88bc0..ea96e19 100644
--- a/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart
+++ b/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart
@@ -4,7 +4,6 @@
// @dart = 2.9
-import 'dart:async';
import 'dart:io';
import 'package:dev_compiler/src/kernel/command.dart';
diff --git a/pkg/dev_compiler/test/worker/worker_test.dart b/pkg/dev_compiler/test/worker/worker_test.dart
index 916f797..b03c32f 100644
--- a/pkg/dev_compiler/test/worker/worker_test.dart
+++ b/pkg/dev_compiler/test/worker/worker_test.dart
@@ -9,8 +9,6 @@
import 'dart:io';
import 'package:bazel_worker/bazel_worker.dart';
-// TODO(jakemac): Remove once this is a part of the testing library.
-import 'package:bazel_worker/src/async_message_grouper.dart';
import 'package:bazel_worker/testing.dart';
import 'package:path/path.dart' show dirname, join, joinAll;
import 'package:test/test.dart';
diff --git a/tools/VERSION b/tools/VERSION
index 3971c49..aa3b017 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 12
PATCH 0
-PRERELEASE 191
+PRERELEASE 192
PRERELEASE_PATCH 0
\ No newline at end of file
