Skip to content

Commit a00c950

Browse files
makeevrsergmakeevrserg
committed
[FIX] Update libraries
1 parent 6314e9f commit a00c950

6 files changed

Lines changed: 103 additions & 110 deletions

File tree

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ services:
2525
FORGE_VERSION: "47.4.12"
2626
# Paper --------------------
2727
# TYPE: PAPER
28-
# VERSION: 1.21.8
28+
# VERSION: 26.1.2
2929
# Custom -------------------
3030
# CUSTOM_SERVER: https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/121/downloads/paper-1.21.1-121.jar
3131
volumes:

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ kotlin.code.style=official
88
testTask.ignoreFailures=false
99
# Java
1010
klibs.java.source=8
11-
klibs.java.target=21
12-
klibs.java.ktarget=21
11+
klibs.java.target=25
12+
klibs.java.ktarget=25
1313
# Project
1414
klibs.project.name=SoulKeeper
1515
klibs.project.group=ru.astrainteractive.soulkeeper
16-
klibs.project.version.string=1.8.4
16+
klibs.project.version.string=1.9.0
1717
klibs.project.description=Keep your items after death
1818
klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
1919
klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper

‎gradle/libs.versions.toml‎

Lines changed: 68 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,77 @@
11
[versions]
2-
cache4k = "0.14.0"
3-
discordsrv = "1.30.5"
4-
driver-h2 = "2.4.240"
5-
driver-jdbc = "3.53.0.0"
6-
driver-mariadb = "3.5.8"
7-
driver-mysql = "8.0.33"
8-
exposed = "1.2.0"
9-
gradle-buildconfig = "6.0.9"
10-
gradle-ftp = "0.1.3"
11-
gradle-shadow = "9.4.1"
12-
gson = "2.14.0"
13-
guava = "33.6.0-jre"
14-
jda = "6.4.1"
15-
jda-webhook = "0.8.4"
16-
jmh-core = "1.37"
17-
joml = "1.10.8"
18-
klibs-gradleplugin = "2.1.1"
19-
klibs-kdi = "1.4.8"
20-
klibs-kstorage = "5.0.4"
21-
klibs-mikro = "1.23.0"
22-
kotlin-benchmark = "0.4.16"
23-
kotlin-coroutines = "1.10.2"
24-
kotlin-datetime = "0.7.1-0.6.x-compat"
25-
kotlin-json = "1.11.0"
26-
kotlin-serialization = "1.11.0"
27-
kotlin-serialization-kaml = "0.104.0"
28-
kotlin-version = "2.2.0"
29-
ktor = "3.4.3"
30-
minecraft-astralibs = "3.40.4"
31-
minecraft-brigadier = "1.3.10"
32-
minecraft-authlib = "6.0.54"
33-
minecraft-bstats = "3.2.1"
34-
minecraft-bungee = "26.1-R0.1-SNAPSHOT"
35-
minecraft-datafixerupper = "8.0.16"
36-
minecraft-essentialsx = "2.21.2"
37-
minecraft-fabric-api = "0.139.5+"
38-
minecraft-fabric-kotlin = "1.13.7+"
39-
minecraft-fabric-loader = "0.19.2"
40-
minecraft-fabric-loom = "1.16.1"
41-
minecraft-fabric-yarn = "1.20.1+build.10"
42-
minecraft-forge-bus="6.0.5"
43-
minecraft-forgegradle = "7.0.25"
2+
cache4k = "0.14.0" # https://github.com/ReactiveCircus/cache4k
3+
checkerfraemwork-qual = "3.12.0" # https://github.com/typetools/checker-framework/
4+
discordsrv = "1.30.5" # https://github.com/DiscordSRV/DiscordSRV
5+
driver-h2 = "2.4.240" # https://github.com/h2database/h2database
6+
driver-jdbc = "3.53.2.0" # https://github.com/xerial/sqlite-jdbc
7+
driver-mariadb = "3.5.9" # https://github.com/mariadb-corporation/mariadb-connector-j
8+
driver-mysql = "9.7.0" # https://github.com/mysql/mysql-connector-j
9+
exposed = "1.3.0" # https://github.com/JetBrains/Exposed
10+
gradle-buildconfig = "6.0.10" # https://github.com/gmazzo/gradle-buildconfig-plugin
11+
gradle-ftp = "0.2.0" # https://github.com/makeevrserg/GradleFtpPlugin
12+
gradle-shadow = "9.4.2" # https://github.com/GradleUp/shadow
13+
gson = "2.14.0" # https://github.com/google/gson
14+
guava = "33.6.0-jre" # https://github.com/google/guava
15+
jda = "6.4.2" # https://github.com/discord-jda/JDA
16+
jda-webhook = "0.8.4" # https://github.com/MinnDevelopment/discord-webhooks
17+
jmh-core = "1.37" # https://github.com/openjdk/jmh
18+
joml = "1.10.9" # https://github.com/JOML-CI/JOML
19+
klibs-gradleplugin = "2.3.0" # https://github.com/makeevrserg/gradle-plugin
20+
klibs-kstorage = "5.2.0" # https://github.com/makeevrserg/klibs.kstorage
21+
klibs-mikro = "1.27.0" # https://github.com/makeevrserg/klibs.mikro
22+
kotlin-benchmark = "0.4.17" # https://github.com/Kotlin/kotlinx-benchmark
23+
kotlin-coroutines = "1.11.0" # https://github.com/Kotlin/kotlinx.coroutines
24+
kotlin-datetime = "0.8.0" # https://github.com/Kotlin/kotlinx-datetime
25+
kotlin-serialization = "1.11.0" # https://github.com/kotlin/kotlinx.serialization
26+
kotlin-serialization-kaml = "0.104.0" # https://github.com/charleskorn/kaml
27+
kotlin-version = "2.4.0" # https://github.com/jetbrains/kotlin
28+
ktor = "3.5.0" # https://github.com/ktorio/ktor
29+
minecraft-astralibs = "3.41.0" # https://github.com/Astra-Interactive/AstraLibs
30+
minecraft-authlib = "6.0.54" # https://mvnrepository.com/artifact/com.mojang/authlib
31+
minecraft-brigadier = "1.3.10" # https://github.com/Mojang/brigadier
32+
minecraft-bstats = "3.2.1" # https://github.com/Bastian/bStats-Metrics
33+
minecraft-bungee = "26.1-R0.1-SNAPSHOT" # https://github.com/SpigotMC/BungeeCord
34+
minecraft-datafixerupper = "8.0.16" # https://github.com/Mojang/DataFixerUpper
35+
minecraft-essentialsx = "2.21.2" # https://github.com/EssentialsX/Essentials
36+
minecraft-fabric-api = "0.152.2+" # https://github.com/FabricMC/fabric
37+
minecraft-fabric-kotlin = "1.13.12+" # https://github.com/FabricMC/fabric-language-kotlin
38+
minecraft-fabric-loader = "0.19.3" # https://github.com/FabricMC/fabric-loader
39+
minecraft-fabric-loom = "1.17.12" # https://github.com/FabricMC/fabric-loom
40+
minecraft-fabric-yarn = "1.20.1+build.10" # https://github.com/FabricMC/yarn
41+
minecraft-forge-bus = "6.0.5" # https://github.com/MinecraftForge/EventBus
42+
minecraft-forgegradle = "7.0.29" # https://github.com/MinecraftForge/ForgeGradle
4443
minecraft-forge-jarjar = "0.2.3"
45-
minecraft-forgerenamer = "1.0.14"
46-
minecraft-forgeversion = "1.20.1-47.4.12"
47-
minecraft-kyori = "5.0.1"
48-
minecraft-luckperms = "5.5"
49-
minecraft-mcprotocollib = "1.21.7-SNAPSHOT"
50-
minecraft-mockbukkit = "4.108.0"
51-
minecraft-mojang-version = "1.20.1"
52-
minecraft-neoforged-bus = "8.0.2"
53-
minecraft-neoforgegradle = "7.1.20"
54-
minecraft-neoforgeversion = "21.1.129"
55-
minecraft-packetevents = "2.12.1"
56-
minecraft-papi = "2.12.2"
57-
minecraft-protocollib = "5.3.0"
58-
minecraft-spigot = "1.21.9-R0.1-SNAPSHOT"
59-
minecraft-towny = "0.102.0.0"
60-
minecraft-vault = "1.7.1"
61-
minecraft-velocity = "4.0.0-SNAPSHOT"
62-
telegrambots = "9.5.0"
63-
tests-junit-bom = "6.0.3"
64-
tests-junit-jupiter-api = "6.0.3"
65-
tests-mockito = "5.23.0"
66-
tests-org-testing = "7.12.0"
67-
tests-turbine = "1.2.1"
44+
minecraft-forgerenamer = "1.1.2" # https://github.com/MinecraftForge/renamer
45+
minecraft-forgeversion = "1.20.1-47.4.12" # https://github.com/MinecraftForge/MinecraftForge
46+
minecraft-kyori = "5.1.1" # https://github.com/KyoriPowered/adventure
47+
minecraft-luckperms = "5.5" # https://github.com/LuckPerms/LuckPerms
48+
minecraft-mcprotocollib = "26.1-SNAPSHOT" # https://github.com/GeyserMC/MCProtocolLib
49+
minecraft-mockbukkit = "4.113.2" # https://github.com/MockBukkit/MockBukkit
50+
minecraft-mojang-version = "1.20.1" # https://www.minecraft.net
51+
minecraft-neoforged-bus = "8.0.5" # https://github.com/neoforged/Bus
52+
minecraft-neoforgegradle = "7.1.38" # https://github.com/neoforged/NeoGradle
53+
minecraft-neoforgeversion = "21.1.129" # https://github.com/neoforged/NeoForge
54+
minecraft-packetevents = "2.13.0" # https://github.com/retrooper/packetevents
55+
minecraft-papi = "2.12.2" # https://github.com/PlaceholderAPI/PlaceholderAPI
56+
minecraft-protocollib = "5.4.0" # https://github.com/dmulloy2/ProtocolLib
57+
minecraft-spigot = "26.1.2.build.+" # https://www.spigotmc.org
58+
minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
59+
minecraft-velocity = "3.5.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
60+
telegrambots = "10.0.0" # https://github.com/rubenlagus/TelegramBots
61+
tests-junit-bom = "6.1.0" # https://github.com/junit-team/junit5
62+
tests-junit-jupiter-api = "6.1.0" # https://github.com/junit-team/junit5
63+
tests-mockito = "5.23.0" # https://github.com/mockito/mockito
64+
tests-org-testing = "7.12.0" # https://github.com/testng-team/testng
65+
tests-turbine = "1.2.1" # https://github.com/cashapp/turbine
6866

6967
[libraries]
7068
cache4k = { module = "io.github.reactivecircus.cache4k:cache4k-jvm", version.ref = "cache4k" }
69+
checkerfraemwork-qual = { module = "org.checkerframework:checker-qual", version.ref = "checkerfraemwork-qual" }
7170
discord-webhook = { module = "club.minnced:discord-webhooks", version.ref = "jda-webhook" }
7271
driver-h2 = { module = "com.h2database:h2", version.ref = "driver-h2" }
7372
driver-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "driver-jdbc" }
7473
driver-mariadb = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "driver-mariadb" }
75-
driver-mysql = { module = "mysql:mysql-connector-java", version.ref = "driver-mysql" }
74+
driver-mysql = { module = "com.mysql:mysql-connector-j", version.ref = "driver-mysql" }
7675
exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" }
7776
exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
7877
exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
@@ -82,7 +81,6 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" }
8281
jda = { module = "net.dv8tion:JDA", version.ref = "jda" }
8382
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
8483
joml = { module = "org.joml:joml", version.ref = "joml" }
85-
klibs-kdi = { module = "ru.astrainteractive.klibs:kdi-jvm", version.ref = "klibs-kdi" }
8684
klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" }
8785
klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
8886
klibs-mikro-extensions = { module = "ru.astrainteractive.klibs:mikro-extensions-jvm", version.ref = "klibs-mikro" }
@@ -95,7 +93,7 @@ kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.
9593
kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin-version" }
9694
kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
9795
kotlin-serialization-kaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kotlin-serialization-kaml" }
98-
kotlin-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlin-json" }
96+
kotlin-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlin-serialization" }
9997
kotlin-tooling-core = { module = "org.jetbrains.kotlin:kotlin-tooling-core", version.ref = "kotlin-version" }
10098
ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
10199
ktor-client-contentNegitiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
@@ -106,14 +104,15 @@ ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json",
106104
minecraft-astralibs-command = { module = "ru.astrainteractive.astralibs:command", version.ref = "minecraft-astralibs" }
107105
minecraft-astralibs-command-bukkit = { module = "ru.astrainteractive.astralibs:command-bukkit", version.ref = "minecraft-astralibs" }
108106
minecraft-astralibs-core = { module = "ru.astrainteractive.astralibs:core", version.ref = "minecraft-astralibs" }
107+
minecraft-astralibs-core-minecraft = { module = "ru.astrainteractive.astralibs:core-minecraft", version.ref = "minecraft-astralibs" }
109108
minecraft-astralibs-core-bukkit = { module = "ru.astrainteractive.astralibs:core-bukkit", version.ref = "minecraft-astralibs" }
110109
minecraft-astralibs-core-forge = { module = "ru.astrainteractive.astralibs:core-forge", version.ref = "minecraft-astralibs" }
111110
minecraft-astralibs-core-neoforge = { module = "ru.astrainteractive.astralibs:core-neoforge", version.ref = "minecraft-astralibs" }
112111
minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed", version.ref = "minecraft-astralibs" }
113112
minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" }
114113
minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" }
115-
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
116114
minecraft-authlib = { module = "com.mojang:authlib", version.ref = "minecraft-authlib" }
115+
minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
117116
minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" }
118117
minecraft-bungee = { module = "net.md-5:bungeecord-api", version.ref = "minecraft-bungee" }
119118
minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
@@ -141,7 +140,6 @@ minecraft-papi = { module = "me.clip:placeholderapi", version.ref = "minecraft-p
141140
minecraft-protocollib = { module = "com.comphenix.protocol:ProtocolLib", version.ref = "minecraft-protocollib" }
142141
minecraft-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-spigot" }
143142
minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecraft-spigot" }
144-
minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref = "minecraft-towny" }
145143
minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" }
146144
minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" }
147145
telegrambots-client = { module = "org.telegram:telegrambots-client", version.ref = "telegrambots" }

