Upgrade libraries, simplify project structure

.github/workflows/build.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 21
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v7
+    - name: Set up JDK 25
+      uses: actions/setup-java@v6
       with:
-        distribution: 'adopt'
-        java-version: '21'
+        distribution: 'temurin'
+        java-version: '25'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

AGENTS.md

@@ -43,7 +43,7 @@ Other implementations are located in ../quake. You can refer to them for compari
 - Do not delete existing comments if they are not addressed in the change.
 
 ## Testing Guidelines
-- Primary test framework is JUnit 4 (see root `build.gradle`); Kotlin tests live alongside Java tests.
+- Primary test framework is JUnit 5 (Jupiter; see root `build.gradle`); Kotlin tests live alongside Java tests.
 - Run all tests with `./gradlew test` or target a module with `./gradlew :qcommon:test`.
 - Test classes should be in the same package as the module they verify.
 - Keep tests deterministic and colocated with the module they verify.
@@ -55,4 +55,4 @@ Other implementations are located in ../quake. You can refer to them for compari
 
 ## Configuration Tips
 - Jake2 requires original Quake2 data files. If auto-detection fails, pass a base dir: `+set basedir "/path/to/Quake 2"`.
-- JDK 21 is recommended (11 and 17 also work)
+- JDK 25 is required to build; JVM distributions require Java 25 or newer.

README.md

@@ -17,7 +17,7 @@ Currently, Jake2 supports most platforms supported by Java.
 
 Requirements:
 
- * jdk version 21 recommended (11 and 17 also work)
+ * JDK 25 is required to build; JVM distributions require Java 25 or newer.
 
 Documentation & Info
 --------------------

build.gradle

