JasonP01 · pull · Mar 7, 2026 · Mar 7, 2026 · Mar 7, 2026 · Mar 7, 2026
diff --git a/LICENSE_HEADER.md b/LICENSE_HEADER.md
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,46 +1,45 @@
 [versions]
 # platforms
-kotlin-core = "2.3.0"
+kotlin-core = "2.3.10"
 kotlin-coroutine = "1.10.2"
-kotlin-runtime = "4.3.3"
-kotlinx-serialization = "1.9.0"
+kotlin-runtime = "4.3.4"
+kotlinx-serialization = "1.10.0"
 java = "25"
 mindustry = "154.3"
 
 # libraries
 distributor = "4.2.0"
-junit = "6.0.0"
+junit = "6.0.3"
 testcontainers = "2.0.3"
 guava = "33.5.0-jre"
 hoplite = "2.9.0"
 slf4j = "2.0.17"
 slf4md = "1.2.0"
 sql4md = "1.2.0"
-rabbitmq-client = "5.26.0"
 jsoup = "1.21.2"
-okhttp = "5.1.0"
-classgraph = "4.8.181"
-logback = "1.5.19"
+okhttp = "5.3.2"
+classgraph = "4.8.184"
+logback = "1.5.32"
 hikari = "7.0.2"
 exposed = "0.61.0"
 h2 = "2.4.240"
-mariadb = "3.5.6"
-caffeine = "3.2.2"
+mariadb = "3.5.7"
+caffeine = "3.2.3"
 prettytime = "5.0.9.Final"
 time4j = "4.38"
 nohorny = "3.0.3"
-jda = "5.6.1"
+jda = "6.3.1"
 cloud-core = "2.0.0"
 # cloud-translations = "1.0.0-SNAPSHOT"
 ahocorasick = "0.6.3"
 flex = "1.2.0"
-influxdb = "7.3.0"
+influxdb = "7.5.0"
 
 # gradle plugins
-toxopid = "4.1.2"
-indra = "3.2.0"
-spotless = "8.0.0"
-shadow = "9.3.1"
+toxopid = "4.2.0"
+indra = "4.0.0"
+spotless = "8.3.0"
+shadow = "9.3.2"
 
 [libraries]
 # libraries
