From 3fad0985b47bd89f2792ff9e706c62b04a03fd59 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 25 Nov 2019 06:34:02 +0200
Subject: [PATCH] Attempt to use GL 3.0 when possible

---
 android/build.gradle                                 | 4 ++--
 desktop/build.gradle                                 | 9 ++-------
 desktop/src/com/unciv/app/desktop/DesktopLauncher.kt | 1 +
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 65534fa0ce..996ee51138 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 329
-        versionName "3.3.0-patch1"
+        versionCode 330
+        versionName "3.3.1"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/desktop/build.gradle b/desktop/build.gradle
index e23ce18e33..75523ef5ec 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -27,7 +27,7 @@ task debug(dependsOn: classes, type: JavaExec) {
     debug = true
 }
 
-task dist(dependsOn: classes, type: Jar) {
+task dist(dependsOn: classes, type: Jar) { // Compiles the jar file
     from files(sourceSets.main.output.resourcesDir)
     from files(sourceSets.main.output.classesDirs)
     // see Laurent1967's comment on https://github.com/libgdx/libgdx/issues/5491
@@ -49,8 +49,7 @@ for(platform in PackrConfig.Platform.values()) {
         def jarFile = "desktop/build/libs/${appName}.jar".toString()
         PackrConfig config = new PackrConfig()
         config.platform = platform
-        config.jdk = System.env.'JAVA_HOME'
-//        config.jdk = "https://github.com/ojdkbuild/ojdkbuild/releases/download/java-1.8.0-openjdk-1.8.0.232-1.b09/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip"
+        config.jdk = System.env.'JAVA_HOME' // For Travis
 //        config.jdk = "C:/Users/LENOVO/Downloads/java-1.8.0-openjdk-1.8.0.232-1.b09.ojdkbuild.windows.x86_64.zip"
         config.executable = "Unciv"
         config.classpath = Arrays.asList(jarFile)
@@ -78,10 +77,6 @@ for(platform in PackrConfig.Platform.values()) {
 }
 
 task packr(){
-//    finalizedBy "packrWindows64"
-//    doFirst{
-//        delete(file("packrCache"))
-//    }
     for(platform in PackrConfig.Platform.values())
         finalizedBy "packr${platform.toString()}"
 }
diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
index 5da3965b16..daea62acca 100644
--- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
+++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt
@@ -20,6 +20,7 @@ internal object DesktopLauncher {
             packImages()
 
         val config = LwjglApplicationConfiguration()
+        config.useGL30 = true
         config.addIcon("ExtraImages/Icon.png", Files.FileType.Internal)
         config.title = "Unciv"