@@ -1,10 +1,7 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-
 plugins {
-  id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion" apply false
-  id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlinVersion" apply false
-  id 'com.gorylenko.gradle-git-properties' version '2.5.7' apply false
+  alias(libs.plugins.kotlinJvm) apply false
+  alias(libs.plugins.kotlinSerialization) apply false
+  alias(libs.plugins.gitProperties) apply false
 }
 
 subprojects {
@@ -13,35 +10,25 @@ subprojects {
   apply plugin: 'jacoco'
 
   group = 'org.demoth'
-  version = '1.2.0'
+  version = '1.2.1'
   ext.appName = 'cake'
 
-  java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
-    toolchain {
-      languageVersion = JavaLanguageVersion.of(21)
-    }
-  }
-
-  tasks.withType(JavaCompile).configureEach {
-    options.incremental = true
-    options.release = 21
-  }
-
-  tasks.withType(KotlinJvmCompile).configureEach {
-    compilerOptions.jvmTarget.set(JvmTarget.JVM_21)
+  kotlin {
+    jvmToolchain(25)
   }
 
   dependencies {
-    testImplementation(libs.junitJupiterApi)
-    testImplementation(libs.junitJupiterParams)
-    testRuntimeOnly(libs.junitPlatformLauncher)
-    testRuntimeOnly(libs.junitJupiterEngine)
+    implementation(platform(rootProject.libs.kotlinBom))
+    testImplementation(rootProject.libs.junitJupiterApi)
+    testImplementation(rootProject.libs.junitJupiterParams)
+    testRuntimeOnly(rootProject.libs.junitPlatformLauncher)
+    testRuntimeOnly(rootProject.libs.junitJupiterEngine)
   }
 
   tasks.withType(Test).configureEach {
     useJUnitPlatform()
+    // Explicitly allow libGDX/LWJGL to load native libraries without Java 25 warnings.
+    jvmArgs '--enable-native-access=ALL-UNNAMED'
     finalizedBy(tasks.named('jacocoTestReport'))
   }
 

cake/README.md

@@ -31,6 +31,58 @@ Main desktop entrypoint:
 
 - [`Lwjgl3GameLauncher.kt`](cake-client/src/main/kotlin/org/demoth/cake/lwjgl3/Lwjgl3GameLauncher.kt)
 
+## JVM distributions
+
+Build portable ZIPs with Java 25:
+
+```sh
+./gradlew :cake:cake-client:distZip :cake:cake-modelviewer:distZip
+```
+
+Each launcher's `build/distributions/` contains a ZIP with `bin/` launch scripts
+and `lib/` application/dependency JARs. Extract the entire ZIP and run
+`bin/cake-client` or `bin/cake-modelviewer` (the `.bat` script on Windows).
+Pass an asset path to the model viewer; Quake 2 game data remains external.
+
+For a local installation, use `:cake:cake-client:installDist` or
+`:cake:cake-modelviewer:installDist`; scripts are under the corresponding
+`build/install/<application>/bin/` directory. JARs under `build/libs/` are normal
+project JARs and need the distribution classpath. Use `distZip` instead of the
+former custom `dist` task; standalone fat JARs are no longer produced.
+
+The existing launcher helper supplies macOS first-thread startup by restarting
+the JVM when needed. ZIPs require Java; bundled-runtime images and native
+executables use the separate Beryx and Graal tasks.
+
+Configuration cache is enabled for ordinary builds, JVM distributions, and run
+tasks. Beryx 2.0.1 still requires `--no-configuration-cache` for
+`runtime`, `runtimeZip`, `jpackageImage`, and `jpackage`, for example:
+
+```sh
+./gradlew :cake:cake-client:runtimeZip --no-configuration-cache
+./gradlew :cake:cake-client:jpackageImage --no-configuration-cache
+```
+
+`runtimeZip` writes `build/image.zip`; `jpackageImage` writes an application
+under `build/jpackage/`. Use the corresponding model-viewer tasks for that app.
+These outputs bundle the project Java toolchain and target the build machine's
+OS and architecture. Installers remain disabled.
+
+## Native executables
+
+Graal support is opt-in. Enable the native plugin and helpers when building an
+experimental native executable:
+
+```sh
+./gradlew -PenableGraalNative=true :cake:cake-client:nativeCompile
+./gradlew -PenableGraalNative=true :cake:cake-modelviewer:nativeCompile
+```
+
+These tasks require GraalVM 25 or newer with Native Image. Set `GRAALVM_HOME` to
+that installation; Gradle can continue running on the regular project JDK.
+Native resources are detected from the runtime classpath, including repository
+assets and dependency libraries. Ordinary JVM builds and ZIPs omit the Graal helpers.
+
 ## BSP World Renderer
 
 Cake now uses a dedicated Q2PRO-inspired world BSP batch renderer by default (no legacy per-face world `ModelBatch` path).

cake/cake-client/build.gradle

@@ -1,95 +1,11 @@
 plugins {
   id 'application'
-  id 'org.beryx.runtime' version "$beryxRuntimePluginVersion"
-  id 'org.graalvm.buildtools.native' version "$graalNativeBuildToolsVersion" apply false
+  alias(libs.plugins.beryxRuntime)
+  alias(libs.plugins.graalNativeBuildTools) apply false
 }
 
-sourceSets.main.resources.srcDirs += [ rootProject.file('assets').path ]
-def desktopAppName = 'cake-client'
-def mainClassName = 'org.demoth.cake.lwjgl3.Lwjgl3GameLauncher'
 application {
-  mainClass.set(mainClassName)
-}
-dependencies {
-  implementation libs.gdxControllersDesktop
-  implementation libs.gdxBackendLwjgl3
-  implementation(libs.gdxFreetypePlatform) {
-    artifact {
-      classifier = 'natives-desktop'
-    }
-  }
-  implementation(libs.gdxPlatform) {
-    artifact {
-      classifier = 'natives-desktop'
-    }
-  }
-  implementation project(':cake:core')
-}
-
-def jarName = "${desktopAppName}-${version}.jar"
-def os = System.properties['os.name'].toLowerCase()
-def iconsDir = project.file('icons')
-
-run {
-  outputs.upToDateWhen { false }
-  workingDir = rootProject.file('assets').path
-  setIgnoreExitValue(true)
-
-  if (os.contains('mac')) jvmArgs += "-XstartOnFirstThread"
-}
-
-jar {
-  archiveFileName.set(jarName)
-  destinationDirectory = file("${project.layout.buildDirectory.asFile.get().absolutePath}/lib")
-  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  dependsOn configurations.runtimeClasspath
-  from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
-  exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA')
-  dependencies {
-    exclude('META-INF/INDEX.LIST', 'META-INF/maven/**')
-  }
-  manifest {
-    attributes 'Main-Class': mainClassName
-  }
-  doLast {
-    file(archiveFile).setExecutable(true, false)
-  }
-}
-
-if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_14)) {
-  tasks.jpackageImage.doNotTrackState("This task both reads from and writes to the build folder.")
-  runtime {
-    options.set(['--strip-debug',
-           '--compress', '2',
-           '--no-header-files',
-           '--no-man-pages',
-           '--strip-native-commands',
-           '--vm', 'server'])
-    modules.set([
-        'jdk.unsupported'
-    ])
-    distDir.set(file(project.layout.buildDirectory))
-    jpackage {
-      imageName = desktopAppName
-      skipInstaller = true
-      jpackageHome = javaHome.getOrElse("")
-      mainJar = jarName
-      if (os.contains('win')) {
-        imageOptions = ["--icon", new File(iconsDir, 'logo.ico').absolutePath]
-      } else if (os.contains('nix') || os.contains('nux') || os.contains('bsd')) {
-        imageOptions = ["--icon", new File(iconsDir, 'logo.png').absolutePath]
-      } else if (os.contains('mac')) {
-        imageOptions = ["--icon", new File(iconsDir, 'logo.icns').absolutePath]
-      }
-    }
-  }
+  mainClass.set('org.demoth.cake.lwjgl3.Lwjgl3GameLauncher')
 }
 
-tasks.register('dist') {
-  dependsOn 'jar'
-}
-
-if(enableGraalNative == 'true') {
-  apply plugin: 'org.graalvm.buildtools.native'
-  apply from: file("nativeimage.gradle")
-}
+apply from: rootProject.file('cake/desktop.gradle')

cake/cake-client/src/main/kotlin/org/demoth/cake/lwjgl3/Lwjgl3GameLauncher.kt

@@ -24,7 +24,7 @@ object Lwjgl3GameLauncher {
 
     private fun getDefaultConfiguration(videoMode: CakeVideoModeSettings): Lwjgl3ApplicationConfiguration {
         return Lwjgl3ApplicationConfiguration().apply {
-            setTitle("Cake Engine v1.2.0")
+            setTitle("Cake Engine v1.2.1")
             setOpenGLEmulation(Lwjgl3ApplicationConfiguration.GLEmulation.GL32, 3, 2)
             setBackBufferConfig(
                 /* r = */ 8,