diff --git a/android/build.gradle b/android/build.gradle index 0c715a507..e829d1dd9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,7 +37,7 @@ android { //See here: https://developer.android.com/studio/build/shrink-code#decode-stack-trace shrinkResources true minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' dependencies { releaseImplementation project(':services:updates:githubUpdates') diff --git a/build.gradle b/build.gradle index 2b6c24bfe..465ab99c9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.13.1' } } @@ -25,7 +25,7 @@ allprojects { gdxVersion = '1.14.0' gdxControllersVersion = '2.2.4' - robovmVersion = '2.3.23' + robovmVersion = '2.3.24' } version = appVersionName diff --git a/desktop/build.gradle b/desktop/build.gradle index b91c6cd40..8856feda4 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.beryx.runtime' version '2.0.0' + id 'org.beryx.runtime' version '2.0.1' } [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' @@ -70,10 +70,10 @@ runtime { if (osName.contains('windows')) { //May work on Windows 7 (2009), but that's old enough that I'm only officially supporting Windows 10 (2015) targetPlatform("win") { - jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_windows_hotspot_17.0.16_8.zip") - javaHome = file("./build/jdks/win/jdk-17.0.16+8").getAbsolutePath() + jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.17%2B10/OpenJDK17U-jdk_x64_windows_hotspot_17.0.17_10.zip") + javaHome = file("./build/jdks/win/jdk-17.0.17+10").getAbsolutePath() jpackage { - jpackageHome = file("./build/jdks/win/jdk-17.0.16+8") + jpackageHome = file("./build/jdks/win/jdk-17.0.17+10") imageOptions = ["--icon", file("./src/main/assets/icons/windows.ico"), "--java-options", "-XX:+IgnoreUnrecognizedVMOptions"] } @@ -81,10 +81,10 @@ runtime { } else if (osName.contains('linux')) { //May work on glibc 2.12 (2010), but that's old enough that I'm only officially supporting glibc 2.17 (2012) targetPlatform("linux") { - jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.16_8.tar.gz") - javaHome = file("./build/jdks/linux/jdk-17.0.16+8").getAbsolutePath() + jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.17%2B10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.17_10.tar.gz") + javaHome = file("./build/jdks/linux/jdk-17.0.17+10").getAbsolutePath() jpackage { - jpackageHome = file("./build/jdks/linux/jdk-17.0.16+8") + jpackageHome = file("./build/jdks/linux/jdk-17.0.17+10") imageOptions = ["--icon", file("./src/main/assets/icons/icon_256.png"), "--java-options", "-XX:+IgnoreUnrecognizedVMOptions"] } @@ -92,10 +92,10 @@ runtime { } else if (osName.contains('mac')) { //This JDK officially supports MacOS 12 (2021), but internals suggest support for 10.12 (2016) targetPlatform("mac") { - jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.16%2B8/OpenJDK17U-jdk_x64_mac_hotspot_17.0.16_8.tar.gz") - javaHome = file("./build/jdks/mac/jdk-17.0.16+8/Contents/Home/").getAbsolutePath() + jdkHome = jdkDownload("https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.17%2B10/OpenJDK17U-jdk_x64_mac_hotspot_17.0.17_10.tar.gz") + javaHome = file("./build/jdks/mac/jdk-17.0.17+10/Contents/Home/").getAbsolutePath() jpackage { - jpackageHome = file("./build/jdks/mac/jdk-17.0.16+8/Contents/Home/") + jpackageHome = file("./build/jdks/mac/jdk-17.0.17+10/Contents/Home/") imageOptions = ["--icon", file("./src/main/assets/icons/mac.icns"), "--java-options", "-XstartOnFirstThread", "--java-options", "-XX:+IgnoreUnrecognizedVMOptions", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60c7..f8e1ee312 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e1113280..23449a2b5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME