fixed `dart analyze --fatal-infos` for cipd (#5152)
Fixed `dart analyze --fatal-infos` for cipd after flutter update
diff --git a/cipd_packages/device_doctor/lib/src/health.dart b/cipd_packages/device_doctor/lib/src/health.dart
index 1b65880..704b6a5 100644
--- a/cipd_packages/device_doctor/lib/src/health.dart
+++ b/cipd_packages/device_doctor/lib/src/health.dart
@@ -17,7 +17,7 @@
Future<HealthCheckResult> closeIosDialog({
ProcessManager pm = const LocalProcessManager(),
String? deviceId,
- platform.Platform pl = const platform.LocalPlatform(),
+ platform.Platform pl = const platform.Platform(),
String infraDialog = 'infra-dialog',
}) async {
var dialogDir = dir(path.dirname(Platform.script.path), 'tool', infraDialog);
@@ -36,15 +36,12 @@
// By default the above command relies on automatic code signing, while on devicelab machines
// it should utilize manual code signing as that is more stable. Below overwrites the code
// signing config if one exists in the environment.
- if (pl.environment['FLUTTER_XCODE_CODE_SIGN_STYLE'] != null) {
+ final env = pl.nativePlatform?.environment;
+ if (env != null && env['FLUTTER_XCODE_CODE_SIGN_STYLE'] != null) {
+ command.add("CODE_SIGN_STYLE=${env['FLUTTER_XCODE_CODE_SIGN_STYLE']}");
+ command.add("DEVELOPMENT_TEAM=${env['FLUTTER_XCODE_DEVELOPMENT_TEAM']}");
command.add(
- "CODE_SIGN_STYLE=${pl.environment['FLUTTER_XCODE_CODE_SIGN_STYLE']}",
- );
- command.add(
- "DEVELOPMENT_TEAM=${pl.environment['FLUTTER_XCODE_DEVELOPMENT_TEAM']}",
- );
- command.add(
- "PROVISIONING_PROFILE_SPECIFIER=${pl.environment['FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER']}",
+ "PROVISIONING_PROFILE_SPECIFIER=${env['FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER']}",
);
}
final proc = await pm.start(command, workingDirectory: dialogDir.path);
diff --git a/cipd_packages/device_doctor/lib/src/ios_debug_symbol_doctor.dart b/cipd_packages/device_doctor/lib/src/ios_debug_symbol_doctor.dart
index fff64d3..280b4f7 100644
--- a/cipd_packages/device_doctor/lib/src/ios_debug_symbol_doctor.dart
+++ b/cipd_packages/device_doctor/lib/src/ios_debug_symbol_doctor.dart
@@ -64,7 +64,7 @@
this.processManager = const LocalProcessManager(),
Logger? loggerOverride,
this.fs = const LocalFileSystem(),
- this.platform = const LocalPlatform(),
+ this.platform = const Platform(),
}) : logger = loggerOverride ?? Logger.root {
argParser
..addOption(
@@ -197,7 +197,7 @@
/// Xcode will regenerate this folder and symbols for connected devices
/// when Xcode is opened.
void _deleteSymbols() {
- final home = platform.environment['HOME'];
+ final home = platform.nativePlatform?.environment['HOME'];
if (home == null) {
logger.warning('\$HOME path was not found');
return;
diff --git a/cipd_packages/device_doctor/test/src/health_test.dart b/cipd_packages/device_doctor/test/src/health_test.dart
index 50954ee..9495be2 100644
--- a/cipd_packages/device_doctor/test/src/health_test.dart
+++ b/cipd_packages/device_doctor/test/src/health_test.dart
@@ -8,6 +8,7 @@
import 'package:device_doctor/src/utils.dart';
import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart' as platform;
+import 'package:platform/testing.dart';
import 'package:test/test.dart';
import 'utils.dart';
@@ -36,7 +37,7 @@
when(
pm.start(any, workingDirectory: anyNamed('workingDirectory')),
).thenAnswer((_) => Future.value(proc));
- final platform.Platform pl = platform.FakePlatform(
+ final platform.Platform pl = TestPlatform.native(
environment: <String, String>{
'FLUTTER_XCODE_CODE_SIGN_STYLE': 'Manual',
'FLUTTER_XCODE_DEVELOPMENT_TEAM': 'S8QB4VV633',
diff --git a/cipd_packages/device_doctor/test/src/ios_debug_symbol_doctor_test.dart b/cipd_packages/device_doctor/test/src/ios_debug_symbol_doctor_test.dart
index 4c91f65..4387ec3 100644
--- a/cipd_packages/device_doctor/test/src/ios_debug_symbol_doctor_test.dart
+++ b/cipd_packages/device_doctor/test/src/ios_debug_symbol_doctor_test.dart
@@ -11,7 +11,7 @@
import 'package:file/memory.dart';
import 'package:logging/logging.dart';
import 'package:mockito/mockito.dart';
-import 'package:platform/platform.dart';
+import 'package:platform/testing.dart';
import 'package:test/test.dart';
@@ -102,8 +102,9 @@
logger = TestLogger();
fs = MemoryFileSystem();
fs.directory(xcworkspacePath).createSync(recursive: true);
- platform = MockPlatform();
- platform.environment['HOME'] = '/User/username';
+ platform = TestPlatform.native(
+ environment: <String, String>{'HOME': '/User/username'},
+ );
});
test('diagnose logs output of xcdevice list', () async {
diff --git a/cipd_packages/device_doctor/test/src/utils.dart b/cipd_packages/device_doctor/test/src/utils.dart
index d308810..4d15aeb 100644
--- a/cipd_packages/device_doctor/test/src/utils.dart
+++ b/cipd_packages/device_doctor/test/src/utils.dart
@@ -8,14 +8,8 @@
import 'package:logging/logging.dart';
import 'package:mockito/mockito.dart';
-import 'package:platform/platform.dart';
import 'package:process/process.dart';
-class MockPlatform extends Mock implements Platform {
- @override
- Map<String, String> environment = <String, String>{};
-}
-
class MockProcessManager extends Mock implements ProcessManager {
@override
Future<Process> start(