v1.12.13+hotfix.8 cherry-picks - gradle upgrades (flutter#50489)

christopherfujino · web-flow · commit 4e0c97035b85 · 2020-02-10T14:29:12.000-08:00
diff --git a/dev/ci/docker_linux/Dockerfile b/dev/ci/docker_linux/Dockerfile
@@ -90,15 +90,6 @@ ENV PATH="${ANDROID_TOOLS_ROOT}/tools/bin:${PATH}"
 RUN mkdir -p ~/.android
 RUN touch ~/.android/repositories.cfg
 
-# Setup gradle
-ENV GRADLE_ROOT="/opt/gradle"
-RUN mkdir -p "${GRADLE_ROOT}"
-ENV GRADLE_ARCHIVE="${GRADLE_ROOT}/gradle.zip"
-ENV GRADLE_URL="http://services.gradle.org/distributions/gradle-4.4-bin.zip"
-RUN wget --progress=dot:giga "$GRADLE_URL" -O "${GRADLE_ARCHIVE}"
-RUN unzip -q -d "${GRADLE_ROOT}" "${GRADLE_ARCHIVE}"
-ENV PATH="$GRADLE_ROOT/bin:$PATH"
-
 # Add npm to path.
 ENV PATH="/usr/bin:${PATH}"
 RUN dpkg-query -L nodejs
diff --git a/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_splash_screens/splash_screen_load_rotate/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/dev/integration_tests/module_host_with_custom_build/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/module_host_with_custom_build/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/dev/integration_tests/module_host_with_custom_build_v2_embedding/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/module_host_with_custom_build_v2_embedding/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/packages/flutter/test/widgets/shadow_test.dart b/packages/flutter/test/widgets/shadow_test.dart
@@ -95,34 +95,34 @@ void main() {
     debugDisableShadows = true;
   }, skip: isBrowser);
 
-  testWidgets('Shadows with PhysicalShape', (WidgetTester tester) async {
-    debugDisableShadows = false;
-    Widget build(double elevation) {
-      return Center(
-        child: RepaintBoundary(
-          child: Container(
-            padding: const EdgeInsets.all(150.0),
-            color: Colors.yellow[200],
-            child: PhysicalShape(
-              color: Colors.green[900],
-              clipper: ShapeBorderClipper(shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(20.0))),
-              elevation: elevation,
-              child: const SizedBox(
-                height: 100.0,
-                width: 100.0,
+  for (final int elevation in kElevationToShadow.keys) {
+    testWidgets('Shadows with PhysicalShape $elevation', (WidgetTester tester) async {
+      debugDisableShadows = false;
+      Widget build(double elevation) {
+        return Center(
+          child: RepaintBoundary(
+            child: Container(
+              padding: const EdgeInsets.all(150.0),
+              color: Colors.yellow[200],
+              child: PhysicalShape(
+                color: Colors.green[900],
+                clipper: ShapeBorderClipper(shape: BeveledRectangleBorder(borderRadius: BorderRadius.circular(20.0))),
+                elevation: elevation,
+                child: const SizedBox(
+                  height: 100.0,
+                  width: 100.0,
+                ),
               ),
             ),
           ),
-        ),
-      );
-    }
-    for (int elevation in kElevationToShadow.keys) {
+        );
+      }
       await tester.pumpWidget(build(elevation.toDouble()));
       await expectLater(
         find.byType(Container),
         matchesGoldenFile('shadow.PhysicalShape.$elevation.png'),
       );
-    }
-    debugDisableShadows = true;
-  });
+      debugDisableShadows = true;
+    });
+  }
 }
diff --git a/packages/flutter_tools/templates/plugin/android.tmpl/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_tools/templates/plugin/android.tmpl/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
