[Scummvm-git-logs] scummvm master -> 280446deb1bc004e7aed7af30a97370ef1b006b0

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
280446deb1 Revert "ANDROID: Update gradle versions to make Android Studio happy"


Commit: 280446deb1bc004e7aed7af30a97370ef1b006b0
    https://github.com/scummvm/scummvm/commit/280446deb1bc004e7aed7af30a97370ef1b006b0
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-09-26T12:34:29+09:00

Commit Message:
Revert "ANDROID: Update gradle versions to make Android Studio happy"

This does need upgrading at some point and it's basically harmless, but I need
to coordinate upgrading gradle on the buildbot to make it work.

This reverts commit fdf84ed93e9c860208343434eefff16b54635174.

Changed paths:
    dists/android/build.gradle
    dists/android/gradle/wrapper/gradle-wrapper.properties


diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 742d9f1ee1..b27a3e38ef 100644
--- a/dists/android/build.gradle
+++ b/dists/android/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:3.6.0'
     }
 }
 
diff --git a/dists/android/gradle/wrapper/gradle-wrapper.properties b/dists/android/gradle/wrapper/gradle-wrapper.properties
index 84337ad35f..674bdda00e 100644
--- a/dists/android/gradle/wrapper/gradle-wrapper.properties
+++ b/dists/android/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-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip