Unverified Commit 8d15fa39 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove unused/deprecated asset flags (#70509)

parent 93828d35
...@@ -59,7 +59,6 @@ Future<void> run(List<String> args) async { ...@@ -59,7 +59,6 @@ Future<void> run(List<String> args) async {
manifestPath: argResults[_kOptionManifest] as String ?? defaultManifestPath, manifestPath: argResults[_kOptionManifest] as String ?? defaultManifestPath,
assetDirPath: assetDir, assetDirPath: assetDir,
packagesPath: argResults[_kOptionPackages] as String, packagesPath: argResults[_kOptionPackages] as String,
includeDefaultFonts: false,
); );
if (assets == null) { if (assets == null) {
......
...@@ -72,8 +72,6 @@ abstract class AssetBundle { ...@@ -72,8 +72,6 @@ abstract class AssetBundle {
String manifestPath = defaultManifestPath, String manifestPath = defaultManifestPath,
String assetDirPath, String assetDirPath,
@required String packagesPath, @required String packagesPath,
bool includeDefaultFonts = true,
bool reportLicensedPackages = false,
}); });
} }
...@@ -162,8 +160,6 @@ class ManifestAssetBundle implements AssetBundle { ...@@ -162,8 +160,6 @@ class ManifestAssetBundle implements AssetBundle {
String manifestPath = defaultManifestPath, String manifestPath = defaultManifestPath,
String assetDirPath, String assetDirPath,
@required String packagesPath, @required String packagesPath,
bool includeDefaultFonts = true,
bool reportLicensedPackages = false,
}) async { }) async {
assetDirPath ??= getAssetBuildDirectory(); assetDirPath ??= getAssetBuildDirectory();
FlutterProject flutterProject; FlutterProject flutterProject;
...@@ -224,7 +220,6 @@ class ManifestAssetBundle implements AssetBundle { ...@@ -224,7 +220,6 @@ class ManifestAssetBundle implements AssetBundle {
final bool includesMaterialFonts = flutterManifest.usesMaterialDesign; final bool includesMaterialFonts = flutterManifest.usesMaterialDesign;
final List<Map<String, dynamic>> fonts = _parseFonts( final List<Map<String, dynamic>> fonts = _parseFonts(
flutterManifest, flutterManifest,
includeDefaultFonts,
packageConfig, packageConfig,
primary: true, primary: true,
); );
...@@ -272,7 +267,6 @@ class ManifestAssetBundle implements AssetBundle { ...@@ -272,7 +267,6 @@ class ManifestAssetBundle implements AssetBundle {
} }
fonts.addAll(_parseFonts( fonts.addAll(_parseFonts(
packageFlutterManifest, packageFlutterManifest,
includeDefaultFonts,
packageConfig, packageConfig,
packageName: package.name, packageName: package.name,
primary: false, primary: false,
...@@ -309,7 +303,7 @@ class ManifestAssetBundle implements AssetBundle { ...@@ -309,7 +303,7 @@ class ManifestAssetBundle implements AssetBundle {
} }
} }
final List<_Asset> materialAssets = <_Asset>[ final List<_Asset> materialAssets = <_Asset>[
if (flutterManifest.usesMaterialDesign && includeDefaultFonts) if (flutterManifest.usesMaterialDesign)
..._getMaterialAssets(), ..._getMaterialAssets(),
]; ];
for (final _Asset asset in materialAssets) { for (final _Asset asset in materialAssets) {
...@@ -381,13 +375,12 @@ class ManifestAssetBundle implements AssetBundle { ...@@ -381,13 +375,12 @@ class ManifestAssetBundle implements AssetBundle {
List<Map<String, dynamic>> _parseFonts( List<Map<String, dynamic>> _parseFonts(
FlutterManifest manifest, FlutterManifest manifest,
bool includeDefaultFonts,
PackageConfig packageConfig, { PackageConfig packageConfig, {
String packageName, String packageName,
@required bool primary, @required bool primary,
}) { }) {
return <Map<String, dynamic>>[ return <Map<String, dynamic>>[
if (primary && manifest.usesMaterialDesign && includeDefaultFonts) if (primary && manifest.usesMaterialDesign)
...kMaterialFonts, ...kMaterialFonts,
if (packageName == null) if (packageName == null)
...manifest.fontsDescriptor ...manifest.fontsDescriptor
......
...@@ -191,8 +191,6 @@ Future<AssetBundle> buildAssets({ ...@@ -191,8 +191,6 @@ Future<AssetBundle> buildAssets({
String manifestPath, String manifestPath,
String assetDirPath, String assetDirPath,
@required String packagesPath, @required String packagesPath,
bool includeDefaultFonts = true,
bool reportLicensedPackages = false,
}) async { }) async {
assetDirPath ??= getAssetBuildDirectory(); assetDirPath ??= getAssetBuildDirectory();
packagesPath ??= globals.fs.path.absolute(packagesPath); packagesPath ??= globals.fs.path.absolute(packagesPath);
...@@ -203,8 +201,6 @@ Future<AssetBundle> buildAssets({ ...@@ -203,8 +201,6 @@ Future<AssetBundle> buildAssets({
manifestPath: manifestPath, manifestPath: manifestPath,
assetDirPath: assetDirPath, assetDirPath: assetDirPath,
packagesPath: packagesPath, packagesPath: packagesPath,
includeDefaultFonts: includeDefaultFonts,
reportLicensedPackages: reportLicensedPackages,
); );
if (result != 0) { if (result != 0) {
return null; return null;
......
...@@ -123,7 +123,6 @@ Future<void> _buildAssets( ...@@ -123,7 +123,6 @@ Future<void> _buildAssets(
manifestPath: fuchsiaProject.project.pubspecFile.path, manifestPath: fuchsiaProject.project.pubspecFile.path,
packagesPath: fuchsiaProject.project.packagesFile.path, packagesPath: fuchsiaProject.project.packagesFile.path,
assetDirPath: assetDir, assetDirPath: assetDir,
includeDefaultFonts: false,
); );
final Map<String, DevFSContent> assetEntries = final Map<String, DevFSContent> assetEntries =
......
...@@ -31,7 +31,6 @@ void main() { ...@@ -31,7 +31,6 @@ void main() {
await asset.build( await asset.build(
manifestPath : globals.fs.path.join(dataPath, 'main', 'pubspec.yaml'), manifestPath : globals.fs.path.join(dataPath, 'main', 'pubspec.yaml'),
packagesPath: globals.fs.path.join(dataPath, 'main', '.packages'), packagesPath: globals.fs.path.join(dataPath, 'main', '.packages'),
includeDefaultFonts: false,
); );
expect(asset.entries.containsKey('FontManifest.json'), isTrue); expect(asset.entries.containsKey('FontManifest.json'), isTrue);
...@@ -55,7 +54,6 @@ void main() { ...@@ -55,7 +54,6 @@ void main() {
await asset.build( await asset.build(
manifestPath : globals.fs.path.join(dataPath, 'main', 'pubspec.yaml'), // file doesn't exist manifestPath : globals.fs.path.join(dataPath, 'main', 'pubspec.yaml'), // file doesn't exist
packagesPath: globals.fs.path.join(dataPath, 'main', '.packages'), packagesPath: globals.fs.path.join(dataPath, 'main', '.packages'),
includeDefaultFonts: false,
); );
expect(asset.wasBuiltOnce(), true); expect(asset.wasBuiltOnce(), true);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment