Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
8d15fa39
Unverified
Commit
8d15fa39
authored
Nov 17, 2020
by
Jonah Williams
Committed by
GitHub
Nov 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] remove unused/deprecated asset flags (#70509)
parent
93828d35
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
17 deletions
+2
-17
fuchsia_asset_builder.dart
packages/flutter_tools/bin/fuchsia_asset_builder.dart
+0
-1
asset.dart
packages/flutter_tools/lib/src/asset.dart
+2
-9
bundle.dart
packages/flutter_tools/lib/src/bundle.dart
+0
-4
fuchsia_build.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
+0
-1
asset_test.dart
packages/flutter_tools/test/general.shard/asset_test.dart
+0
-2
No files found.
packages/flutter_tools/bin/fuchsia_asset_builder.dart
View file @
8d15fa39
...
...
@@ -59,7 +59,6 @@ Future<void> run(List<String> args) async {
manifestPath:
argResults
[
_kOptionManifest
]
as
String
??
defaultManifestPath
,
assetDirPath:
assetDir
,
packagesPath:
argResults
[
_kOptionPackages
]
as
String
,
includeDefaultFonts:
false
,
);
if
(
assets
==
null
)
{
...
...
packages/flutter_tools/lib/src/asset.dart
View file @
8d15fa39
...
...
@@ -72,8 +72,6 @@ abstract class AssetBundle {
String
manifestPath
=
defaultManifestPath
,
String
assetDirPath
,
@required
String
packagesPath
,
bool
includeDefaultFonts
=
true
,
bool
reportLicensedPackages
=
false
,
});
}
...
...
@@ -162,8 +160,6 @@ class ManifestAssetBundle implements AssetBundle {
String
manifestPath
=
defaultManifestPath
,
String
assetDirPath
,
@required
String
packagesPath
,
bool
includeDefaultFonts
=
true
,
bool
reportLicensedPackages
=
false
,
})
async
{
assetDirPath
??=
getAssetBuildDirectory
();
FlutterProject
flutterProject
;
...
...
@@ -224,7 +220,6 @@ class ManifestAssetBundle implements AssetBundle {
final
bool
includesMaterialFonts
=
flutterManifest
.
usesMaterialDesign
;
final
List
<
Map
<
String
,
dynamic
>>
fonts
=
_parseFonts
(
flutterManifest
,
includeDefaultFonts
,
packageConfig
,
primary:
true
,
);
...
...
@@ -272,7 +267,6 @@ class ManifestAssetBundle implements AssetBundle {
}
fonts
.
addAll
(
_parseFonts
(
packageFlutterManifest
,
includeDefaultFonts
,
packageConfig
,
packageName:
package
.
name
,
primary:
false
,
...
...
@@ -309,7 +303,7 @@ class ManifestAssetBundle implements AssetBundle {
}
}
final
List
<
_Asset
>
materialAssets
=
<
_Asset
>[
if
(
flutterManifest
.
usesMaterialDesign
&&
includeDefaultFonts
)
if
(
flutterManifest
.
usesMaterialDesign
)
...
_getMaterialAssets
(),
];
for
(
final
_Asset
asset
in
materialAssets
)
{
...
...
@@ -381,13 +375,12 @@ class ManifestAssetBundle implements AssetBundle {
List
<
Map
<
String
,
dynamic
>>
_parseFonts
(
FlutterManifest
manifest
,
bool
includeDefaultFonts
,
PackageConfig
packageConfig
,
{
String
packageName
,
@required
bool
primary
,
})
{
return
<
Map
<
String
,
dynamic
>>[
if
(
primary
&&
manifest
.
usesMaterialDesign
&&
includeDefaultFonts
)
if
(
primary
&&
manifest
.
usesMaterialDesign
)
...
kMaterialFonts
,
if
(
packageName
==
null
)
...
manifest
.
fontsDescriptor
...
...
packages/flutter_tools/lib/src/bundle.dart
View file @
8d15fa39
...
...
@@ -191,8 +191,6 @@ Future<AssetBundle> buildAssets({
String
manifestPath
,
String
assetDirPath
,
@required
String
packagesPath
,
bool
includeDefaultFonts
=
true
,
bool
reportLicensedPackages
=
false
,
})
async
{
assetDirPath
??=
getAssetBuildDirectory
();
packagesPath
??=
globals
.
fs
.
path
.
absolute
(
packagesPath
);
...
...
@@ -203,8 +201,6 @@ Future<AssetBundle> buildAssets({
manifestPath:
manifestPath
,
assetDirPath:
assetDirPath
,
packagesPath:
packagesPath
,
includeDefaultFonts:
includeDefaultFonts
,
reportLicensedPackages:
reportLicensedPackages
,
);
if
(
result
!=
0
)
{
return
null
;
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart
View file @
8d15fa39
...
...
@@ -123,7 +123,6 @@ Future<void> _buildAssets(
manifestPath:
fuchsiaProject
.
project
.
pubspecFile
.
path
,
packagesPath:
fuchsiaProject
.
project
.
packagesFile
.
path
,
assetDirPath:
assetDir
,
includeDefaultFonts:
false
,
);
final
Map
<
String
,
DevFSContent
>
assetEntries
=
...
...
packages/flutter_tools/test/general.shard/asset_test.dart
View file @
8d15fa39
...
...
@@ -31,7 +31,6 @@ void main() {
await
asset
.
build
(
manifestPath
:
globals
.
fs
.
path
.
join
(
dataPath
,
'main'
,
'pubspec.yaml'
),
packagesPath:
globals
.
fs
.
path
.
join
(
dataPath
,
'main'
,
'.packages'
),
includeDefaultFonts:
false
,
);
expect
(
asset
.
entries
.
containsKey
(
'FontManifest.json'
),
isTrue
);
...
...
@@ -55,7 +54,6 @@ void main() {
await
asset
.
build
(
manifestPath
:
globals
.
fs
.
path
.
join
(
dataPath
,
'main'
,
'pubspec.yaml'
),
// file doesn't exist
packagesPath:
globals
.
fs
.
path
.
join
(
dataPath
,
'main'
,
'.packages'
),
includeDefaultFonts:
false
,
);
expect
(
asset
.
wasBuiltOnce
(),
true
);
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment