firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[driver] upgrade to the latest version of vm_service_client (#3348)

Browse Source
This commit is contained in:
Yegor 2016-04-14 23:23:45 -07:00
parent 86597cd10d
commit 0e9737e4cc
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/flutter_driver/lib/src/driver.dart
View File

@ -4,9 +4,10 @@
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:vm_service_client/vm_service_client.dart';
import 'package:matcher/matcher.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as rpc; import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
import 'package:matcher/matcher.dart';
import 'package:vm_service_client/vm_service_client.dart';
import 'package:web_socket_channel/io.dart';
import 'error.dart'; import 'error.dart';
import 'find.dart'; import 'find.dart';
@ -331,8 +332,8 @@ Future<VMServiceClientConnection> _waitAndConnect(String url) async {
ws1 = await WebSocket.connect(uri.toString()); ws1 = await WebSocket.connect(uri.toString());
ws2 = await WebSocket.connect(uri.toString()); ws2 = await WebSocket.connect(uri.toString());
return new VMServiceClientConnection( return new VMServiceClientConnection(
new VMServiceClient(ws1), new VMServiceClient(new IOWebSocketChannel(ws1)),
new rpc.Peer(ws2, ws2)..listen() new rpc.Peer(new IOWebSocketChannel(ws2))..listen()
); );
} catch(e) { } catch(e) {
if (ws1 != null) if (ws1 != null)

15
packages/flutter_driver/pubspec.yaml
View File

@ -8,17 +8,18 @@ environment:
sdk: '>=1.12.0 <2.0.0' sdk: '>=1.12.0 <2.0.0'
dependencies: dependencies:
file: ^0.1.0 file: '^0.1.0'
json_rpc_2: any json_rpc_2: '^2.0.0'
matcher: '>=0.12.0 <1.0.0' matcher: '>=0.12.0 <1.0.0'
path: ^1.3.0 path: '^1.3.0'
vm_service_client: '>=0.1.2 <0.2.0' web_socket_channel: '^1.0.0'
vm_service_client: '^0.2.0'
flutter: flutter:
path: '../flutter' path: '../flutter'
flutter_test: flutter_test:
path: '../flutter_test' path: '../flutter_test'
dev_dependencies: dev_dependencies:
test: 0.12.13 test: '0.12.13'
mockito: ^0.11.0 mockito: '^0.11.0'
quiver: ^0.21.4 quiver: '^0.21.4'