From 8d524e18d3ff89216f8e9588b744d302916c3b7b Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Thu, 28 May 2020 21:33:39 -0400
Subject: [PATCH] v0.8.1: updated gradle build tools and gradle version

---
 build.gradle                             | 2 +-
 desktop/build.gradle                     | 5 +++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index c3ae0433e..4cf261285 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.0.0'
     }
 }
 
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 16ab85f4e..74eea650a 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -3,6 +3,7 @@ apply plugin: "java"
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 sourceCompatibility = targetCompatibility = appJavaCompatibility
 
+ext.appMainClass = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
 sourceSets.main.resources.srcDirs = [new File(project(':core').projectDir, "/src/main/assets"),
                                      new File(project(':desktop').projectDir,"/src/main/assets")]
 
@@ -15,7 +16,7 @@ task debug(dependsOn: classes, type: JavaExec) {
     classpath = sourceSets.debug.runtimeClasspath + sourceSets.main.runtimeClasspath
     ignoreExitValue = true
 
-    mainClass = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
+    main = appMainClass
     systemProperty 'Specification-Title', appName
     systemProperty 'Specification-Version', appVersionName + "-INDEV"
     systemProperty 'Implementation-Version', appVersionCode
@@ -36,7 +37,7 @@ task release(dependsOn: compileForRelease, type: Jar) {
     from { configurations.runtimeClasspath.findAll { it.name.endsWith('jar') }.collect { zipTree(it) } }
 
     manifest {
-        attributes 'Main-Class': "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
+        attributes 'Main-Class': appMainClass
         attributes 'Specification-Title': appName
         attributes 'Specification-Version': appVersionName
         attributes 'Implementation-Version': appVersionCode
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 21a8fe405..917840c81 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip