Use new setup-java version & force JDK 25

DRSchlaubi · DRSchlaubi · commit f4b43443bd68 · 2025-12-16T18:43:17.000+01:00
diff --git a/.github/workflows/client.yaml b/.github/workflows/client.yaml
@@ -13,7 +13,7 @@ jobs:
         with:
           website: jdk.java.net
           release: jextract
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: "temurin"
           java-version: "25"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,9 @@
+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
+
+subprojects {
+    afterEvaluate {
+        configure<KotlinBaseExtension> {
+            jvmToolchain(25)
+        }
+    }
+}
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -114,7 +114,6 @@ compose {
                     proguard {
                         version = libs.versions.proguard
                         obfuscate = false
-                        version = libs.versions.proguard
                         configurationFiles.from(
                             fileTree(collectProguardConfigs.map { it.destinationDir }) {
                                 include("*.pro")
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 include(
@@ -18,4 +18,4 @@ include(
     ":windows_helper"
 )
 
-rootProject.name = "gtakiller"
+rootProject.name = "gtakiller"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ dependencyResolutionManagement {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`plugins {`
`11`		`- id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"`
	`11`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`include(`
`@@ -18,4 +18,4 @@ include(`
`18`	`18`	`":windows_helper"`
`19`	`19`	`)`
`20`	`20`
`21`		`-rootProject.name = "gtakiller"`
	`21`	`+rootProject.name = "gtakiller"`