Modernize Gradle setup with Version Catalog and centralized repositories

google-labs-jules[bot] · demoth · google-labs-jules[bot] · commit 3d47096cd23d · 2026-02-08T21:00:43.000Z
- Introduced Gradle Version Catalog in `gradle/libs.versions.toml`.
- Centralized repository configuration in `settings.gradle.kts` using `dependencyResolutionManagement`.
- Updated all subprojects to use the Version Catalog.
- Converted `cake/core/build.gradle` to Kotlin DSL.
- Cleaned up `gradle.properties` by removing external dependency versions.
- Restored `nativeimage.gradle` inclusion in `cake/lwjgl3/build.gradle`.
- Removed redundant `kotlin-stdlib` dependency from `cake/core`.
- Verified the build and tests pass successfully.

Co-authored-by: demoth &lt;638804+demoth@users.noreply.github.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -1,18 +1,9 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-buildscript {
-  repositories {
-    mavenCentral()
-    maven { url 'https://s01.oss.sonatype.org' }
-    gradlePluginPortal()
-    mavenLocal()
-    google()
-    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-    maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
-  }
-  dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-  }
+plugins {
+  alias(libs.plugins.kotlin.jvm) apply false
+  alias(libs.plugins.badass.runtime) apply false
+  alias(libs.plugins.graalvm.native) apply false
 }
 
 configure(subprojects) {
@@ -35,16 +26,7 @@ subprojects {
   group = 'org.demoth'
   version = '1.0.0'
   ext.appName = 'cake'
-  repositories {
-    mavenCentral()
-    maven { url 'https://s01.oss.sonatype.org' }
-    // You may want to remove the following line if you have errors downloading dependencies.
-    mavenLocal()
-    maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-    maven { url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' }
-    maven { url 'https://jitpack.io' }
-  }
   dependencies {
-    testImplementation('junit:junit:4.12')
+    testImplementation(libs.junit)
   }
 }
diff --git a/cake/core/build.gradle b/cake/core/build.gradle
diff --git a/cake/core/build.gradle.kts b/cake/core/build.gradle.kts
@@ -0,0 +1,20 @@
+dependencies {
+    api(libs.gdx.controllers.core)
+    api(libs.gdx.freetype)
+    api(libs.gdx)
+    // api(libs.gdx.scene2d.ui)
+    api(libs.ktx.actors)
+    api(libs.ktx.app)
+    api(libs.ktx.assets.async)
+    api(libs.ktx.assets)
+    api(libs.ktx.async)
+    api(libs.ktx.collections)
+    api(libs.ktx.freetype.async)
+    api(libs.ktx.freetype)
+    api(libs.ktx.graphics)
+    api(libs.ktx.log)
+    api(libs.ktx.scene2d)
+    api(libs.kotlinx.coroutines.core)
+
+    implementation(project(":qcommon"))
+}
diff --git a/cake/lwjgl3/build.gradle b/cake/lwjgl3/build.gradle
@@ -1,18 +1,3 @@
-buildscript {
-  repositories {
-    gradlePluginPortal()
-  }
-  dependencies {
-// using jpackage only works if the JDK version is 14 or higher.
-// your JAVA_HOME environment variable may also need to be a JDK with version 14 or higher.
-    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_14)) {
-      classpath "org.beryx:badass-runtime-plugin:1.13.0"
-    }
-    if(enableGraalNative == 'true') {
-      classpath "org.graalvm.buildtools.native:org.graalvm.buildtools.native.gradle.plugin:0.9.28"
-    }
-  }
-}
 apply plugin: 'org.jetbrains.kotlin.jvm'
 
 if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_14)) {
@@ -31,10 +16,10 @@ java.sourceCompatibility = 11
 java.targetCompatibility = 11
 
 dependencies {
-  implementation "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion"
-  implementation "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
-  implementation "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
-  implementation "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+  implementation libs.gdx.controllers.desktop
+  implementation libs.gdx.backend.lwjgl3
+  implementation "com.badlogicgames.gdx:gdx-freetype-platform:${libs.versions.gdx.get()}:natives-desktop"
+  implementation "com.badlogicgames.gdx:gdx-platform:${libs.versions.gdx.get()}:natives-desktop"
   implementation project(':cake:core')
 }
 
diff --git a/cake/lwjgl3/nativeimage.gradle b/cake/lwjgl3/nativeimage.gradle
@@ -2,8 +2,8 @@ project(":cake:lwjgl3") {
   apply plugin: "org.graalvm.buildtools.native"
 
   dependencies {
-    implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"
-    implementation "io.github.berstanio:gdx-svmhelper-extension-freetype:$graalHelperVersion"
+    implementation libs.gdx.svmhelper.backend.lwjgl3
+    implementation libs.gdx.svmhelper.extension.freetype
   }
   graalvmNative {
     binaries {
@@ -25,6 +25,6 @@ project(":cake:lwjgl3") {
 
 project(":cake:core") {
   dependencies {
-    implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"
+    implementation libs.gdx.svmhelper.annotations
   }
 }
diff --git a/game/build.gradle.kts b/game/build.gradle.kts
@@ -1,4 +1,4 @@
 dependencies {
     implementation(project(":qcommon"))
-    implementation("org.apache.commons:commons-csv:1.9.0")
+    implementation(libs.commons.csv)
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,12 +7,4 @@ org.gradle.configureondemand=false
 org.gradle.workers.max=4
 org.gradle.jvmargs=-Xms512M -Xmx1G
 
-kotlinVersion=1.9.22
-kotlinxCoroutinesVersion=1.6.4
-
-graalHelperVersion=2.0.1
 enableGraalNative=true
-
-gdxControllersVersion=2.2.3
-gdxVersion=1.12.1
-ktxVersion=1.12.1-rc1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,45 @@
+[versions]
+kotlin = "1.9.22"
+kotlinxCoroutines = "1.6.4"
+gdx = "1.12.1"
+gdxControllers = "2.2.3"
+ktx = "1.12.1-rc1"
+commonsCsv = "1.9.0"
+junit = "4.12"
+logback = "1.4.14"
+badassRuntime = "1.13.0"
+graalvmNative = "0.9.28"
+graalHelper = "2.0.1"
+
+[libraries]
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
+gdx = { group = "com.badlogicgames.gdx", name = "gdx", version.ref = "gdx" }
+gdx-freetype = { group = "com.badlogicgames.gdx", name = "gdx-freetype", version.ref = "gdx" }
+gdx-backend-lwjgl3 = { group = "com.badlogicgames.gdx", name = "gdx-backend-lwjgl3", version.ref = "gdx" }
+gdx-platform = { group = "com.badlogicgames.gdx", name = "gdx-platform", version.ref = "gdx" }
+gdx-freetype-platform = { group = "com.badlogicgames.gdx", name = "gdx-freetype-platform", version.ref = "gdx" }
+gdx-controllers-core = { group = "com.badlogicgames.gdx-controllers", name = "gdx-controllers-core", version.ref = "gdxControllers" }
+gdx-controllers-desktop = { group = "com.badlogicgames.gdx-controllers", name = "gdx-controllers-desktop", version.ref = "gdxControllers" }
+ktx-actors = { group = "io.github.libktx", name = "ktx-actors", version.ref = "ktx" }
+ktx-app = { group = "io.github.libktx", name = "ktx-app", version.ref = "ktx" }
+ktx-assets-async = { group = "io.github.libktx", name = "ktx-assets-async", version.ref = "ktx" }
+ktx-assets = { group = "io.github.libktx", name = "ktx-assets", version.ref = "ktx" }
+ktx-async = { group = "io.github.libktx", name = "ktx-async", version.ref = "ktx" }
+ktx-collections = { group = "io.github.libktx", name = "ktx-collections", version.ref = "ktx" }
+ktx-freetype-async = { group = "io.github.libktx", name = "ktx-freetype-async", version.ref = "ktx" }
+ktx-freetype = { group = "io.github.libktx", name = "ktx-freetype", version.ref = "ktx" }
+ktx-graphics = { group = "io.github.libktx", name = "ktx-graphics", version.ref = "ktx" }
+ktx-log = { group = "io.github.libktx", name = "ktx-log", version.ref = "ktx" }
+ktx-scene2d = { group = "io.github.libktx", name = "ktx-scene2d", version.ref = "ktx" }
+commons-csv = { group = "org.apache.commons", name = "commons-csv", version.ref = "commonsCsv" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+logback-classic = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logback" }
+gdx-svmhelper-backend-lwjgl3 = { group = "io.github.berstanio", name = "gdx-svmhelper-backend-lwjgl3", version.ref = "graalHelper" }
+gdx-svmhelper-extension-freetype = { group = "io.github.berstanio", name = "gdx-svmhelper-extension-freetype", version.ref = "graalHelper" }
+gdx-svmhelper-annotations = { group = "io.github.berstanio", name = "gdx-svmhelper-annotations", version.ref = "graalHelper" }
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+badass-runtime = { id = "org.beryx.runtime", version.ref = "badassRuntime" }
+graalvm-native = { id = "org.graalvm.buildtools.native", version.ref = "graalvmNative" }
diff --git a/maptools/build.gradle.kts b/maptools/build.gradle.kts
@@ -1,4 +1,4 @@
 dependencies {
     implementation(project(":qcommon"))
-    implementation("ch.qos.logback:logback-classic:1.4.14")
+    implementation(libs.logback.classic)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,3 +1,23 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        google()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        mavenCentral()
+        maven { url = uri("https://s01.oss.sonatype.org") }
+        mavenLocal()
+        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
+        maven { url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") }
+        maven { url = uri("https://jitpack.io") }
+        google()
+    }
+}
+
 rootProject.name = "jake2"
 include (":qcommon")
 include (":game")

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ project(":cake:lwjgl3") {`
`2`	`2`	`apply plugin: "org.graalvm.buildtools.native"`
`3`	`3`
`4`	`4`	`dependencies {`
`5`		`- implementation "io.github.berstanio:gdx-svmhelper-backend-lwjgl3:$graalHelperVersion"`
`6`		`- implementation "io.github.berstanio:gdx-svmhelper-extension-freetype:$graalHelperVersion"`
	`5`	`+ implementation libs.gdx.svmhelper.backend.lwjgl3`
	`6`	`+ implementation libs.gdx.svmhelper.extension.freetype`
`7`	`7`	`}`
`8`	`8`	`graalvmNative {`
`9`	`9`	`binaries {`
`@@ -25,6 +25,6 @@ project(":cake:lwjgl3") {`
`25`	`25`
`26`	`26`	`project(":cake:core") {`
`27`	`27`	`dependencies {`
`28`		`- implementation "io.github.berstanio:gdx-svmhelper-annotations:$graalHelperVersion"`
	`28`	`+ implementation libs.gdx.svmhelper.annotations`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`dependencies {`
`2`	`2`	`implementation(project(":qcommon"))`
`3`		`- implementation("org.apache.commons:commons-csv:1.9.0")`
	`3`	`+ implementation(libs.commons.csv)`
`4`	`4`	`}`