firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Address jmagman todos (#85348)

Browse Source
This commit is contained in:
Jenn Magder 2021-06-28 11:26:21 -07:00 committed by GitHub
parent 2034f74eee
commit 610ee89b17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
View File

@ -239,36 +239,24 @@ Future<void> _testBuildIosFramework(Directory projectDir, { bool isModule = fals
await _checkBitcode(engineFrameworkPath, mode); await _checkBitcode(engineFrameworkPath, mode);
// TODO(jmagman): Remove ios-x86_64-simulator checks when the ARM simulator engine artifacts rolls. checkFileExists(path.join(
final String x86SimulatorFramework = path.join(
outputPath,
mode,
'Flutter.xcframework',
'ios-x86_64-simulator',
'Flutter.framework',
);
final String x86ArmSimulatorFramework = path.join(
outputPath, outputPath,
mode, mode,
'Flutter.xcframework', 'Flutter.xcframework',
'ios-arm64_x86_64-simulator', 'ios-arm64_x86_64-simulator',
'Flutter.framework', 'Flutter.framework',
); 'Flutter',
));
final bool x86SimulatorBinaryExists = exists(File(path.join(x86SimulatorFramework, 'Flutter'))); checkFileExists(path.join(
final bool x86ArmSimulatorBinaryExists = exists(File(path.join(x86ArmSimulatorFramework, 'Flutter'))); outputPath,
mode,
if (!x86SimulatorBinaryExists && !x86ArmSimulatorBinaryExists) { 'Flutter.xcframework',
throw TaskResult.failure('Expected Flutter engine artifact binary to exist'); 'ios-arm64_x86_64-simulator',
} 'Flutter.framework',
'Headers',
final bool x86SimulatorHeaderExists = exists(File(path.join(x86SimulatorFramework, 'Headers', 'Flutter.h'))); 'Flutter.h',
final bool x86ArmSimulatorHeaderExists = exists(File(path.join(x86ArmSimulatorFramework, 'Headers', 'Flutter.h'))); ));
if (!x86SimulatorHeaderExists && !x86ArmSimulatorHeaderExists) {
throw TaskResult.failure('Expected Flutter.h engine artifact to exist');
}
} }
section('Check all modes have plugins'); section('Check all modes have plugins');

3
dev/devicelab/bin/tasks/gradle_non_android_plugin_test.dart
View File

@ -9,8 +9,7 @@ import 'package:flutter_devicelab/framework/task_result.dart';
Future<void> main() async { Future<void> main() async {
await task(() async { await task(() async {
// TODO(jmagman): Remove once gradle_non_android_plugin_test builder can be deleted // TODO(jmagman): Remove once gradle_non_android_plugin_test builder can be deleted, https://github.com/flutter/flutter/issues/85347
// when https://github.com/flutter/flutter/pull/80161 rolls to stable.
return TaskResult.success(null); return TaskResult.success(null);
}); });
} }

4
dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart
View File

@ -32,10 +32,6 @@ Future<void> main() async {
projectDir, projectDir,
); );
// For some reason devicelab machines have really old spec snapshots.
// TODO(jmagman): Remove this if this test is moved to a machine that installs CocoaPods on every run.
await eval('pod', <String>['repo', 'update', '--verbose']);
section('Create release build'); section('Create release build');
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {