[Scummvm-git-logs] scummvm master -> 4a9b6d12ac43f3aecb7708637d3f3dfb1b6d75fa

[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:
4a9b6d12ac ANDROID: Use gradle 6.7 and plugin 4.1.0


Commit: 4a9b6d12ac43f3aecb7708637d3f3dfb1b6d75fa
    https://github.com/scummvm/scummvm/commit/4a9b6d12ac43f3aecb7708637d3f3dfb1b6d75fa
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-10-15T19:06:33+03:00

Commit Message:
ANDROID: Use gradle 6.7 and plugin 4.1.0

Also remove ndk.dir from local.properties since it is getting deprecated

Gradle will only use the info (ndkVersion) in gradle.build. Possibly ndkPath too, but we probably don't need that, since ndk is within the sdk folder (default location)

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


diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk
index b558bef675..fed9aba212 100644
--- a/backends/platform/android/android.mk
+++ b/backends/platform/android/android.mk
@@ -26,7 +26,6 @@ $(PATH_BUILD_GRADLE): $(GRADLE_FILES) | $(PATH_BUILD)
 	$(ECHO) "android.useAndroidX=true\n" >> $(PATH_BUILD)/gradle.properties
 	$(ECHO) "android.enableJetifier=true\n" >> $(PATH_BUILD)/gradle.properties
 	$(ECHO) "sdk.dir=$(realpath $(ANDROID_SDK_ROOT))\n" > $(PATH_BUILD)/local.properties
-	$(ECHO) "ndk.dir=$(realpath $(ANDROID_NDK_ROOT))\n" >> $(PATH_BUILD)/local.properties
 
 $(PATH_BUILD_ASSETS): $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(DIST_FILES_NETWORKING) $(DIST_FILES_VKEYBD) $(DIST_FILES_DOCS) $(PORT_DISTFILES) | $(PATH_BUILD)
 	$(INSTALL) -d $(PATH_BUILD_ASSETS)
diff --git a/dists/android/build.gradle b/dists/android/build.gradle
index 22fe40d04d..9261149d78 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:4.1.0'
     }
 }
 
diff --git a/dists/android/gradle/wrapper/gradle-wrapper.properties b/dists/android/gradle/wrapper/gradle-wrapper.properties
index 84337ad35f..3c9d0852bf 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-6.7-all.zip