From 74fe5968c15021edaf8e799b029feb71703744a4 Mon Sep 17 00:00:00 2001
From: Wojciech Milkowski <wmilkowski@intera.pl>
Date: Mon, 8 Oct 2018 22:35:18 +0200
Subject: [PATCH] Fix build with Android NDK r18

As a bonus there is no need to use undocumented Gradle API any more.

(cherry picked from commit 3598165c4de330abdcf93c383886e8c2d684d6cf)
---
 platform/android/build.gradle.template                | 11 +++++++----
 .../java/gradle/wrapper/gradle-wrapper.properties     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template
index 7269e658b45..0dd1fe815fe 100644
--- a/platform/android/build.gradle.template
+++ b/platform/android/build.gradle.template
@@ -1,10 +1,11 @@
 buildscript {
 	repositories {
+		google()
 		jcenter()
 		$$GRADLE_REPOSITORY_URLS$$
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.3.3'
+		classpath 'com.android.tools.build:gradle:3.2.0'
 		$$GRADLE_CLASSPATH$$
 	}
 }
@@ -33,7 +34,7 @@ android {
 	}
 
 	compileSdkVersion 27
-	buildToolsVersion "27.0.3"
+	buildToolsVersion "28.0.3"
 	useLibrary 'org.apache.http.legacy'
 
 	packagingOptions {
@@ -76,9 +77,11 @@ android {
 			$$GRADLE_JNI_DIRS$$
 		]
 	}
+
 	applicationVariants.all { variant ->
-		// ApplicationVariant is undocumented, but this method is widely used; may break with another version of the Android Gradle plugin
-		variant.outputs.get(0).setOutputFile(new File("${projectDir}/../../../bin", "android_${variant.name}.apk"))
+		variant.outputs.all { output ->
+			output.outputFileName = "../../../../../../../bin/android_${variant.name}.apk"
+		}
 	}
 }
 
diff --git a/platform/android/java/gradle/wrapper/gradle-wrapper.properties b/platform/android/java/gradle/wrapper/gradle-wrapper.properties
index fe37fa74a92..6fb3a795461 100644
--- a/platform/android/java/gradle/wrapper/gradle-wrapper.properties
+++ b/platform/android/java/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.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip