[Scummvm-git-logs] scummvm master -> f3e4d3986a55279f4164bff36662f309986a900b

[antoniou79]

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:
f3e4d3986a ANDROID: DISTS: Upgrade gradle and gradle plugin versions


Commit: f3e4d3986a55279f4164bff36662f309986a900b
    https://github.com/scummvm/scummvm/commit/f3e4d3986a55279f4164bff36662f309986a900b
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-09-27T23:04:34+03:00

Commit Message:
ANDROID: DISTS: Upgrade gradle and gradle plugin versions

This repeats the commit change that mduggan did

The original commit was:
https://github.com/scummvm/scummvm/commit/fdf84ed93e9c860208343434eefff16b54635174
Then it got revered by:
https://github.com/scummvm/scummvm/commit/280446deb1bc004e7aed7af30a97370ef1b006b0
We need to manually remove some (android_project) directories in order for the builds to succeed on our buildbot after these changes. The buildbot does this itself once daily.

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