1.20.0-7.2.pre framework cherrypicks (#61632)

* Update engine hash for 1.20.0-7.2.pre

* Do not upload all pub packages into the zip bundle (#61488)

Remove git dependencies from pub-cache

#61487

* fix type error in web builds (#61556)

Co-authored-by: Jonah Williams <jonahwilliams@google.com>
This commit is contained in:
Patrick Sosinski 2020-07-16 12:40:00 -07:00 committed by GitHub
parent 7736f3bc90
commit 394ccaa8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions

View File

@ -1 +1 @@
d48085141c2f201b1c534e6926eb39bb52d9db3e
b15a076b148a77ea875c3f42913b39ca1dc62c24

View File

@ -370,6 +370,12 @@ class ArchiveCreator {
await _runGit(<String>['clean', '-f', '-X', '**/.packages']);
/// Remove package_config files and any contents in .dart_tool
await _runGit(<String>['clean', '-f', '-X', '**/.dart_tool']);
/// Remove git subfolder from .pub-cache, this contains the flutter goldens
/// and new flutter_gallery.
final Directory gitCache = Directory(path.join(flutterRoot.absolute.path, '.pub-cache', 'git'));
if (gitCache.existsSync()) {
gitCache.deleteSync(recursive: true);
}
}
/// Write the archive to the given output file.

View File

@ -19,7 +19,7 @@ platform.TargetPlatform get defaultTargetPlatform {
}
platform.TargetPlatform _browserPlatform() {
final String navigatorPlatform = html.window.navigator.platform.toLowerCase();
final String navigatorPlatform = html.window.navigator.platform?.toLowerCase() ?? '';
if (navigatorPlatform.startsWith('mac')) {
return platform.TargetPlatform.macOS;
}