Skip to content

Commit b238651

Browse files
authored
Merge pull request #21 from Astra-Interactive/dependabot/gradle/versions-b4c39f80a6
Bump the versions group with 25 updates
2 parents 2da053f + ebffad7 commit b238651

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
dependencies {
3-
classpath("com.hierynomus:sshj:0.38.0")
3+
classpath("com.hierynomus:sshj:0.39.0")
44
}
55
}
66

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ makeevrserg.java.ktarget=21
1212
# Project
1313
makeevrserg.project.name=SoulKeeper
1414
makeevrserg.project.group=ru.astrainteractive.soulkeeper
15-
makeevrserg.project.version.string=0.2.5
15+
makeevrserg.project.version.string=0.2.6
1616
makeevrserg.project.description=Keep your items after death
1717
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
1818
makeevrserg.project.url=https://github.com/Astra-Interactive/SoulKeeper

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,34 @@
22
# Kotlin
33
kotlin-version = "2.0.0" # https://github.com/JetBrains/kotlin
44
kotlin-benchmark = "0.4.13" # https://github.com/Kotlin/kotlinx-benchmark
5-
kotlin-coroutines = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines
6-
kotlin-json = "1.7.3" # https://github.com/Kotlin/kotlinx.serialization
7-
kotlin-kaml = "0.66.0" # https://github.com/charleskorn/kaml
5+
kotlin-coroutines = "1.10.1" # https://github.com/Kotlin/kotlinx.coroutines
6+
kotlin-json = "1.8.0" # https://github.com/Kotlin/kotlinx.serialization
7+
kotlin-kaml = "0.67.0" # https://github.com/charleskorn/kaml
88

99
# Drivers
10-
driver-jdbc = "3.47.1.0" # https://github.com/xerial/sqlite-jdbc
10+
driver-jdbc = "3.48.0.0" # https://github.com/xerial/sqlite-jdbc
1111
driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
1212
driver-h2 = "2.3.232" # https://github.com/h2database/h2database
1313

1414
# klibs
1515
klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
16-
klibs-mikro = "1.8.11" # https://github.com/makeevrserg/klibs.mikro
16+
klibs-mikro = "1.8.13" # https://github.com/makeevrserg/klibs.mikro
1717
klibs-kdi = "1.4.8" # https://github.com/makeevrserg/klibs.kdi
18-
klibs-kstorage = "3.2.1" # https://github.com/makeevrserg/klibs.kstorage
18+
klibs-kstorage = "3.2.3" # https://github.com/makeevrserg/klibs.kstorage
1919

2020
# Minecraft
2121
minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
22-
minecraft-spigot = "1.21.1-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
22+
minecraft-spigot = "1.21.3-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
2323
minecraft-papi = "2.11.6" # https://github.com/PlaceholderAPI/PlaceholderAPI
2424
minecraft-protocollib = "5.3.0" # https://github.com/dmulloy2/ProtocolLib
2525
minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
26-
minecraft-astralibs = "3.17.1" # https://github.com/Astra-Interactive/AstraLibs
26+
minecraft-astralibs = "3.19.2" # https://github.com/Astra-Interactive/AstraLibs
2727
minecraft-bstats = "3.1.0" # https://github.com/Bastian/bStats
28-
minecraft-mockbukkit = "4.12.0" #https://github.com/MockBukkit/MockBukkit
28+
minecraft-mockbukkit = "4.27.0" #https://github.com/MockBukkit/MockBukkit
2929
minecraft-luckperms = "5.4" # https://github.com/LuckPerms/LuckPerms
3030
minecraft-essentialsx = "2.20.1" # https://github.com/EssentialsX/Essentials
31-
minecraft-towny = "0.101.0.1" # https://github.com/TownyAdvanced/Towny
32-
minecraft-packetevents = "2.6.0" # https://github.com/retrooper/packetevents
31+
minecraft-towny = "0.101.1.0" # https://github.com/TownyAdvanced/Towny
32+
minecraft-packetevents = "2.7.0" # https://github.com/retrooper/packetevents
3333

3434
# Shadow
3535
gradle-shadow = "8.0.0" # https://github.com/johnrengelman/shadow
@@ -38,14 +38,14 @@ gradle-shadow = "8.0.0" # https://github.com/johnrengelman/shadow
3838
gradle-buildconfig = "5.5.1" # https://github.com/gmazzo/gradle-buildconfig-plugin
3939

4040
# Exposed
41-
exposed = "0.57.0" # https://github.com/JetBrains/Exposed
41+
exposed = "0.58.0" # https://github.com/JetBrains/Exposed
4242

4343
# DisordSrv
4444
discordsrv = "1.29.0" # https://github.com/DiscordSRV/DiscordSRV
4545

4646
# Mockito
47-
mockito = "5.14.2" # https://github.com/mockito/mockito
48-
cache4k = "0.13.0" # https://github.com/ReactiveCircus/cache4k
47+
mockito = "5.15.2" # https://github.com/mockito/mockito
48+
cache4k = "0.14.0" # https://github.com/ReactiveCircus/cache4k
4949

5050

5151
[libraries]

instances/bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/command/SoulsCommandRegistry.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import kotlinx.coroutines.launch
55
import org.bukkit.command.CommandSender
66
import org.bukkit.entity.Player
77
import org.bukkit.plugin.java.JavaPlugin
8-
import ru.astrainteractive.astralibs.command.api.argumenttype.PrimitiveArgumentType
8+
import ru.astrainteractive.astralibs.command.api.argumenttype.IntArgumentType
99
import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
1010
import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContextExt.argumentOrElse
1111
import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor
1212
import ru.astrainteractive.astralibs.command.api.parser.CommandParser
13-
import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
13+
import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
1414
import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
1515
import ru.astrainteractive.astralibs.permission.BukkitPermissibleExt.toPermissible
1616
import ru.astrainteractive.astralibs.util.clickable
@@ -43,15 +43,15 @@ internal class SoulsCommandRegistry(
4343
}
4444

4545
private inner class CommandParserImpl : CommandParser<Intent, BukkitCommandContext> {
46-
override fun parse(commandContext: BukkitCommandContext): Intent {
47-
return when (commandContext.args.getOrNull(0)) {
46+
override fun parse(ctx: BukkitCommandContext): Intent {
47+
return when (ctx.args.getOrNull(0)) {
4848
else -> {
49-
val page = commandContext.argumentOrElse(
49+
val page = ctx.argumentOrElse(
5050
index = 0,
51-
type = PrimitiveArgumentType.Int,
51+
type = IntArgumentType,
5252
default = { 1 }
5353
).coerceAtLeast(1).minus(1)
54-
Intent.List(sender = commandContext.sender, page = page)
54+
Intent.List(sender = ctx.sender, page = page)
5555
}
5656
}
5757
}
@@ -198,11 +198,11 @@ internal class SoulsCommandRegistry(
198198
}
199199

200200
fun register() {
201-
plugin.registerCommand(
201+
plugin.setCommandExecutor(
202202
alias = "souls",
203203
commandParser = CommandParserImpl(),
204204
commandExecutor = CommandExecutorImpl(),
205-
errorHandler = { context, throwable ->
205+
errorHandler = { _, throwable ->
206206
throwable.printStackTrace()
207207
}
208208
)

instances/bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/command/SoulsReloadCommandRegistry.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
55
import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContextExt.requirePermission
66
import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor
77
import ru.astrainteractive.astralibs.command.api.parser.CommandParser
8-
import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
8+
import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
99
import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
1010
import ru.astrainteractive.astralibs.lifecycle.LifecyclePlugin
1111
import ru.astrainteractive.klibs.kstorage.api.Krate
@@ -44,11 +44,11 @@ internal class SoulsReloadCommandRegistry(
4444
}
4545

4646
fun register() {
47-
plugin.registerCommand(
47+
plugin.setCommandExecutor(
4848
alias = "skreload",
4949
commandParser = CommandParserImpl(),
5050
commandExecutor = CommandExecutorImpl(),
51-
errorHandler = { context, throwable ->
51+
errorHandler = { _, throwable ->
5252
throwable.printStackTrace()
5353
}
5454
)

0 commit comments

Comments
 (0)