Use mergeResourcesProvider instead of deprecated mergeResources (#41942)

2019-10-03 20:42:43 -07:00 · 2019-10-03 20:42:43 -07:00 · 00f82d9021
commit 00f82d9021
parent ed49a79516
1 changed files with 3 additions and 1 deletions
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@ -645,7 +645,9 @@ class FlutterPlugin implements Plugin<Project> {
                into mergeAssets.outputDir
            }
            if (!isUsedAsSubproject) {
-                variant.mergeResources.dependsOn(copyFlutterAssetsTask)
+                def mergeResources = variant.hasProperty("mergeResourcesProvider") ?
+                    variant.mergeResourcesProvider.get() : variant.mergeResources
+                mergeResources.dependsOn(copyFlutterAssetsTask)
                return
            }
            // Flutter module included as a subproject in add to app.