From e23837a4ba3be9dc22c73ba9945e99312f0fa67e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 14 Sep 2021 12:21:07 -0400
Subject: [PATCH] Updated RoboVM / Switched to hard-coded SDK platform jar

---
 android/build.gradle | 13 ++++---------
 build.gradle         | 14 +-------------
 gradle.properties    |  2 +-
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 96bcdac873..fdc7b4d271 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -18,12 +18,6 @@ configurations{ natives }
 repositories{
     mavenCentral()
     maven{ url "https://maven.google.com" }
-
-    ivy{
-        url 'https://github.com/'
-        patternLayout{ artifact '/[organisation]/[module]/raw/master/backends/backend-android/libs/android.jar' }
-        metadataSources{ artifact() }
-    }
 }
 
 task deploy(type: Copy){
@@ -35,7 +29,7 @@ task deploy(type: Copy){
 }
 
 android{
-    buildToolsVersion '30.0.2'
+    buildToolsVersion '30.0.3'
     compileSdkVersion 30
     sourceSets{
         main{
@@ -145,8 +139,9 @@ dependencies{
     gpImplementation "com.google.android.gms:play-services-games:21.0.0"
     gpImplementation "com.google.android.gms:play-services-auth:19.0.0"
 
-    //android dependencies magically disappear during compilation, thanks gradle!
-    compileOnly "Anuken:Arc:android"
+    //TODO dynamically find best android platform jar instead of hard-coding to 30
+    def sdkFile = new File((String)findSdkDir(), "/platforms/android-30/android.jar")
+    if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 
 task copyAndroidNatives(){
diff --git a/build.gradle b/build.gradle
index 56b17f5102..e2f6b589c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,22 +13,10 @@ buildscript{
         google()
         maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven{ url 'https://jitpack.io' }
-
-        //fake repository to download my patched robovm jar from
-        ivy{
-            url 'https://github.com/'
-            patternLayout{ artifact '/[organisation]/[module]/raw/a-single-jar-file/[revision].jar' }
-            metadataSources{ artifact() }
-        }
     }
 
     dependencies{
-        //use local, patched robovm gradle plugin until my PR for gradle 7.0 support is merged
-        //https://github.com/Anuken/robovm/raw/a-single-jar-file/robovm-gradle-plugin-2.3.14-SNAPSHOT.jar
-        classpath "Anuken:robovm:robovm-gradle-plugin-2.3.14-SNAPSHOT"
-        //needed for plugin above
-        classpath "com.mobidevelop.robovm:robovm-dist-compiler:2.3.13"
-
+        classpath "com.mobidevelop.robovm:robovm-gradle-plugin:2.3.14"
         classpath "com.github.Anuken.Arc:packer:$arcHash"
         classpath "com.github.Anuken.Arc:arc-core:$arcHash"
     }
diff --git a/gradle.properties b/gradle.properties
index 912648a4a4..177a840e92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,4 +11,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 http.socketTimeout=80000
 http.connectionTimeout=80000
-archash=72627de9b81e7143af4ebe1d1f9d54099ade8fd3
+archash=43f8f93e80779f91fad622acfae70cdc300edecf