Merge branch 'master' into tab_key

1 files changed, 68 insertions, 70 deletions

diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index c468277daa..0f8499ba91 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -1,113 +1,111 @@
-//Gradle project for Godot Engine Android port.
-//Do not modify code between the BEGIN/END sections, as it's autogenerated by add-ons
+// Gradle build config for Godot Engine's Android port.
+//
+// Do not remove/modify comments ending with BEGIN/END, they are used to inject
+// addon-specific configuration.
 
 buildscript {
-	repositories {
-		google()
-		jcenter()
+    repositories {
+        google()
+        jcenter()
 //CHUNK_BUILDSCRIPT_REPOSITORIES_BEGIN
 //CHUNK_BUILDSCRIPT_REPOSITORIES_END
-	}
-	dependencies {
-		classpath 'com.android.tools.build:gradle:3.2.1'
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.2'
 //CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN
 //CHUNK_BUILDSCRIPT_DEPENDENCIES_END
-	}
+    }
 }
 
 apply plugin: 'com.android.application'
 
 allprojects {
     repositories {
-	mavenCentral()
-	google()
-	jcenter()
+        mavenCentral()
+        google()
+        jcenter()
 //CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
 //CHUNK_ALLPROJECTS_REPOSITORIES_END
-
     }
 }
 
 dependencies {
-	implementation "com.android.support:support-core-utils:28.0.0"
+    implementation "com.android.support:support-core-utils:28.0.0"
 //CHUNK_DEPENDENCIES_BEGIN
 //CHUNK_DEPENDENCIES_END
 }
 
 android {
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
+    useLibrary 'org.apache.http.legacy'
 
-	lintOptions {
-		abortOnError false
-		disable 'MissingTranslation','UnusedResources'
-	}
-
-	compileSdkVersion 28
-	buildToolsVersion "28.0.3"
-	useLibrary 'org.apache.http.legacy'
-
-	packagingOptions {
-		exclude 'META-INF/LICENSE'
-		exclude 'META-INF/NOTICE'
-	}
-	defaultConfig {
-		minSdkVersion 18
-		targetSdkVersion 28
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 28
 //CHUNK_ANDROID_DEFAULTCONFIG_BEGIN
 //CHUNK_ANDROID_DEFAULTCONFIG_END
-	}
-	// Both signing and zip-aligning will be done at export time
-	buildTypes.all { buildType ->
-		buildType.zipAlignEnabled false
-		buildType.signingConfig null
-	}
-	sourceSets {
-		main {
-			manifest.srcFile 'AndroidManifest.xml'
-			java.srcDirs = ['src'
+    }
+
+    lintOptions {
+        abortOnError false
+        disable 'MissingTranslation', 'UnusedResources'
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+    }
+
+    // Both signing and zip-aligning will be done at export time
+    buildTypes.all { buildType ->
+        buildType.zipAlignEnabled false
+        buildType.signingConfig null
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = [
+                'src'
 //DIR_SRC_BEGIN
 //DIR_SRC_END
-			]
-			res.srcDirs = [
-				'res'
+            ]
+            res.srcDirs = [
+                'res'
 //DIR_RES_BEGIN
 //DIR_RES_END
-			]
-			aidl.srcDirs = [
-				'aidl'
+            ]
+            aidl.srcDirs = [
+                'aidl'
 //DIR_AIDL_BEGIN
 //DIR_AIDL_END
-			]
-			assets.srcDirs = [
-				'assets'
+            ]
+            assets.srcDirs = [
+                'assets'
 //DIR_ASSETS_BEGIN
 //DIR_ASSETS_END
-
-			]
-		}
-		debug.jniLibs.srcDirs = [
-			'libs/debug'
+            ]
+        }
+        debug.jniLibs.srcDirs = [
+            'libs/debug'
 //DIR_JNI_DEBUG_BEGIN
 //DIR_JNI_DEBUG_END
-		]
-		release.jniLibs.srcDirs = [
-			'libs/release'
+        ]
+        release.jniLibs.srcDirs = [
+            'libs/release'
 //DIR_JNI_RELEASE_BEGIN
 //DIR_JNI_RELEASE_END
-		]
-	}
-// No longer used, as it's not useful for build source template
-//	applicationVariants.all { variant ->
-//		variant.outputs.all { output ->
-//			output.outputFileName = "../../../../../../../bin/android_${variant.name}.apk"
-//		}
-//	}
+        ]
+    }
 
+    // No longer used, as it's not useful for build source template
+    //applicationVariants.all { variant ->
+    //    variant.outputs.all { output ->
+    //        output.outputFileName = "../../../../../../../bin/android_${variant.name}.apk"
+    //    }
+    //}
 }
 
 //CHUNK_GLOBAL_BEGIN
 //CHUNK_GLOBAL_END
-
-
-
-
-