Unverified Commit 52d49fb3 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove material design schema, use dart code (#69987)

Instead of loading the use-material-design asset data from a yaml file in the repo, leave it in dart code and simplify. Remove some of the globals, but not enough to update to testWithoutContext
parent 78778d29
This diff is collapsed.
......@@ -44,7 +44,10 @@ Future<Depfile> copyAssets(Environment environment, Directory outputDirectory, {
final File pubspecFile = environment.projectDir.childFile('pubspec.yaml');
// Only the default asset bundle style is supported in assemble.
final AssetBundle assetBundle = AssetBundleFactory.defaultInstance.createBundle();
final AssetBundle assetBundle = AssetBundleFactory.defaultInstance(
logger: environment.logger,
fileSystem: environment.fileSystem,
).createBundle();
final int resultCode = await assetBundle.build(
manifestPath: pubspecFile.path,
packagesPath: environment.projectDir.childFile('.packages').path,
......
......@@ -110,7 +110,12 @@ Future<T> runInContext<T>(
cache: globals.cache,
platform: globals.platform,
),
AssetBundleFactory: () => AssetBundleFactory.defaultInstance,
AssetBundleFactory: () {
return AssetBundleFactory.defaultInstance(
logger: globals.logger,
fileSystem: globals.fs,
);
},
BuildSystem: () => FlutterBuildSystem(
fileSystem: globals.fs,
logger: globals.logger,
......
material:
- family: MaterialIcons
fonts:
- asset: fonts/MaterialIcons-Regular.otf
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