Use `mergeResourcesProvider` instead of deprecated `mergeResources` (#41942)

00f82d90 · Emmanuel Garcia · Jonah Williams · ed49a795 · 00f82d90
Commit 00f82d90 authored Oct 04, 2019 by Emmanuel Garcia Committed by Jonah Williams Oct 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

flutter.gradle packages/flutter_tools/gradle/flutter.gradle +3 -1

No files found.
--- 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.