From f36935d0fcb1b3e22a5348a26939e20540b76cce Mon Sep 17 00:00:00 2001
From: NBLJSBDK <nbljsbdk@outlook.com>
Date: Fri, 2 Aug 2024 17:03:20 +0800
Subject: [PATCH] =?UTF-8?q?linux=20=E7=89=88=E6=9C=AC=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                             |  6 +++---
 desktop/build.gradle                     | 17 ++++++++++-------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9912b62fbb..8c4ae424c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.5.1'
 //        classpath 'com.google.gms:google-services:4.3.13'
 //        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
     }
@@ -13,7 +13,7 @@ buildscript {
 allprojects {
 
     ext {
-        appName = 'Statistical SPD'
+        appName = 'Statistical-SPD'
         appPackageName = 'com.shatteredpixel.shatteredpixeldungeon.statistical'
 
         appVersionCode = 20240525
@@ -37,4 +37,4 @@ allprojects {
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 
-}
\ No newline at end of file
+}
diff --git a/desktop/build.gradle b/desktop/build.gradle
index 7b019a4f8c..1907750628 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -8,7 +8,7 @@ sourceCompatibility = targetCompatibility = appJavaCompatibility
 ext.appMainClass = "com.shatteredpixel.shatteredpixeldungeon.desktop.DesktopLauncher"
 processResources {
     from new File(project(':core').projectDir, "/src/main/assets")
-    from new File(project(':desktop').projectDir,"/src/main/assets")
+    from new File(project(':desktop').projectDir, "/src/main/assets")
 }
 
 def osName = System.getProperty('os.name').toLowerCase(Locale.ROOT)
@@ -29,7 +29,7 @@ task debug(type: JavaExec) {
 }
 
 task release(type: Jar) {
-    //FIXME this is now needed as of gradle 7.0, due to our weird sourceSets setup. Should see if there's a better way to do this
+    // FIXME this is now needed as of gradle 7.0, due to our weird sourceSets setup. Should see if there's a better way to do this
     setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
     from sourceSets.main.output
     dependsOn configurations.runtimeClasspath
@@ -43,7 +43,11 @@ task release(type: Jar) {
         attributes 'Implementation-Version': appVersionCode
     }
 }
-installDist.dependsOn release
+
+installDist {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 startScripts.dependsOn release
 jpackageImage.dependsOn release
 
@@ -95,13 +99,12 @@ runtime {
                 imageOptions = ["--icon", file("./src/main/assets/icons/mac.icns"),
                                 "--java-options", "-XstartOnFirstThread",
                                 "--java-options", "-XX:+IgnoreUnrecognizedVMOptions",
-                                //append .apple because com.shatteredpixel.shatteredpixeldungeon was taken =(
+                                // append .apple because com.shatteredpixel.shatteredpixeldungeon was taken =(
                                 "--mac-package-identifier", appPackageName + ".apple",
                                 "--mac-package-name", "ShattererdPD"]
             }
         }
     }
-
 }
 
 dependencies {
@@ -113,7 +116,7 @@ dependencies {
     implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
     implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
 
-    //we use LWJGL tinyFD directly to display crash messages
+    // we use LWJGL tinyFD directly to display crash messages
     implementation "org.lwjgl:lwjgl-tinyfd:3.3.3"
     implementation "org.lwjgl:lwjgl-tinyfd:3.3.3:natives-windows"
     implementation "org.lwjgl:lwjgl-tinyfd:3.3.3:natives-macos"
@@ -123,4 +126,4 @@ dependencies {
 
     implementation project(':services:updates:githubUpdates')
     implementation project(':services:news:shatteredNews')
-}
\ No newline at end of file
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a595206642..48c0a02ca4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists