From 6d17f4a91f76459273d9bb6d7d970f7cdc2eda65 Mon Sep 17 00:00:00 2001
From: Jay Vaughan <jay.vaughan@openresearch.com>
Date: Fri, 9 Nov 2018 11:20:11 +0100
Subject: [PATCH] Bring MOAI up to the state of Android development art.

---
 android-studio/app/build.gradle                        | 10 +++++-----
 android-studio/app/src/main/AndroidManifest.xml        |  2 --
 android-studio/build.gradle                            |  4 +++-
 .../gradle/wrapper/gradle-wrapper.properties           |  4 ++--
 android-studio/libmoai/build.gradle                    |  2 +-
 src/moai-android/java/build.gradle                     |  6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/android-studio/app/build.gradle b/android-studio/app/build.gradle
index 28a21db9f1..8022f7029f 100644
--- a/android-studio/app/build.gradle
+++ b/android-studio/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "com.moaisdk.refapp"
@@ -59,11 +59,11 @@ if (usePrebuiltLibs) {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:22.1.1'
-    compile project(':core')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:22.1.1'
+    implementation project(':core')
     if (!usePrebuiltLibs) {
-        compile project(":libmoai")
+        implementation project(":libmoai")
     }
 }
 
diff --git a/android-studio/app/src/main/AndroidManifest.xml b/android-studio/app/src/main/AndroidManifest.xml
index ce20fcd0b1..e76a27d510 100644
--- a/android-studio/app/src/main/AndroidManifest.xml
+++ b/android-studio/app/src/main/AndroidManifest.xml
@@ -33,8 +33,6 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="8"/>
-
     <!-- Moai -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/android-studio/build.gradle b/android-studio/build.gradle
index 596601301b..03abe82a43 100644
--- a/android-studio/build.gradle
+++ b/android-studio/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,5 +16,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/android-studio/gradle/wrapper/gradle-wrapper.properties b/android-studio/gradle/wrapper/gradle-wrapper.properties
index 3beda0ffc2..348c55fc8a 100644
--- a/android-studio/gradle/wrapper/gradle-wrapper.properties
+++ b/android-studio/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 06 18:10:39 PST 2017
+#Fri Nov 09 10:50:57 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/android-studio/libmoai/build.gradle b/android-studio/libmoai/build.gradle
index d62ec4a0fa..9c782f3529 100644
--- a/android-studio/libmoai/build.gradle
+++ b/android-studio/libmoai/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "25.0.0"
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 17
diff --git a/src/moai-android/java/build.gradle b/src/moai-android/java/build.gradle
index 8c5984019a..1c9485b8e3 100644
--- a/src/moai-android/java/build.gradle
+++ b/src/moai-android/java/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 17
@@ -26,6 +26,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.1.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:22.1.1'
 }
\ No newline at end of file