[flutter_tools] remove vm_service_client dependency from flutter tool (#51227)
This commit is contained in:
parent
e2dcdb60e3
commit
e6e79bce6f
@ -20,7 +20,7 @@ dependencies:
|
|||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
# This plugin is using Android Embedding 1
|
# This plugin is using Android Embedding 1
|
||||||
battery: 0.3.1+7
|
battery: 0.3.1+8
|
||||||
# TODO(egarciad): Add a plugin that uses Android Embedding 2
|
# TODO(egarciad): Add a plugin that uses Android Embedding 2
|
||||||
|
|
||||||
# The following adds the Cupertino Icons font to your application.
|
# The following adds the Cupertino Icons font to your application.
|
||||||
@ -99,4 +99,4 @@ flutter:
|
|||||||
# For details regarding fonts from package dependencies,
|
# For details regarding fonts from package dependencies,
|
||||||
# see https://flutter.dev/custom-fonts/#from-packages
|
# see https://flutter.dev/custom-fonts/#from-packages
|
||||||
|
|
||||||
# PUBSPEC CHECKSUM: c4e5
|
# PUBSPEC CHECKSUM: 74e6
|
||||||
|
@ -7,7 +7,7 @@ dependencies:
|
|||||||
sdk: flutter
|
sdk: flutter
|
||||||
flutter_driver:
|
flutter_driver:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
path_provider: 1.6.0
|
path_provider: 1.6.1
|
||||||
collection: 1.14.11
|
collection: 1.14.11
|
||||||
assets_for_android_views:
|
assets_for_android_views:
|
||||||
git:
|
git:
|
||||||
@ -88,4 +88,4 @@ dev_dependencies:
|
|||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|
||||||
# PUBSPEC CHECKSUM: d9b2
|
# PUBSPEC CHECKSUM: 49b3
|
||||||
|
@ -10,7 +10,7 @@ dependencies:
|
|||||||
flutter_driver:
|
flutter_driver:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
cupertino_icons: 0.1.3
|
cupertino_icons: 0.1.3
|
||||||
device_info: 0.4.1+4
|
device_info: 0.4.1+5
|
||||||
|
|
||||||
archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
@ -81,4 +81,4 @@ flutter:
|
|||||||
assets:
|
assets:
|
||||||
- assets/
|
- assets/
|
||||||
|
|
||||||
# PUBSPEC CHECKSUM: 2e1d
|
# PUBSPEC CHECKSUM: c71e
|
||||||
|
@ -17,7 +17,7 @@ dev_dependencies:
|
|||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|
||||||
e2e: 0.2.4+1
|
e2e: 0.2.4+2
|
||||||
|
|
||||||
archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
@ -39,4 +39,4 @@ dev_dependencies:
|
|||||||
test_api: 0.2.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
test_api: 0.2.14 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
xml: 3.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
xml: 3.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
|
|
||||||
# PUBSPEC CHECKSUM: be3b
|
# PUBSPEC CHECKSUM: 993c
|
||||||
|
@ -8,11 +8,11 @@ dependencies:
|
|||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
collection: 1.14.11
|
collection: 1.14.11
|
||||||
device_info: 0.4.1+4
|
device_info: 0.4.1+5
|
||||||
intl: 0.16.1
|
intl: 0.16.1
|
||||||
connectivity: 0.4.6+2
|
connectivity: 0.4.8+1
|
||||||
string_scanner: 1.0.5
|
string_scanner: 1.0.5
|
||||||
url_launcher: 5.4.1
|
url_launcher: 5.4.2
|
||||||
cupertino_icons: 0.1.3
|
cupertino_icons: 0.1.3
|
||||||
video_player: 0.10.6
|
video_player: 0.10.6
|
||||||
scoped_model: 1.0.1
|
scoped_model: 1.0.1
|
||||||
@ -23,18 +23,20 @@ dependencies:
|
|||||||
flutter_gallery_assets: 0.1.9+2
|
flutter_gallery_assets: 0.1.9+2
|
||||||
|
|
||||||
charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
|
connectivity_macos: 0.1.0+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
|
connectivity_platform_interface: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
meta: 1.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
meta: 1.1.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
path: 1.6.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
plugin_platform_interface: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
plugin_platform_interface: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
source_span: 1.5.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
term_glyph: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
typed_data: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
url_launcher_macos: 0.0.1+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
url_launcher_macos: 0.0.1+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
url_launcher_platform_interface: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
url_launcher_platform_interface: 1.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
url_launcher_web: 0.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
url_launcher_web: 0.1.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
vector_math: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
video_player_platform_interface: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
video_player_platform_interface: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
video_player_web: 0.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
video_player_web: 0.1.2+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
flutter_test:
|
flutter_test:
|
||||||
@ -272,4 +274,4 @@ flutter:
|
|||||||
- asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf
|
- asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf
|
||||||
- asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf
|
- asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf
|
||||||
|
|
||||||
# PUBSPEC CHECKSUM: 2ff3
|
# PUBSPEC CHECKSUM: 0c3d
|
||||||
|
@ -12,7 +12,7 @@ dependencies:
|
|||||||
archive: 2.0.11
|
archive: 2.0.11
|
||||||
args: 1.5.2
|
args: 1.5.2
|
||||||
dwds: 1.0.1
|
dwds: 1.0.1
|
||||||
completion: 0.2.1+1
|
completion: 0.2.2
|
||||||
coverage: 0.13.6
|
coverage: 0.13.6
|
||||||
crypto: 2.1.3
|
crypto: 2.1.3
|
||||||
file: 5.1.0
|
file: 5.1.0
|
||||||
@ -29,7 +29,6 @@ dependencies:
|
|||||||
stack_trace: 1.9.3
|
stack_trace: 1.9.3
|
||||||
stream_channel: 2.0.0
|
stream_channel: 2.0.0
|
||||||
usage: 3.4.1
|
usage: 3.4.1
|
||||||
vm_service_client: 0.2.6+2
|
|
||||||
webdriver: 2.1.2
|
webdriver: 2.1.2
|
||||||
web_socket_channel: 1.1.0
|
web_socket_channel: 1.1.0
|
||||||
webkit_inspection_protocol: 0.5.0
|
webkit_inspection_protocol: 0.5.0
|
||||||
@ -128,4 +127,4 @@ dartdoc:
|
|||||||
# Exclude this package from the hosted API docs.
|
# Exclude this package from the hosted API docs.
|
||||||
nodoc: true
|
nodoc: true
|
||||||
|
|
||||||
# PUBSPEC CHECKSUM: 4b0c
|
# PUBSPEC CHECKSUM: fdeb
|
||||||
|
@ -7,7 +7,6 @@ import 'dart:developer';
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'dart:isolate';
|
import 'dart:isolate';
|
||||||
|
|
||||||
import 'package:async/async.dart';
|
|
||||||
import 'package:coverage/coverage.dart';
|
import 'package:coverage/coverage.dart';
|
||||||
import 'package:flutter_tools/src/base/common.dart';
|
import 'package:flutter_tools/src/base/common.dart';
|
||||||
import 'package:flutter_tools/src/context_runner.dart';
|
import 'package:flutter_tools/src/context_runner.dart';
|
||||||
@ -15,12 +14,10 @@ import 'package:flutter_tools/src/test/test_wrapper.dart';
|
|||||||
import 'package:path/path.dart' as path;
|
import 'package:path/path.dart' as path;
|
||||||
import 'package:stream_channel/isolate_channel.dart';
|
import 'package:stream_channel/isolate_channel.dart';
|
||||||
import 'package:stream_channel/stream_channel.dart';
|
import 'package:stream_channel/stream_channel.dart';
|
||||||
import 'package:vm_service_client/vm_service_client.dart'; // ignore: deprecated_member_use
|
|
||||||
import 'package:test_api/src/backend/suite_platform.dart'; // ignore: implementation_imports
|
import 'package:test_api/src/backend/suite_platform.dart'; // ignore: implementation_imports
|
||||||
import 'package:test_core/src/runner/runner_suite.dart'; // ignore: implementation_imports
|
import 'package:test_core/src/runner/runner_suite.dart'; // ignore: implementation_imports
|
||||||
import 'package:test_core/src/runner/suite.dart'; // ignore: implementation_imports
|
import 'package:test_core/src/runner/suite.dart'; // ignore: implementation_imports
|
||||||
import 'package:test_core/src/runner/plugin/platform_helpers.dart'; // ignore: implementation_imports
|
import 'package:test_core/src/runner/plugin/platform_helpers.dart'; // ignore: implementation_imports
|
||||||
import 'package:test_core/src/runner/environment.dart'; // ignore: implementation_imports
|
|
||||||
import 'package:flutter_tools/src/project.dart';
|
import 'package:flutter_tools/src/project.dart';
|
||||||
import 'package:flutter_tools/src/test/coverage_collector.dart';
|
import 'package:flutter_tools/src/test/coverage_collector.dart';
|
||||||
|
|
||||||
@ -108,12 +105,11 @@ class VMPlatform extends PlatformPlugin {
|
|||||||
},
|
},
|
||||||
));
|
));
|
||||||
|
|
||||||
VMEnvironment environment;
|
|
||||||
final RunnerSuiteController controller = deserializeSuite(
|
final RunnerSuiteController controller = deserializeSuite(
|
||||||
codePath,
|
codePath,
|
||||||
platform,
|
platform,
|
||||||
suiteConfig,
|
suiteConfig,
|
||||||
environment,
|
null,
|
||||||
channel,
|
channel,
|
||||||
message,
|
message,
|
||||||
);
|
);
|
||||||
@ -160,32 +156,3 @@ class VMPlatform extends PlatformPlugin {
|
|||||||
..writeAsStringSync(result);
|
..writeAsStringSync(result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class VMEnvironment implements Environment {
|
|
||||||
VMEnvironment(this.observatoryUrl, this._isolate);
|
|
||||||
|
|
||||||
@override
|
|
||||||
final bool supportsDebugging = false;
|
|
||||||
|
|
||||||
@override
|
|
||||||
final Uri observatoryUrl;
|
|
||||||
|
|
||||||
/// The VM service isolate object used to control this isolate.
|
|
||||||
final VMIsolateRef _isolate;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Uri get remoteDebuggerUrl => null;
|
|
||||||
|
|
||||||
@override
|
|
||||||
Stream<void> get onRestart => StreamController<dynamic>.broadcast().stream;
|
|
||||||
|
|
||||||
@override
|
|
||||||
CancelableOperation<void> displayPause() {
|
|
||||||
final CancelableCompleter<dynamic> completer = CancelableCompleter<dynamic>(onCancel: () => _isolate.resume());
|
|
||||||
|
|
||||||
completer.complete(_isolate.pause().then((dynamic _) => _isolate.onPauseOrResume
|
|
||||||
.firstWhere((VMPauseEvent event) => event is VMResumeEvent)));
|
|
||||||
|
|
||||||
return completer.operation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user