From 30f33d6c7d7581e61269da8778fae59882f081d8 Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Thu, 24 Jan 2019 12:21:11 -0800
Subject: [PATCH] Upgrade the Gradle script to Android plugin version 3.3.0
 (#26913)

Fixes https://github.com/flutter/flutter/issues/26544
---
 dev/benchmarks/complex_layout/android/build.gradle    |  2 +-
 dev/benchmarks/macrobenchmarks/android/build.gradle   |  2 +-
 dev/benchmarks/microbenchmarks/android/build.gradle   |  2 +-
 dev/integration_tests/android_host_app/build.gradle   |  2 +-
 .../android_semantics_testing/android/build.gradle    |  2 +-
 .../android_views/android/build.gradle                |  2 +-
 dev/integration_tests/channels/android/build.gradle   |  2 +-
 .../external_ui/android/build.gradle                  |  2 +-
 dev/integration_tests/flavors/android/build.gradle    |  2 +-
 .../named_isolates/android/build.gradle               |  2 +-
 .../platform_interaction/android/build.gradle         |  2 +-
 dev/integration_tests/ui/android/build.gradle         |  2 +-
 dev/manual_tests/android/build.gradle                 |  2 +-
 examples/catalog/android/build.gradle                 |  2 +-
 examples/flutter_gallery/android/build.gradle         |  2 +-
 examples/flutter_view/android/build.gradle            |  2 +-
 examples/hello_world/android/build.gradle             |  2 +-
 examples/layers/android/build.gradle                  |  2 +-
 examples/platform_channel/android/build.gradle        |  2 +-
 examples/platform_view/android/build.gradle           |  2 +-
 examples/stocks/android/build.gradle                  |  2 +-
 packages/flutter_tools/gradle/flutter.gradle          | 11 ++++++-----
 .../templates/app/android-java.tmpl/build.gradle      |  2 +-
 .../templates/app/android-kotlin.tmpl/build.gradle    |  4 ++--
 .../plugin/android-kotlin.tmpl/build.gradle.tmpl      |  2 +-
 25 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/benchmarks/complex_layout/android/build.gradle
+++ b/dev/benchmarks/complex_layout/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/benchmarks/macrobenchmarks/android/build.gradle b/dev/benchmarks/macrobenchmarks/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/benchmarks/macrobenchmarks/android/build.gradle
+++ b/dev/benchmarks/macrobenchmarks/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/benchmarks/microbenchmarks/android/build.gradle b/dev/benchmarks/microbenchmarks/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/benchmarks/microbenchmarks/android/build.gradle
+++ b/dev/benchmarks/microbenchmarks/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/android_host_app/build.gradle b/dev/integration_tests/android_host_app/build.gradle
index e006ab47b4..d75ee51847 100644
--- a/dev/integration_tests/android_host_app/build.gradle
+++ b/dev/integration_tests/android_host_app/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/android_semantics_testing/android/build.gradle b/dev/integration_tests/android_semantics_testing/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/android_semantics_testing/android/build.gradle
+++ b/dev/integration_tests/android_semantics_testing/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/android_views/android/build.gradle b/dev/integration_tests/android_views/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/android_views/android/build.gradle
+++ b/dev/integration_tests/android_views/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/channels/android/build.gradle b/dev/integration_tests/channels/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/channels/android/build.gradle
+++ b/dev/integration_tests/channels/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/external_ui/android/build.gradle b/dev/integration_tests/external_ui/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/external_ui/android/build.gradle
+++ b/dev/integration_tests/external_ui/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/flavors/android/build.gradle b/dev/integration_tests/flavors/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/flavors/android/build.gradle
+++ b/dev/integration_tests/flavors/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/named_isolates/android/build.gradle b/dev/integration_tests/named_isolates/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/named_isolates/android/build.gradle
+++ b/dev/integration_tests/named_isolates/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/platform_interaction/android/build.gradle b/dev/integration_tests/platform_interaction/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/platform_interaction/android/build.gradle
+++ b/dev/integration_tests/platform_interaction/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/integration_tests/ui/android/build.gradle b/dev/integration_tests/ui/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/integration_tests/ui/android/build.gradle
+++ b/dev/integration_tests/ui/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/dev/manual_tests/android/build.gradle b/dev/manual_tests/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/dev/manual_tests/android/build.gradle
+++ b/dev/manual_tests/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/catalog/android/build.gradle b/examples/catalog/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/catalog/android/build.gradle
+++ b/examples/catalog/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/flutter_gallery/android/build.gradle b/examples/flutter_gallery/android/build.gradle
index db728801d8..112aa2a87c 100644
--- a/examples/flutter_gallery/android/build.gradle
+++ b/examples/flutter_gallery/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/flutter_view/android/build.gradle b/examples/flutter_view/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/flutter_view/android/build.gradle
+++ b/examples/flutter_view/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/hello_world/android/build.gradle
+++ b/examples/hello_world/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/layers/android/build.gradle
+++ b/examples/layers/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/platform_channel/android/build.gradle b/examples/platform_channel/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/platform_channel/android/build.gradle
+++ b/examples/platform_channel/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/platform_view/android/build.gradle b/examples/platform_view/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/platform_view/android/build.gradle
+++ b/examples/platform_view/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/examples/stocks/android/build.gradle b/examples/stocks/android/build.gradle
index bb8a303898..541636cc49 100644
--- a/examples/stocks/android/build.gradle
+++ b/examples/stocks/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
index 5583500a6a..21be9191f9 100644
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
@@ -421,9 +421,10 @@ class FlutterPlugin implements Plugin<Project> {
                     }
                     dependsOn copySharedFlutterAssetsTask
                 } else {
-                    dependsOn variant.mergeAssets
-                    dependsOn "clean${variant.mergeAssets.name.capitalize()}"
-                    into variant.mergeAssets.outputDir
+                    Task mergeAssetsTask = variant.mergeAssetsProvider.get()
+                    dependsOn mergeAssetsTask
+                    dependsOn "clean${mergeAssetsTask.name.capitalize()}"
+                    into mergeAssetsTask.outputDir
                 }
                 with flutterTask.assets
             }
@@ -435,7 +436,7 @@ class FlutterPlugin implements Plugin<Project> {
                     mergeAssets.dependsOn(copyFlutterAssetsTask)
                 }
             } else {
-                variant.outputs[0].processResources.dependsOn(copyFlutterAssetsTask)
+                variant.outputs[0].processResourcesProvider.get().dependsOn(copyFlutterAssetsTask)
             }
         }
         if (project.android.hasProperty("applicationVariants")) {
diff --git a/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle b/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle
index bb8a303898..541636cc49 100644
--- a/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle
+++ b/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
     }
 }
 
diff --git a/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle b/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle
index b7faad8f59..6b2cbd7bd8 100644
--- a/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle
+++ b/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.11'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
index 9c6ca55229..fbe197f5aa 100644
--- a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl
@@ -2,7 +2,7 @@ group '{{androidIdentifier}}'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.11'
     repositories {
         google()
         jcenter()