@@ -57,7 +56,6 @@ hoplite-core = { module = "com.sksamuel.hoplite:hoplite-core", version.ref = "ho
 hoplite-yaml = { module = "com.sksamuel.hoplite:hoplite-yaml", version.ref = "hoplite" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
-rabbitmq-client = { module = "com.rabbitmq:amqp-client", version.ref = "rabbitmq-client" }
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutine" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutine" }
@@ -87,7 +85,6 @@ influxdb = { module = "com.influxdb:influxdb-client-kotlin", version.ref = "infl
 # gradle plugins
 toxopid = { module = "com.xpdustry:toxopid", version.ref = "toxopid" }
 indra-common = { module = "net.kyori:indra-common", version.ref = "indra" }
-indra-licenser-spotless = { module = "net.kyori:indra-licenser-spotless", version.ref = "indra" }
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless" }
 shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow" }
 kotlin-plugin-core = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-core" }
@@ -96,4 +93,4 @@ kotlin-plugin-serialization = { module = "org.jetbrains.kotlin:kotlin-serializat
 [bundles]
 cloud = [ "cloud-core"
     # , "cloud-translations-core"
-]
+]
diff --git a/imperium-build-logic/build.gradle.kts b/imperium-build-logic/build.gradle.kts
@@ -7,7 +7,6 @@ repositories {
 }
 
 dependencies {
-    implementation(libs.indra.licenser.spotless)
     implementation(libs.indra.common)
     implementation(libs.toxopid)
     implementation(libs.spotless)

diff --git a/imperium-build-logic/src/main/kotlin/GenerateImperiumChangelog.kt b/imperium-build-logic/src/main/kotlin/GenerateImperiumChangelog.kt
@@ -1,18 +1,35 @@
-import java.util.regex.Pattern
-import net.kyori.indra.git.IndraGitExtension
-import org.eclipse.jgit.api.Git
+import net.kyori.indra.git.internal.IndraGitService
 import org.eclipse.jgit.lib.Constants
 import org.gradle.api.DefaultTask
-import org.gradle.api.Task
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.provider.Provider
+import org.gradle.api.services.ServiceReference
+import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.named
+import java.util.regex.Pattern
+
+abstract class GenerateImperiumChangelog : DefaultTask() {
+
+    @get:OutputFile
+    abstract val target: RegularFileProperty
 
-open class GenerateImperiumChangelog : DefaultTask() {
+    @get:ServiceReference(IndraGitService.SERVICE_NAME)
+    abstract val gitService: Property<IndraGitService>
 
-    @OutputFile
-    val target: RegularFileProperty = project.objects.fileProperty()
+    @get:Internal
+    abstract val projectDirectory: DirectoryProperty
+
+    @get:Internal
+    abstract val projectDisplayName: Property<String>
+
+    init {
+        projectDirectory.fileValue(project.projectDir)
+        projectDisplayName.convention(project.displayName)
+    }
 
     fun onlyIfHasUpstream() {
         onlyIf("run only if upstream repo is available") { task ->
@@ -23,6 +40,7 @@ open class GenerateImperiumChangelog : DefaultTask() {
 
     @TaskAction
     fun generate() {
+        val git = gitService.get().git(projectDirectory.get().asFile, projectDisplayName.get())!!
         val latest = git.repository.resolve("v" + project.rootProject.file("VERSION.txt").readText().trim())
             ?: error("The version in VERSION.txt is not available")
         val head = git.repository.resolve(Constants.HEAD)!!
@@ -44,7 +62,5 @@ open class GenerateImperiumChangelog : DefaultTask() {
     companion object {
         private val ACCEPTED_SUFFIX =
             Pattern.compile("^(?<verb>feat|fix)(\\((?<scope>mindustry|discord)\\))?:", Pattern.CASE_INSENSITIVE)
-        private val Task.git: Git
-            get() = project.rootProject.extensions.getByType<IndraGitExtension>().git()!!
     }
 }
diff --git a/imperium-build-logic/src/main/kotlin/imperium.base-conventions.gradle.kts b/imperium-build-logic/src/main/kotlin/imperium.base-conventions.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 plugins {
     org.jetbrains.kotlin.jvm
@@ -52,7 +51,7 @@ dependencies {
 spotless {
     kotlin {
         ktfmt().kotlinlangStyle().configure { it.setMaxWidth(120) }
-        licenseHeader(toLongComment(rootProject.file("LICENSE_HEADER.md").readText()))
+        licenseHeader("// SPDX-License-Identifier: GPL-3.0-only")
         trimTrailingWhitespace()
         endWithNewline()
     }

diff --git a/imperium-common/build.gradle.kts b/imperium-common/build.gradle.kts
@@ -9,7 +9,6 @@ dependencies {
     api(libs.guava)
     api(libs.hoplite.core)
     api(libs.hoplite.yaml)
-    api(libs.rabbitmq.client)
     api(libs.okhttp)
     api(libs.caffeine)
 

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/CommonModule.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/CommonModule.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common
 
 import com.google.common.util.concurrent.MoreExecutors

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/Account.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/Account.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 import java.time.Instant

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/AccountManager.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/AccountManager.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 import com.xpdustry.imperium.common.application.ImperiumApplication

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/AccountResult.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/AccountResult.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 import com.xpdustry.imperium.common.security.PasswordRequirement

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/AccountTable.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/AccountTable.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 import java.time.Duration

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/Achievement.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/Achievement.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 enum class Achievement {

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/Rank.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/Rank.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 import com.xpdustry.imperium.common.message.Message

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/SessionKey.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/account/SessionKey.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.account
 
 import java.net.InetAddress

diff --git a/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/annotation/AnnotationScanner.kt b/imperium-common/src/main/kotlin/com/xpdustry/imperium/common/annotation/AnnotationScanner.kt
@@ -1,20 +1,4 @@
-/*
- * Imperium, the software collection powering the Chaotic Neutral network.
- * Copyright (C) 2024  Xpdustry
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+// SPDX-License-Identifier: GPL-3.0-only
 package com.xpdustry.imperium.common.annotation
 
 interface AnnotationScanner {