chore: Update dependencies and prepare next release

xpdustry · Jan 9, 2025 · 8af7bd5 · 8af7bd5
1 parent 3406776
commit 8af7bd5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,7 +75,7 @@ tasks.dexJar {
 }
 
 tasks.mergeJar {
-    archiveFileName.set("kotlin-runtime.jar")
+    archiveFileName = "kotlin-runtime.jar"
 }
 
 tasks.register("getArtifactPath") {
@@ -137,10 +137,10 @@ indra {
 
 spotless {
     kotlin {
-        ktlint()
+        ktfmt().kotlinlangStyle()
         licenseHeaderFile(rootProject.file("HEADER.txt"))
     }
     kotlinGradle {
-        ktlint()
+        ktlint().editorConfigOverride(mapOf("ktlint_code_style" to "intellij_idea", "max_line_length" to "120"))
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 kotlin = "2.1.0"
 kotlinx-coroutines = "1.10.1"
-kotlinx-serialization = "1.7.3"
-spotless = "6.25.0"
+kotlinx-serialization = "1.8.0"
+spotless = "7.0.1"
 indra = "3.1.3"
 shadow = "8.3.5"
 toxopid = "4.1.1"

diff --git a/mod.json b/mod.json
@@ -3,7 +3,7 @@
   "displayName": "KotlinRuntime",
   "author": "Xpdustry",
   "description": "A companion mod for Kotlin based mods and plugins.",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "minGameVersion": "146",
   "hidden": true,
   "java": true,

diff --git a/src/main/kotlin/com/xpdustry/kotlin/KotlinRuntimeMod.kt b/src/main/kotlin/com/xpdustry/kotlin/KotlinRuntimeMod.kt
@@ -26,16 +26,31 @@
 package com.xpdustry.kotlin
 
 import arc.util.Log
-import mindustry.mod.Mod
 import java.util.Properties
+import mindustry.mod.Mod
 
 @Suppress("unused")
 class KotlinRuntimeMod : Mod() {
     override fun init() {
         val properties = Properties()
-        javaClass.classLoader.getResourceAsStream("com/xpdustry/kotlin/versions.properties")!!.use { properties.load(it.reader()) }
-        Log.debug("&lb&fb[KotlinRuntime]&fr Kotlin stdlib and reflect (@) are now available.", "v" + properties["kotlin.base"])
-        Log.debug("&lb&fb[KotlinRuntime]&fr Kotlin coroutines (@) is now available.", "v" + properties["kotlinx.coroutines"])
-        Log.debug("&lb&fb[KotlinRuntime]&fr Kotlin serialization (@) is now available.", "v" + properties["kotlinx.serialization"])
+
+        javaClass.classLoader.getResourceAsStream("com/xpdustry/kotlin/versions.properties")!!.use {
+            properties.load(it.reader())
+        }
+
+        Log.debug(
+            "&lb&fb[KotlinRuntime]&fr Kotlin stdlib+reflect (@) is now available.",
+            "v" + properties["kotlin.base"],
+        )
+
+        Log.debug(
+            "&lb&fb[KotlinRuntime]&fr Kotlin coroutines (@) is now available.",
+            "v" + properties["kotlinx.coroutines"],
+        )
+
+        Log.debug(
+            "&lb&fb[KotlinRuntime]&fr Kotlin serialization (@) is now available.",
+            "v" + properties["kotlinx.serialization"],
+        )
     }
 }