development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-09-13 05:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

replaced unawaited with synchronous / await calls where needed (#82839)

Browse source
This commit is contained in:
gaaclarke 2021-06-24 16:22:43 -07:00 committed by GitHub
parent 7f15662f56
commit 66fd0b28b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dev/devicelab/bin/run.dart
View file

@ -8,7 +8,6 @@ import 'dart:convert';
import 'dart:io';
import 'package:args/args.dart';
import 'package:flutter_devicelab/common.dart';
import 'package:flutter_devicelab/framework/ab.dart';
import 'package:flutter_devicelab/framework/manifest.dart';
import 'package:flutter_devicelab/framework/runner.dart';
@ -186,7 +185,7 @@ Future<void> _runABTest() async {
abTest.finalize();
final File jsonFile = _uniqueFile(args['ab-result-file'] as String ?? 'ABresults#.json');
unawaited(jsonFile.writeAsString(const JsonEncoder.withIndent(' ').convert(abTest.jsonMap)));
jsonFile.writeAsStringSync(const JsonEncoder.withIndent(' ').convert(abTest.jsonMap));
if (!silent) {
section('Raw results');

3
dev/devicelab/bin/tasks/flutter_engine_group_performance.dart
View file

@ -6,7 +6,6 @@
import 'dart:io';
import 'package:flutter_devicelab/common.dart';
import 'package:flutter_devicelab/framework/devices.dart';
import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/task_result.dart';
@ -109,5 +108,5 @@ Future<TaskResult> _doTest() async {
}
Future<void> main() async {
unawaited(task(_doTest));
await task(_doTest);
}

3
dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart
View file

@ -6,7 +6,6 @@
import 'dart:io';
import 'package:flutter_devicelab/common.dart';
import 'package:flutter_devicelab/framework/apk_utils.dart';
import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/task_result.dart';
@ -18,7 +17,7 @@ Future<void> main() async {
try {
await runProjectTest((FlutterProject flutterProject) async {
section('APK contains plugin classes');
unawaited(flutterProject.addPlugin('google_maps_flutter', value: '^1.0.10'));
flutterProject.addPlugin('google_maps_flutter', value: '^1.0.10');
await inDirectory(flutterProject.rootPath, () async {
await flutter('build', options: <String>[

7
dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
View file

@ -6,7 +6,6 @@
import 'dart:io';
import 'package:flutter_devicelab/common.dart';
import 'package:flutter_devicelab/framework/apk_utils.dart';
import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/task_result.dart';
@ -220,8 +219,8 @@ Future<void> main() async {
});
section('Configure');
unawaited(project.addPlugin('plugin_under_test',
value: '$platformLineSep path: ${pluginDir.path}'));
project.addPlugin('plugin_under_test',
value: '$platformLineSep path: ${pluginDir.path}');
await project.addCustomBuildType('local', initWith: 'debug');
await project.getPackages();
@ -240,7 +239,7 @@ Future<void> main() async {
await project.addCustomBuildType('local', initWith: 'debug');
await project.addGlobalBuildType('local', initWith: 'debug');
section('Add plugin');
await project.addPlugin('path_provider');
project.addPlugin('path_provider');
await project.getPackages();
await project.runGradleTask('assembleLocal');

9
dev/devicelab/bin/tasks/ios_content_validation_test.dart
View file

@ -6,7 +6,6 @@
import 'dart:io';
import 'package:flutter_devicelab/common.dart';
import 'package:flutter_devicelab/framework/apk_utils.dart';
import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/task_result.dart';
@ -56,7 +55,8 @@ Future<void> main() async {
'Flutter',
);
// Exits 0 only if codesigned.
unawaited(eval('xcrun', <String>['codesign', '--verify', flutterFramework]));
final Future<String> flutterCodesign =
eval('xcrun', <String>['codesign', '--verify', flutterFramework]);
final String appFramework = path.join(
appBundle.path,
@ -64,7 +64,10 @@ Future<void> main() async {
'App.framework',
'App',
);
unawaited(eval('xcrun', <String>['codesign', '--verify', appFramework]));
final Future<String> appCodesign =
eval('xcrun', <String>['codesign', '--verify', appFramework]);
await flutterCodesign;
await appCodesign;
});
return TaskResult.success(null);

6
dev/devicelab/lib/framework/apk_utils.dart
View file

@ -299,14 +299,14 @@ subprojects {
/// Adds a plugin to the pubspec.
/// In pubspec, each dependency is expressed as key, value pair joined by a colon `:`.
/// such as `plugin_a`:`^0.0.1` or `plugin_a`:`\npath: /some/path`.
Future<void> addPlugin(String plugin, { String value = '' }) async {
void addPlugin(String plugin, { String value = '' }) {
final File pubspec = File(path.join(rootPath, 'pubspec.yaml'));
String content = await pubspec.readAsString();
String content = pubspec.readAsStringSync();
content = content.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep',
'${platformLineSep}dependencies:$platformLineSep $plugin: $value$platformLineSep',
);
await pubspec.writeAsString(content, flush: true);
pubspec.writeAsStringSync(content, flush: true);
}
Future<void> getPackages() async {

3
dev/devicelab/lib/tasks/build_test_task.dart
View file

@ -7,7 +7,6 @@
import 'dart:io';
import 'package:args/args.dart';
import 'package:flutter_devicelab/common.dart';
import '../framework/devices.dart';
import '../framework/task_result.dart';
@ -109,7 +108,7 @@ abstract class BuildTestTask {
}
if (!testOnly) {
unawaited(build());
await build();
}
if (buildOnly) {