diff --git a/lib/web_ui/dev/browser.dart b/lib/web_ui/dev/browser.dart index c486d8097f4ac..ed40d295ca05a 100644 --- a/lib/web_ui/dev/browser.dart +++ b/lib/web_ui/dev/browser.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:math' as math; import 'package:image/image.dart'; -import 'package:test_api/src/backend/runtime.dart'; +import 'package:test_api/backend.dart'; /// Provides the environment for a specific web browser. abstract class BrowserEnvironment { diff --git a/lib/web_ui/dev/build.dart b/lib/web_ui/dev/build.dart index 3a67ec740b61b..1b6fcf3cbe5f6 100644 --- a/lib/web_ui/dev/build.dart +++ b/lib/web_ui/dev/build.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:args/command_runner.dart'; import 'package:path/path.dart' as path; -import 'package:watcher/src/watch_event.dart'; +import 'package:watcher/watcher.dart'; import 'environment.dart'; import 'exceptions.dart'; diff --git a/lib/web_ui/dev/chrome.dart b/lib/web_ui/dev/chrome.dart index b209ddfb96dff..d6ecd3d2daafd 100644 --- a/lib/web_ui/dev/chrome.dart +++ b/lib/web_ui/dev/chrome.dart @@ -9,7 +9,7 @@ import 'dart:math' as math; import 'package:image/image.dart'; import 'package:path/path.dart' as path; -import 'package:test_api/src/backend/runtime.dart'; +import 'package:test_api/backend.dart'; import 'package:webkit_inspection_protocol/webkit_inspection_protocol.dart' as wip; diff --git a/lib/web_ui/dev/edge.dart b/lib/web_ui/dev/edge.dart index f8369d822274b..b27a401b42594 100644 --- a/lib/web_ui/dev/edge.dart +++ b/lib/web_ui/dev/edge.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:test_api/src/backend/runtime.dart'; +import 'package:test_api/backend.dart'; import 'browser.dart'; import 'browser_process.dart'; diff --git a/lib/web_ui/dev/firefox.dart b/lib/web_ui/dev/firefox.dart index a770fb19f24cd..2495456019d39 100644 --- a/lib/web_ui/dev/firefox.dart +++ b/lib/web_ui/dev/firefox.dart @@ -6,8 +6,9 @@ import 'dart:async'; import 'dart:io'; import 'package:path/path.dart' as path; -import 'package:test_api/src/backend/runtime.dart'; -import 'package:test_core/src/util/io.dart'; +import 'package:test_api/backend.dart'; +// TODO(ditman): Fix ignore when https://github.com/flutter/flutter/issues/143599 is resolved. +import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports import 'browser.dart'; import 'browser_process.dart'; diff --git a/lib/web_ui/dev/safari_macos.dart b/lib/web_ui/dev/safari_macos.dart index 5e5329a934bb3..fe726b3f7b7b6 100644 --- a/lib/web_ui/dev/safari_macos.dart +++ b/lib/web_ui/dev/safari_macos.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:test_api/src/backend/runtime.dart'; +import 'package:test_api/backend.dart'; import 'webdriver_browser.dart'; diff --git a/lib/web_ui/dev/steps/run_suite_step.dart b/lib/web_ui/dev/steps/run_suite_step.dart index a19abdc5302c9..2906c6b44278e 100644 --- a/lib/web_ui/dev/steps/run_suite_step.dart +++ b/lib/web_ui/dev/steps/run_suite_step.dart @@ -9,9 +9,10 @@ import 'package:path/path.dart' as pathlib; // TODO(yjbanov): remove hacks when this is fixed: // https://github.com/dart-lang/test/issues/1521 import 'package:skia_gold_client/skia_gold_client.dart'; -import 'package:test_api/src/backend/runtime.dart' as hack; -import 'package:test_core/src/executable.dart' as test; -import 'package:test_core/src/runner/hack_register_platform.dart' as hack; +import 'package:test_api/backend.dart' as hack; +// TODO(ditman): Fix ignores when https://github.com/flutter/flutter/issues/143599 is resolved. +import 'package:test_core/src/executable.dart' as test; // ignore: implementation_imports +import 'package:test_core/src/runner/hack_register_platform.dart' as hack; // ignore: implementation_imports import '../browser.dart'; import '../common.dart'; diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart index 4024eff179a3b..9c34e0c6c62d5 100644 --- a/lib/web_ui/dev/test_platform.dart +++ b/lib/web_ui/dev/test_platform.dart @@ -22,16 +22,14 @@ import 'package:shelf_web_socket/shelf_web_socket.dart'; import 'package:skia_gold_client/skia_gold_client.dart'; import 'package:stream_channel/stream_channel.dart'; -import 'package:test_api/src/backend/runtime.dart'; -import 'package:test_api/src/backend/suite_platform.dart'; -import 'package:test_core/src/runner/configuration.dart'; -import 'package:test_core/src/runner/environment.dart'; -import 'package:test_core/src/runner/platform.dart'; -import 'package:test_core/src/runner/plugin/platform_helpers.dart'; -import 'package:test_core/src/runner/runner_suite.dart'; -import 'package:test_core/src/runner/suite.dart'; -import 'package:test_core/src/util/io.dart'; -import 'package:test_core/src/util/stack_trace_mapper.dart'; +import 'package:test_core/backend.dart' hide Compiler; +// TODO(ditman): Fix ignores when https://github.com/flutter/flutter/issues/143599 is resolved. +import 'package:test_core/src/runner/environment.dart'; // ignore: implementation_imports +import 'package:test_core/src/runner/platform.dart'; // ignore: implementation_imports +import 'package:test_core/src/runner/plugin/platform_helpers.dart'; // ignore: implementation_imports +import 'package:test_core/src/runner/runner_suite.dart'; // ignore: implementation_imports +import 'package:test_core/src/util/io.dart'; // ignore: implementation_imports +import 'package:test_core/src/util/stack_trace_mapper.dart'; // ignore: implementation_imports import 'package:web_socket_channel/web_socket_channel.dart'; import 'package:web_test_utils/image_compare.dart';