Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/flutter_migrate/lib/src/base/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ Future<T> asyncGuard<T>(
}
}

runZoned<void>(() async {
runZonedGuarded<void>(() async {
try {
final T result = await fn();
if (!completer.isCompleted) {
Expand All @@ -150,7 +150,7 @@ Future<T> asyncGuard<T>(
// ignore: avoid_catches_without_on_clauses, forwards to Future
handleError(e, s);
}
}, onError: (Object e, StackTrace s) {
}, (Object e, StackTrace s) {
handleError(e, s);
});

Expand Down
1 change: 0 additions & 1 deletion packages/flutter_migrate/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ dev_dependencies:
file_testing: 3.0.0
lints: ^2.0.0
test: ^1.16.0
test_api: ^0.4.13
6 changes: 3 additions & 3 deletions packages/flutter_migrate/test/src/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import 'package:flutter_migrate/src/base/file_system.dart';
import 'package:flutter_migrate/src/base/io.dart';
import 'package:meta/meta.dart';
import 'package:path/path.dart' as path; // flutter_ignore: package_path_import
import 'package:test_api/test_api.dart' as test_package show test;
import 'package:test_api/test_api.dart' hide test;
import 'package:test/test.dart' as test_package show test;
import 'package:test/test.dart' hide test;

import 'test_utils.dart';

export 'package:test_api/test_api.dart' hide isInstanceOf, test;
export 'package:test/test.dart' hide isInstanceOf, test;

bool tryToDelete(FileSystemEntity fileEntity) {
// This should not be necessary, but it turns out that
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import 'package:args/command_runner.dart';
import 'package:flutter_migrate/src/base/command.dart';

export 'package:test_api/test_api.dart' hide isInstanceOf, test;
export 'package:test/test.dart' hide isInstanceOf, test;

CommandRunner<void> createTestCommandRunner([MigrateCommand? command]) {
final CommandRunner<void> runner = TestCommandRunner();
Expand Down