Support latest null safe vm_service (#2617)

Author: grouma

packages/devtools/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.6+2
+* Support null safe `package:vm_service` version `>=6.x.x`. 
+
+## 0.9.6+1  
+* Fallback to port 0 if we cannot connect the DevTools server to ports 9100-9109 #2600 
+
 ## 0.9.6
 * Remove use of Flutter service worker [#2586](https://github.com/flutter/devtools/pull/2586)
 * Badge performance tab when UI jank is detected and add a setting to enable/disable this functionality. [#2580](https://github.com/flutter/devtools/pull/2580)

packages/devtools/pubspec.yaml

@@ -8,16 +8,16 @@ description: A suite of web-based performance tooling for Dart and Flutter.
 # package remaining purely as a container for the compiled copy of the devtools
 # app. That ensures that version constraints for the devtools_app do not impact
 # this package.
-version: 0.9.6
+version: 0.9.6+2
 
 homepage: https://github.com/flutter/devtools
 
 environment:
   sdk: '>=2.3.0 <3.0.0'
 
 dependencies:
-  devtools_server: 0.9.6
-  devtools_shared: 0.9.6
+  devtools_server: 0.9.6+2
+  devtools_shared: 0.9.6+2
   http: ^0.12.0+1
 
 dependency_overrides:

packages/devtools_app/lib/devtools.dart

@@ -7,4 +7,4 @@
 // that updates all versions for DevTools.
 // Note: a regexp in tools/update_version.sh matches the following line so
 // if you change it you must also modify tools/update_version.sh.
-const String version = '0.9.6';
+const String version = '0.9.6+2';

packages/devtools_app/lib/src/vm_service_wrapper.dart

@@ -99,7 +99,8 @@ class VmServiceWrapper implements VmService {
   }
 
   @override
-  Future<Response> callMethod(String method, {String isolateId, Map args}) {
+  Future<Response> callMethod(String method,
+      {String isolateId, Map<String, dynamic> args}) {
     return trackFuture('callMethod $method',
         _vmService.callMethod(method, isolateId: isolateId, args: args));
   }
@@ -108,7 +109,7 @@ class VmServiceWrapper implements VmService {
   Future<Response> callServiceExtension(
     String method, {
     String isolateId,
-    Map args,
+    Map<String, dynamic> args,
   }) {
     return trackFuture(
         'callServiceExtension $method',
@@ -152,7 +153,7 @@ class VmServiceWrapper implements VmService {
   Future get onDone => _vmService.onDone;
 
   @override
-  void dispose() => _vmService.dispose();
+  Future<void> dispose() => _vmService.dispose();
 
   @override
   Future<Response> evaluate(
@@ -1037,7 +1038,7 @@ extension VmServicePrivate on VmServiceWrapper {
     String method, {
     @required T Function(Map<String, dynamic>) parser,
     String isolateId,
-    Map args,
+    Map<String, dynamic> args,
   }) async {
     if (!enablePrivateRpcs) {
       throw StateError('Attempted to invoke private RPC');

packages/devtools_app/pubspec.yaml

@@ -6,7 +6,7 @@ description: Web-based performance tooling for Dart and Flutter.
 # When publishing new versions of this package be sure to publish a new version
 # of package:devtools as well. package:devtools contains a compiled snapshot of
 # this package.
-version: 0.9.6
+version: 0.9.6+2
 
 homepage: https://github.com/flutter/devtools
 
@@ -26,7 +26,7 @@ dependencies:
   ansicolor: 1.0.5
   async: ^2.0.0 
   collection: ^1.15.0-nnbd
-  devtools_shared: 0.9.6+1
+  devtools_shared: 0.9.6+2
   file: ^5.1.0
   flutter:
     sdk: flutter
@@ -44,15 +44,15 @@ dependencies:
   string_scanner: ^1.1.0-nullsafety.3
   url_launcher: ^5.0.0
   url_launcher_web: ^0.1.1+6
-  vm_service: ^5.4.0
+  vm_service: '6.0.0-nullsafety.1'
   vm_snapshot_analysis: ^0.5.5
   web_socket_channel: ^1.1.0
 
 dev_dependencies:
   build_runner: ^1.3.0
   devtools: #^0.1.7
     path: ../devtools
-  devtools_testing: 0.9.6
+  devtools_testing: 0.9.6+2
   flutter_test:
     sdk: flutter
   mockito: ^4.0.0

packages/devtools_app/test/support/cli_test_driver.dart

@@ -56,10 +56,7 @@ class AppFixture {
   }
 
   Future<void> teardown() async {
-    serviceConnection.dispose();
-    // Dispose is synchronous, so wait for it to finish closing before
-    // terminating the process.
-    await serviceConnection.onDone;
+    await serviceConnection.dispose();
     process.kill();
   }
 }

packages/devtools_server/pubspec.yaml

@@ -3,7 +3,7 @@ description: A server that supports Dart DevTools.
 
 # Note: this version should only be updated by running tools/update_version.sh
 # that updates all versions of packages from packages/devtools.
-version: 0.9.6
+version: 0.9.6+2
 
 homepage: https://github.com/flutter/devtools
 
@@ -13,7 +13,7 @@ environment:
 dependencies:
   args: ^1.5.1
   browser_launcher: ^0.1.5
-  devtools_shared: 0.9.6
+  devtools_shared: 0.9.6+2
   intl: ^0.16.1
   meta: ^1.1.0
   path: ^1.6.0
@@ -23,7 +23,7 @@ dependencies:
   shelf_static: ^0.2.8
   http_multi_server: ^2.2.0
   usage: ^3.4.1
-  vm_service: ^5.0.0+1
+  vm_service: '>=5.0.0+1 < 7.0.0'
 
 dependency_overrides:
 # The "#OVERRIDE_FOR_DEVELOPMENT" lines are stripped out when we publish.

packages/devtools_shared/pubspec.yaml

@@ -3,7 +3,7 @@ description: Package of shared structures between devtools_app and devtools_serv
 
 # Note: this version should only be updated by running tools/update_version.sh
 # that updates all versions of packages from packages/devtools.
-version: 0.9.6+1
+version: 0.9.6+2
 
 homepage: https://github.com/flutter/devtools
 

packages/devtools_testing/lib/support/flutter_test_driver.dart

@@ -398,7 +398,7 @@ class FlutterRunTestDriver extends FlutterTestDriver {
   Future<int> detach() async {
     if (vmService != null) {
       debugPrint('Closing VM service');
-      vmService.dispose();
+      await vmService.dispose();
     }
     if (_currentRunningAppId != null) {
       debugPrint('Detaching from app');
@@ -423,7 +423,7 @@ class FlutterRunTestDriver extends FlutterTestDriver {
   Future<int> stop() async {
     if (vmService != null) {
       debugPrint('Closing VM service');
-      vmService.dispose();
+      await vmService.dispose();
     }
     if (_currentRunningAppId != null) {
       debugPrint('Stopping app');

packages/devtools_testing/pubspec.yaml

@@ -2,16 +2,16 @@ name: devtools_testing
 description: Package of shared testing code for Dart DevTools.
 # Note: this version should only be updated by running tools/update_version.sh
 # that updates all versions of packages from packages/devtools.
-version: 0.9.6
+version: 0.9.6+2
 
 homepage: https://github.com/flutter/devtools
 
 environment:
   sdk: '>=2.3.0 <3.0.0'
 
 dependencies:
-  devtools_app: 0.9.6
-  devtools_shared: 0.9.6
+  devtools_app: 0.9.6+2
+  devtools_shared: 0.9.6+2
   flutter:
     sdk: flutter
   flutter_test:
@@ -21,7 +21,7 @@ dependencies:
   package_resolver: ^1.0.0
   pedantic: ^1.7.0
   test: any # This version is pinned by Flutter so we don't need to set one explicitly.
-  vm_service: ^5.0.0+1
+  vm_service: '>=5.0.0+1 < 7.0.0'
 
 
 dev_dependencies: