diff --git a/packages/devtools_app/lib/src/framework/framework_core.dart b/packages/devtools_app/lib/src/framework/framework_core.dart index ffce77a736e..d101ac33ebc 100644 --- a/packages/devtools_app/lib/src/framework/framework_core.dart +++ b/packages/devtools_app/lib/src/framework/framework_core.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import '../../devtools.dart' as devtools show version; import '../config_specific/import_export/import_export.dart'; diff --git a/packages/devtools_app/lib/src/framework_controller.dart b/packages/devtools_app/lib/src/framework_controller.dart index 710740fd599..7984038ee2f 100644 --- a/packages/devtools_app/lib/src/framework_controller.dart +++ b/packages/devtools_app/lib/src/framework_controller.dart @@ -4,7 +4,7 @@ import 'dart:async'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import 'globals.dart'; diff --git a/packages/devtools_app/lib/src/performance/legacy/performance_model.dart b/packages/devtools_app/lib/src/performance/legacy/performance_model.dart index f69d5d917a9..8d92dc11385 100644 --- a/packages/devtools_app/lib/src/performance/legacy/performance_model.dart +++ b/packages/devtools_app/lib/src/performance/legacy/performance_model.dart @@ -9,7 +9,7 @@ import 'dart:collection'; import 'dart:math' as math; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import '../../charts/flame_chart.dart'; import '../../profiler/cpu_profile_model.dart'; diff --git a/packages/devtools_app/lib/src/performance/performance_model.dart b/packages/devtools_app/lib/src/performance/performance_model.dart index dddb019ddf3..69588e4974a 100644 --- a/packages/devtools_app/lib/src/performance/performance_model.dart +++ b/packages/devtools_app/lib/src/performance/performance_model.dart @@ -5,7 +5,6 @@ import 'dart:collection'; import 'dart:math' as math; import 'package:flutter/foundation.dart'; -import 'package:meta/meta.dart'; import '../charts/flame_chart.dart'; import '../profiler/cpu_profile_model.dart'; diff --git a/packages/devtools_app/lib/src/profiler/cpu_profile_model.dart b/packages/devtools_app/lib/src/profiler/cpu_profile_model.dart index e98f44066e5..58dff4b8fea 100644 --- a/packages/devtools_app/lib/src/profiler/cpu_profile_model.dart +++ b/packages/devtools_app/lib/src/profiler/cpu_profile_model.dart @@ -4,8 +4,7 @@ import 'dart:collection'; import 'dart:convert'; -import 'package:flutter/cupertino.dart'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import '../charts/flame_chart.dart'; import '../trace_event.dart'; diff --git a/packages/devtools_app/lib/src/profiler/cpu_profile_service.dart b/packages/devtools_app/lib/src/profiler/cpu_profile_service.dart index 4646ec6ae60..aabeb53c90f 100644 --- a/packages/devtools_app/lib/src/profiler/cpu_profile_service.dart +++ b/packages/devtools_app/lib/src/profiler/cpu_profile_service.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'package:flutter/foundation.dart'; -import 'package:meta/meta.dart'; import '../globals.dart'; import '../vm_flags.dart' as vm_flags; diff --git a/packages/devtools_app/lib/src/provider/instance_viewer/instance_details.dart b/packages/devtools_app/lib/src/provider/instance_viewer/instance_details.dart index f84fd290dc1..50e5ad77b34 100644 --- a/packages/devtools_app/lib/src/provider/instance_viewer/instance_details.dart +++ b/packages/devtools_app/lib/src/provider/instance_viewer/instance_details.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:collection/collection.dart'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import 'package:vm_service/vm_service.dart'; import '../../eval_on_dart_library.dart'; diff --git a/packages/devtools_app/lib/src/provider/instance_viewer/result.dart b/packages/devtools_app/lib/src/provider/instance_viewer/result.dart index d4deec84064..4dae61ea226 100644 --- a/packages/devtools_app/lib/src/provider/instance_viewer/result.dart +++ b/packages/devtools_app/lib/src/provider/instance_viewer/result.dart @@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:collection/collection.dart'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import 'package:vm_service/vm_service.dart' hide SentinelException; import '../../eval_on_dart_library.dart'; diff --git a/packages/devtools_app/lib/src/provider/provider_nodes.dart b/packages/devtools_app/lib/src/provider/provider_nodes.dart index 9b9fb06fcbc..cf0f16f6bbc 100644 --- a/packages/devtools_app/lib/src/provider/provider_nodes.dart +++ b/packages/devtools_app/lib/src/provider/provider_nodes.dart @@ -1,7 +1,7 @@ import 'dart:async'; +import 'package:flutter/foundation.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:meta/meta.dart'; import 'package:vm_service/vm_service.dart'; import '../eval_on_dart_library.dart'; diff --git a/packages/devtools_app/lib/src/vm_service_wrapper.dart b/packages/devtools_app/lib/src/vm_service_wrapper.dart index 49a3d181eed..d7d97a3f168 100644 --- a/packages/devtools_app/lib/src/vm_service_wrapper.dart +++ b/packages/devtools_app/lib/src/vm_service_wrapper.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:dds/vm_service_extensions.dart'; -import 'package:meta/meta.dart'; +import 'package:flutter/foundation.dart'; import 'package:vm_service/vm_service.dart'; import 'globals.dart'; diff --git a/packages/devtools_app/test/association_variable_test.dart b/packages/devtools_app/test/association_variable_test.dart index 02dc21202f7..e3bf76b7c24 100644 --- a/packages/devtools_app/test/association_variable_test.dart +++ b/packages/devtools_app/test/association_variable_test.dart @@ -6,8 +6,8 @@ import 'package:devtools_app/src/debugger/debugger_model.dart'; import 'package:devtools_app/src/globals.dart'; import 'package:devtools_app/src/service_manager.dart'; import 'package:devtools_test/mocks.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:meta/meta.dart'; import 'package:mockito/mockito.dart'; import 'package:vm_service/vm_service.dart'; diff --git a/packages/devtools_app/test/integration_tests/server_test.dart b/packages/devtools_app/test/integration_tests/server_test.dart index 41b0b520866..57495923cb1 100644 --- a/packages/devtools_app/test/integration_tests/server_test.dart +++ b/packages/devtools_app/test/integration_tests/server_test.dart @@ -13,8 +13,8 @@ import 'package:devtools_test/cli_test_driver.dart'; import 'package:devtools_test/devtools_server_driver.dart'; import 'package:devtools_test/file_utils.dart'; import 'package:devtools_test/utils.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:meta/meta.dart'; import 'package:vm_service/vm_service.dart'; import 'integration.dart'; diff --git a/packages/devtools_app/test/span_parser_test.dart b/packages/devtools_app/test/span_parser_test.dart index abece3a9ac1..32f98f14505 100644 --- a/packages/devtools_app/test/span_parser_test.dart +++ b/packages/devtools_app/test/span_parser_test.dart @@ -7,8 +7,8 @@ import 'dart:convert'; import 'dart:io'; import 'package:devtools_app/src/debugger/span_parser.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:meta/meta.dart'; const helloWorld = ''' void main() { diff --git a/packages/devtools_test/lib/wrappers.dart b/packages/devtools_test/lib/wrappers.dart index cb9c9d7aeb9..07c51a7be41 100644 --- a/packages/devtools_test/lib/wrappers.dart +++ b/packages/devtools_test/lib/wrappers.dart @@ -7,7 +7,6 @@ import 'package:devtools_app/devtools_app.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:meta/meta.dart'; import 'package:provider/provider.dart'; import 'mocks.dart'; @@ -104,7 +103,6 @@ Widget wrapWithInspectorControllers(Widget widget) { /// Call [testWidgets], allowing the test to set specific values for app globals /// ([MessageBus], ...). -@isTest void testWidgetsWithContext( String description, WidgetTesterCallback callback, { @@ -130,7 +128,6 @@ void testWidgetsWithContext( } /// Runs a test with the size of the app window under test to [windowSize]. -@isTest void testWidgetsWithWindowSize( String name, Size windowSize, diff --git a/packages/devtools_test/pubspec.yaml b/packages/devtools_test/pubspec.yaml index 6fbd74856c1..a3fabfcbfab 100644 --- a/packages/devtools_test/pubspec.yaml +++ b/packages/devtools_test/pubspec.yaml @@ -26,7 +26,6 @@ dependencies: sdk: flutter flutter_test: sdk: flutter - meta: ^1.3.0 mockito: ^5.0.9 path: ^1.8.0 pedantic: ^1.11.0