diff --git a/pkg/vm_service/analysis_options.yaml b/pkg/vm_service/analysis_options.yaml index 413f41273bb..382a641fdfa 100644 --- a/pkg/vm_service/analysis_options.yaml +++ b/pkg/vm_service/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:pedantic/analysis_options.1.8.0.yaml +include: package:lints/core.yaml linter: rules: diff --git a/pkg/vm_service/example/vm_service_tester.dart b/pkg/vm_service/example/vm_service_tester.dart index eb5158b522d..b5c1eae468e 100644 --- a/pkg/vm_service/example/vm_service_tester.dart +++ b/pkg/vm_service/example/vm_service_tester.dart @@ -10,7 +10,6 @@ import 'dart:convert'; import 'dart:io'; import 'package:path/path.dart' as path; -import 'package:pedantic/pedantic.dart'; import 'package:test/test.dart'; import 'package:vm_service/vm_service.dart'; import 'package:vm_service/vm_service_io.dart'; @@ -109,7 +108,7 @@ void main() { VM vm = await serviceClient.getVM(); print('hostCPU=${vm.hostCPU}'); print(await serviceClient.getVersion()); - List isolates = await vm.isolates!; + List isolates = vm.isolates!; print(isolates); // Disable the json reserialization checks since custom services are not diff --git a/pkg/vm_service/pubspec.yaml b/pkg/vm_service/pubspec.yaml index 7de79cfa5ed..9d8c47ad71a 100644 --- a/pkg/vm_service/pubspec.yaml +++ b/pkg/vm_service/pubspec.yaml @@ -8,17 +8,17 @@ version: 8.2.2+1 homepage: https://github.com/dart-lang/sdk/tree/master/pkg/vm_service environment: - sdk: '>=2.12.0-0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: dev_dependencies: async: ^2.5.0 expect: any + lints: any markdown: ^4.0.0-nullsafety.0 mockito: ^5.0.0-nullsafety.1 path: ^1.8.0 - pedantic: ^1.10.0-nullsafety.3 process: ^4.0.0 pub_semver: ^2.0.0-nullsafety.0 test: ^1.16.0-nullsafety.13 diff --git a/pkg/vm_service/test/analysis_options.yaml b/pkg/vm_service/test/analysis_options.yaml new file mode 100644 index 00000000000..898419264cc --- /dev/null +++ b/pkg/vm_service/test/analysis_options.yaml @@ -0,0 +1 @@ +# This options file exists to reset the settings from the parent directory. diff --git a/pkg/vm_service/test/regress_43940_test.dart b/pkg/vm_service/test/regress_43940_test.dart index 3a490f38984..b7ba5ce4b18 100644 --- a/pkg/vm_service/test/regress_43940_test.dart +++ b/pkg/vm_service/test/regress_43940_test.dart @@ -4,7 +4,6 @@ import 'dart:async'; -import 'package:pedantic/pedantic.dart'; import 'package:test/test.dart'; import 'package:vm_service/vm_service.dart'; diff --git a/pkg/vm_service/test/server_test.dart b/pkg/vm_service/test/server_test.dart index 97b0aed9f48..db0f7e86930 100644 --- a/pkg/vm_service/test/server_test.dart +++ b/pkg/vm_service/test/server_test.dart @@ -10,7 +10,6 @@ import 'dart:convert'; import 'package:async/async.dart'; import 'package:mockito/mockito.dart'; -import 'package:pedantic/pedantic.dart'; import 'package:test/test.dart'; import 'package:vm_service/vm_service.dart';