firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use mergeResourcesProvider instead of deprecated mergeResources (#41942)

Browse Source
This commit is contained in:
Emmanuel Garcia 2019-10-03 20:42:43 -07:00 committed by Jonah Williams
parent ed49a79516
commit 00f82d9021
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/flutter_tools/gradle/flutter.gradle
View File

@ -645,7 +645,9 @@ class FlutterPlugin implements Plugin<Project> {
into mergeAssets.outputDir into mergeAssets.outputDir
} }
if (!isUsedAsSubproject) { if (!isUsedAsSubproject) {
variant.mergeResources.dependsOn(copyFlutterAssetsTask) def mergeResources = variant.hasProperty("mergeResourcesProvider") ?
variant.mergeResourcesProvider.get() : variant.mergeResources
mergeResources.dependsOn(copyFlutterAssetsTask)
return return
} }
// Flutter module included as a subproject in add to app. // Flutter module included as a subproject in add to app.