From 9ea9e9f5238072bb513182b30c6bd24bcf42ad51 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 2 Dec 2018 14:12:47 +0200
Subject: [PATCH] Upgraded BuildTools to 28.0.3, Gradle to 3.2.1 and Kotlin to
 1.2.71

---
 android/build.gradle | 4 ++--
 build.gradle         | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 8c36cb8449..61098da938 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,5 +1,5 @@
 android {
-    buildToolsVersion "26.0.2"
+    buildToolsVersion "28.0.3"
     compileSdkVersion 26
     sourceSets {
         main {
@@ -12,7 +12,7 @@ android {
             jniLibs.srcDirs = ['libs']
         }
 
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
     }
     packagingOptions {
         exclude 'META-INF/robovm/ios/robovm.xml'
diff --git a/build.gradle b/build.gradle
index cc2a6e997c..8951802d82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 
-    ext.kotlinVersion = '1.2.41'
+    ext.kotlinVersion = '1.2.71'
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
@@ -8,6 +8,7 @@ buildscript {
 
 
     repositories {
+        google()
         mavenLocal()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
@@ -15,7 +16,7 @@ buildscript {
     }
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
         
 
@@ -29,7 +30,7 @@ allprojects {
     version = '1.0.1'
     ext {
         appName = "unciv-game"
-        gdxVersion = '1.9.6'
+        gdxVersion = '1.9.9'
         roboVMVersion = '2.3.1'
         box2DLightsVersion = '1.4'
         ashleyVersion = '1.7.0'
@@ -62,7 +63,7 @@ project(":desktop") {
 
 project(":android") {
     apply plugin: "android"
-    apply plugin: "kotlin-android"
+    //apply plugin: "kotlin-android"
 
     configurations { natives }