From eae67f05dfd332d7f371e4ac0cfce9d29ede2222 Mon Sep 17 00:00:00 2001 From: Keerti Parthasarathy Date: Tue, 30 Apr 2019 09:10:04 -0700 Subject: [PATCH] Make const available for classes that override AssetBundle (#31807) --- packages/flutter_tools/bin/fuchsia_asset_builder.dart | 2 +- packages/flutter_tools/lib/src/asset.dart | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/flutter_tools/bin/fuchsia_asset_builder.dart b/packages/flutter_tools/bin/fuchsia_asset_builder.dart index fc131aebf42..2de562425f4 100644 --- a/packages/flutter_tools/bin/fuchsia_asset_builder.dart +++ b/packages/flutter_tools/bin/fuchsia_asset_builder.dart @@ -5,7 +5,7 @@ import 'dart:async'; import 'package:args/args.dart'; -import 'package:flutter_tools/src/asset.dart'; +import 'package:flutter_tools/src/asset.dart' hide defaultManifestPath; import 'package:flutter_tools/src/base/context.dart'; import 'package:flutter_tools/src/base/file_system.dart' as libfs; import 'package:flutter_tools/src/base/io.dart'; diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 6644d5be7da..3a08217e4b1 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -20,6 +20,8 @@ import 'globals.dart'; const AssetBundleFactory _kManifestFactory = _ManifestAssetBundleFactory(); +const String defaultManifestPath = 'pubspec.yaml'; + /// Injected factory class for spawning [AssetBundle] instances. abstract class AssetBundleFactory { /// The singleton instance, pulled from the [AppContext]. @@ -36,11 +38,11 @@ abstract class AssetBundle { bool wasBuiltOnce(); - bool needsBuild({ String manifestPath = _ManifestAssetBundle.defaultManifestPath }); + bool needsBuild({ String manifestPath = defaultManifestPath }); /// Returns 0 for success; non-zero for failure. Future build({ - String manifestPath = _ManifestAssetBundle.defaultManifestPath, + String manifestPath = defaultManifestPath, String assetDirPath, String packagesPath, bool includeDefaultFonts = true, @@ -69,7 +71,6 @@ class _ManifestAssetBundle implements AssetBundle { DateTime _lastBuildTimestamp; - static const String defaultManifestPath = 'pubspec.yaml'; static const String _assetManifestJson = 'AssetManifest.json'; static const String _fontManifestJson = 'FontManifest.json'; static const String _fontSetMaterial = 'material';