From d55829c053541f2e7a58bceb7e45092a7ddf0f92 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 12:44:16 -0500
Subject: [PATCH 1/7] Another one

---
 .travis.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9f172a6a96..0a87c57707 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,8 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-26
 
-  licenses:
-    - 'android-sdk-preview-license-52d11cd2'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
-
 before_script:
+    - touch $ANDROID_HOME/Sdk/licenses/android-sdk-license
     - echo "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/Sdk/licenses/android-sdk-license
 
 script: 

From 1b116aa3c20deb56458ff75cc54451b02f2ddb10 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 12:50:14 -0500
Subject: [PATCH 2/7] Changed file paths in travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0a87c57707..bc62785c22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,8 @@ android:
     - addon-google_apis-google-26
 
 before_script:
-    - touch $ANDROID_HOME/Sdk/licenses/android-sdk-license
-    - echo "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> $ANDROID_HOME/Sdk/licenses/android-sdk-license
+    - touch /usr/local/android-sdk/licenses/android-sdk-license
+    - echo "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> /usr/local/android-sdk/licenses/android-sdk-license
 
 script: 
     - ./gradlew clean desktop:dist

From 9a9cb631d21ff0543ca8b3f830cdc02aa5ff2f48 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 12:52:44 -0500
Subject: [PATCH 3/7] Switched to openjdk only

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bc62785c22..c90531a88b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: android
 
 jdk:
-    - oraclejdk8
     - openjdk8
 
 android:

From 09da698513e28bc28b5d587b367a4f0a87f708cf Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 12:56:46 -0500
Subject: [PATCH 4/7] removed android build

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c90531a88b..5e3464876b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,13 +13,8 @@ android:
     - extra-android-m2repository
     - addon-google_apis-google-26
 
-before_script:
-    - touch /usr/local/android-sdk/licenses/android-sdk-license
-    - echo "\nd56f5187479451eabf01fb78af6dfcb131a6481e" >> /usr/local/android-sdk/licenses/android-sdk-license
-
 script: 
     - ./gradlew clean desktop:dist
-    - ./gradlew clean android:build
 
 after_success:
     - chmod +x upload-build.sh

From 5298d36eab5d928171dae1cec1542e27a908fd66 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 13:01:02 -0500
Subject: [PATCH 5/7] Removed clean and added android build again

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5e3464876b..f2fdb52ded 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ android:
     - addon-google_apis-google-26
 
 script: 
-    - ./gradlew clean desktop:dist
+    - ./gradlew desktop:dist
+    - ./gradlew android:build
 
 after_success:
     - chmod +x upload-build.sh

From a8dfcef5ffbf53f1dd09ba853ed83e2668b4f1af Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 13:08:36 -0500
Subject: [PATCH 6/7] Added skip cleanup

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index f2fdb52ded..44320387df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,11 @@ android:
     - addon-google_apis-google-26
 
 script: 
+    skip_cleanup: true
     - ./gradlew desktop:dist
     - ./gradlew android:build
 
 after_success:
+    skip_cleanup: true
     - chmod +x upload-build.sh
     - ./upload-build.sh

From 02c2a9aeef87949f5be3991759201c5f8f801bd2 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@gmail.com>
Date: Thu, 21 Dec 2017 13:14:59 -0500
Subject: [PATCH 7/7] removed android build again

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44320387df..ab561ad24e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,8 @@ android:
     - addon-google_apis-google-26
 
 script: 
-    skip_cleanup: true
     - ./gradlew desktop:dist
-    - ./gradlew android:build
 
 after_success:
-    skip_cleanup: true
     - chmod +x upload-build.sh
     - ./upload-build.sh