diff --git a/dev/missing_dependency_tests/pubspec.yaml b/dev/missing_dependency_tests/pubspec.yaml index fb7cac9ab8..972673031b 100644 --- a/dev/missing_dependency_tests/pubspec.yaml +++ b/dev/missing_dependency_tests/pubspec.yaml @@ -1,7 +1,7 @@ name: missing_dependency_tests environment: - sdk: ">=2.0.0-dev.68.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" dependencies: flutter: diff --git a/dev/tracing_tests/pubspec.yaml b/dev/tracing_tests/pubspec.yaml index cca1f69c4a..16b7488415 100644 --- a/dev/tracing_tests/pubspec.yaml +++ b/dev/tracing_tests/pubspec.yaml @@ -2,7 +2,7 @@ name: tracing_tests description: Various tests for tracing in flutter/flutter environment: - sdk: ">=2.2.2 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" dependencies: flutter: diff --git a/dev/tracing_tests/test/default_streams_test.dart b/dev/tracing_tests/test/default_streams_test.dart index 171eac47c4..a215fcfbee 100644 --- a/dev/tracing_tests/test/default_streams_test.dart +++ b/dev/tracing_tests/test/default_streams_test.dart @@ -12,7 +12,7 @@ import 'package:vm_service/vm_service_io.dart'; // for "Dart", "Embedder", and "GC" recorded from startup. void main() { - VmService vmService; + late VmService vmService; setUpAll(() async { final developer.ServiceProtocolInfo info = await developer.Service.getInfo(); @@ -22,7 +22,7 @@ void main() { } vmService = await vmServiceConnectUri( - 'ws://localhost:${info.serverUri.port}${info.serverUri.path}ws', + 'ws://localhost:${info.serverUri!.port}${info.serverUri!.path}ws', ); }); diff --git a/dev/tracing_tests/test/image_cache_tracing_test.dart b/dev/tracing_tests/test/image_cache_tracing_test.dart index bae94ab696..0ef752d3f3 100644 --- a/dev/tracing_tests/test/image_cache_tracing_test.dart +++ b/dev/tracing_tests/test/image_cache_tracing_test.dart @@ -12,8 +12,8 @@ import 'package:vm_service/vm_service.dart'; import 'package:vm_service/vm_service_io.dart'; void main() { - VmService vmService; - String isolateId; + late VmService vmService; + late String isolateId; setUpAll(() async { final developer.ServiceProtocolInfo info = await developer.Service.getInfo(); @@ -21,9 +21,9 @@ void main() { fail('This test _must_ be run with --enable-vmservice.'); } - vmService = await vmServiceConnectUri('ws://localhost:${info.serverUri.port}${info.serverUri.path}ws'); + vmService = await vmServiceConnectUri('ws://localhost:${info.serverUri!.port}${info.serverUri!.path}ws'); await vmService.setVMTimelineFlags(['Dart']); - isolateId = developer.Service.getIsolateID(isolate.Isolate.current); + isolateId = developer.Service.getIsolateID(isolate.Isolate.current)!; // Initialize the image cache. TestWidgetsFlutterBinding.ensureInitialized(); @@ -32,22 +32,22 @@ void main() { test('Image cache tracing', () async { final TestImageStreamCompleter completer1 = TestImageStreamCompleter(); final TestImageStreamCompleter completer2 = TestImageStreamCompleter(); - PaintingBinding.instance.imageCache.putIfAbsent( + PaintingBinding.instance!.imageCache!.putIfAbsent( 'Test', () => completer1, ); - PaintingBinding.instance.imageCache.clear(); + PaintingBinding.instance!.imageCache!.clear(); completer2.testSetImage(ImageInfo(image: await createTestImage())); - PaintingBinding.instance.imageCache.putIfAbsent( + PaintingBinding.instance!.imageCache!.putIfAbsent( 'Test2', () => completer2, ); - PaintingBinding.instance.imageCache.evict('Test2'); + PaintingBinding.instance!.imageCache!.evict('Test2'); final Timeline timeline = await vmService.getVMTimeline(); _expectTimelineEvents( - timeline.traceEvents, + timeline.traceEvents!, >[ { 'name': 'ImageCache.putIfAbsent', @@ -83,9 +83,9 @@ void main() { void _expectTimelineEvents(List events, List> expected) { for (final TimelineEvent event in events) { for (int index = 0; index < expected.length; index += 1) { - if (expected[index]['name'] == event.json['name']) { + if (expected[index]['name'] == event.json!['name']) { final Map expectedArgs = expected[index]['args'] as Map; - final Map args = event.json['args'] as Map; + final Map args = event.json!['args'] as Map; if (_mapsEqual(expectedArgs, args)) { expected.removeAt(index); } diff --git a/dev/tracing_tests/test/image_painting_event_test.dart b/dev/tracing_tests/test/image_painting_event_test.dart index eb3828dad1..867e8bce8f 100644 --- a/dev/tracing_tests/test/image_painting_event_test.dart +++ b/dev/tracing_tests/test/image_painting_event_test.dart @@ -14,8 +14,8 @@ import 'package:vm_service/vm_service.dart'; import 'package:vm_service/vm_service_io.dart'; void main() { - VmService vmService; - LiveTestWidgetsFlutterBinding binding; + late VmService vmService; + late LiveTestWidgetsFlutterBinding binding; setUpAll(() async { final developer.ServiceProtocolInfo info = await developer.Service.getInfo(); @@ -24,7 +24,7 @@ void main() { fail('This test _must_ be run with --enable-vmservice.'); } - vmService = await vmServiceConnectUri('ws://localhost:${info.serverUri.port}${info.serverUri.path}ws'); + vmService = await vmServiceConnectUri('ws://localhost:${info.serverUri!.port}${info.serverUri!.path}ws'); await vmService.streamListen(EventStreams.kExtension); // Initialize bindings @@ -72,7 +72,7 @@ void main() { final Event event = await completer.future; expect(event.extensionKind, 'Flutter.ImageSizesForFrame'); expect( - jsonEncode(event.extensionData.data), + jsonEncode(event.extensionData!.data), '{"test.png":{"source":"test.png","displaySize":{"width":200.0,"height":100.0},"imageSize":{"width":300.0,"height":300.0},"displaySizeInBytes":106666,"decodedSizeInBytes":480000}}', ); }, skip: isBrowser); // uses dart:isolate and io @@ -101,7 +101,7 @@ void main() { final Event event = await completer.future; expect(event.extensionKind, 'Flutter.ImageSizesForFrame'); expect( - jsonEncode(event.extensionData.data), + jsonEncode(event.extensionData!.data), '{"test.png":{"source":"test.png","displaySize":{"width":300.0,"height":300.0},"imageSize":{"width":300.0,"height":300.0},"displaySizeInBytes":480000,"decodedSizeInBytes":480000}}', ); }, skip: isBrowser); // uses dart:isolate and io