‎instances/bukkit/build.gradle.kts‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ val shadowJar by tasks.getting(ShadowJar::class) {
8080
exclude("org/jetbrains/annotations/**")
8181
exclude("org/slf4j/**")
8282
exclude("org/w3c/dom/**")
83+
exclude("org/jspecify/annotations/**")
8384
// Root
8485
if (project.name == "forge" || project.name == "neoforge") {
85-
// Use kotlin-neoforge or kotlin-forge
86-
exclude("kotlin/**")
86+
exclude("kotlin/**") // Use kotlin-neoforge or kotlin-forge
8787
}
8888
exclude("_COROUTINE/**")
8989
exclude("DebugProbesKt.bin")
@@ -93,12 +93,10 @@ val shadowJar by tasks.getting(ShadowJar::class) {
9393
exclude("**LICENSE**")
9494
// Other dependencies
9595
exclude("club/minnced/opus/**")
96-
exclude("co/touchlab/stately/**")
9796
exclude("com/google/**")
9897
exclude("com/ibm/icu/**")
9998
exclude("com/sun/**")
10099
exclude("google/protobuf/**")
101-
exclude("io/github/**")
102100
exclude("io/javalin/**")
103101
exclude("jakarta/servlet/**")
104102
exclude("javax/annotation/**")
@@ -127,17 +125,20 @@ val shadowJar by tasks.getting(ShadowJar::class) {
127125
exclude("META-INF/com.android.tools/**")
128126
exclude("META-INF/gradle-plugins/**")
129127
exclude("META-INF/imports/**")
130-
exclude("META-INF/kotlin-reflection.kotlin_module")
128+
if (project.name == "forge") {
129+
exclude("META-INF/kotlin-reflection.kotlin_module") // Don't exclude on: forge]
130+
}
131131
exclude("META-INF/license/**")
132132
exclude("META-INF/maven/**")
133133
exclude("META-INF/native-image/**")
134134
exclude("META-INF/native/**")
135135
exclude("META-INF/proguard/**")
136136
exclude("META-INF/rewrite/**")
137-
exclude("META-INF/services/kotlin.reflect.**")
137+
if (project.name == "forge") {
138+
exclude("META-INF/services/kotlin.reflect.**") // Don't exclude on: [*]
139+
}
138140
if (project.name != "forge") {
139-
// Don't remove in: [forge]
140-
exclude("META-INF/versions/**")
141+
exclude("META-INF/versions/**") // Don't remove in: [forge]
141142
}
142143
// DEPENDENCIES
143144
if (project.name == "bukkit") {
@@ -173,8 +174,7 @@ val shadowJar by tasks.getting(ShadowJar::class) {
173174
add("com.arkivanov")
174175
add("com.charleskorn.kaml")
175176
if (project.name != "bukkit") {
176-
// Don't relocate on: [bukkit]
177-
add("com.fasterxml")
177+
add("com.fasterxml") // Don't relocate on: [bukkit]
178178
}
179179
add("com.ibm.icu")
180180
add("com.neovisionaries")
@@ -185,22 +185,19 @@ val shadowJar by tasks.getting(ShadowJar::class) {
185185
add("it.krzeminski")
186186
add("it.krzeminski.snakeyaml")
187187
if (project.name != "bukkit") {
188-
// Is present on: [bukkit]
189-
add("javax.xml")
188+
add("javax.xml") // Is present on: [bukkit]
190189
}
191190
add("kotlinx")
192191
add("net.dv8tion")
193192
if (project.name != "bukkit") {
194-
// Don't relocate on: [bukkit]
195-
add("net.kyori")
193+
add("net.kyori") // Don't relocate on: [bukkit]
196194
}
197195
add("net.thauvin")
198196
add("okhttp3")
199197
add("okio")
200198
add("org.apache")
201199
if (project.name != "bukkit") {
202-
// Don't relocate on: [bukkit]
203-
add("org.h2")
200+
add("org.h2") // Don't relocate on: [bukkit]
204201
}
205202

206203
add("org.intellij")

0 commit comments

Comments
 (0)