chore: cleanup build.gradle.kts

Author: quiteboring

build.gradle.kts

@@ -1,14 +1,12 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
-  kotlin("jvm")
-  id("fabric-loom")
+  alias(libs.plugins.kotlin)
+  alias(libs.plugins.loom)
   `maven-publish`
-  java
 }
 
 val baseGroup: String by project
-val lwjglVersion: String by project
 val modVersion: String by project
 val modName: String by project
 
@@ -19,40 +17,28 @@ base {
   archivesName = modName
 }
 
-val docVersionsDir = projectDir.resolve("docs-versions")
-val currentVersion = version.toString()
-val currentVersionDir = docVersionsDir.resolve(currentVersion)
-
 repositories {
   mavenCentral()
   maven("https://maven.meteordev.org/releases")
   maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
 }
 
 dependencies {
-  minecraft("com.mojang:minecraft:${property("minecraft_version")}")
+  minecraft(libs.minecraft)
   mappings(loom.officialMojangMappings())
+  modImplementation(libs.bundles.fabric)
 
-  modImplementation("net.fabricmc:fabric-loader:${property("loader_version")}")
-  modImplementation("net.fabricmc:fabric-language-kotlin:${property("fabric_kotlin_version")}")
-  modImplementation("net.fabricmc.fabric-api:fabric-api:${property("fabric_api_version")}")
-
-  modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:1.2.2")
-  runtimeOnly("org.apache.httpcomponents:httpclient:4.5.14")
-
-  modImplementation("org.lwjgl:lwjgl-nanovg:${lwjglVersion}")
-  include("org.lwjgl:lwjgl-nanovg:${lwjglVersion}")
+  implementation(libs.nanovg) { include(this) }
+  implementation(libs.bundles.included) { include(this) }
 
   listOf("windows", "linux", "macos", "macos-arm64").forEach {
-    modImplementation("org.lwjgl:lwjgl-nanovg:${lwjglVersion}:natives-$it")
-    include("org.lwjgl:lwjgl-nanovg:${lwjglVersion}:natives-$it")
+    implementation(variantOf(libs.nanovg) { classifier("natives-$it") }) {
+      include(this)
+    }
   }
 
-  implementation("meteordevelopment:discord-ipc:1.1")
-  include("meteordevelopment:discord-ipc:1.1")
-
-  implementation("org.reflections:reflections:0.10.2")
-  include("org.reflections:reflections:0.10.2")
+  runtimeOnly(libs.httpclient)
+  modRuntimeOnly(libs.devauth)
 }
 
 tasks {
@@ -86,7 +72,6 @@ tasks {
 }
 
 java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(21))
-  }
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
 }

gradle.properties

@@ -4,17 +4,6 @@ org.gradle.jvmargs=-Xmx4000m
 baseGroup=org.cobalt
 modName=cobalt
 modVersion=1.0.1
-shouldRelease=true
-
-lwjglVersion=3.3.3
-
-# https://fabricmc.net/develop/
-minecraft_version=1.21.11
-loader_version=0.18.4
-loom_version=1.15-SNAPSHOT
-
-# Dependency Versions
-fabric_api_version=0.141.2+1.21.11
-fabric_kotlin_version=1.13.8+kotlin.2.3.0
+shouldRelease=false
 
 loom.ignoreDependencyLoomVersionValidation=true

gradle/libs.versions.toml

@@ -0,0 +1,38 @@
+[versions]
+# Library Versions
+minecraft-version = "1.21.11"
+
+fabric-loader = "0.18.4"
+fabric-api = "0.141.2+1.21.11"
+fabric-kotlin = "1.13.8+kotlin.2.3.0"
+
+lwjgl = "3.3.3"
+discord-ipc = "1.1"
+reflections = "0.10.2"
+httpclient = "4.5.14"
+devauth = "1.2.2"
+
+# Plugins Versions
+kotlin = "2.3.0"
+loom = "1.15-SNAPSHOT"
+
+[libraries]
+minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft-version" }
+
+fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
+fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
+fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric-kotlin" }
+
+nanovg = { group = "org.lwjgl", name = "lwjgl-nanovg", version.ref = "lwjgl" }
+discord-ipc = { module = "meteordevelopment:discord-ipc", version.ref = "discord-ipc" }
+reflections = { module = "org.reflections:reflections", version.ref = "reflections" }
+httpclient = { module = "org.apache.httpcomponents:httpclient", version.ref = "httpclient" }
+devauth = { module = "me.djtheredstoner:DevAuth-fabric", version.ref = "devauth" }
+
+[bundles]
+fabric = ["fabric-loader", "fabric-api", "fabric-kotlin"]
+included = ["discord-ipc", "reflections"]
+
+[plugins]
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+loom = { id = "fabric-loom", version.ref = "loom" }

settings.gradle.kts

@@ -1,20 +1,9 @@
 pluginManagement {
-
   repositories {
     maven("https://maven.fabricmc.net/")
     mavenCentral()
     gradlePluginPortal()
   }
-
-  val loom_version: String by settings
-  val fabric_kotlin_version: String by settings
-
-  plugins {
-    id("com.github.johnrengelman.shadow") version "8.1.1"
-    id("fabric-loom") version loom_version
-    id("org.jetbrains.kotlin.jvm") version fabric_kotlin_version.split("+kotlin.")[1].split("+")[0]
-  }
-
 }
 
 rootProject.name = "Cobalt"