Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump the versions group with 19 updates #63

Merged
merged 3 commits into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
# Project
makeevrserg.project.name=AstraRating
makeevrserg.project.group=ru.astrainteractive.astrarating
makeevrserg.project.version.string=1.20.3
makeevrserg.project.version.string=1.20.4
makeevrserg.project.description=Rating plugin for EmpireProjekt
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
makeevrserg.project.url=https://empireprojekt.ru
Expand Down
21 changes: 10 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
[versions]
# Kotlin
kotlin-version = "2.0.0" # https://github.com/JetBrains/kotlin
kotlin-coroutines = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines
kotlin-json = "1.7.3" # https://github.com/Kotlin/kotlinx.serialization
kotlin-kaml = "0.66.0" # https://github.com/charleskorn/kaml
kotlin-coroutines = "1.10.1" # https://github.com/Kotlin/kotlinx.coroutines
kotlin-json = "1.8.0" # https://github.com/Kotlin/kotlinx.serialization
kotlin-kaml = "0.67.0" # https://github.com/charleskorn/kaml

# Drivers
driver-jdbc = "3.47.1.0" # https://github.com/xerial/sqlite-jdbc
driver-jdbc = "3.48.0.0" # https://github.com/xerial/sqlite-jdbc
driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j

# klibs
klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
klibs-mikro = "1.8.11" # https://github.com/makeevrserg/klibs.mikro
klibs-mikro = "1.8.13" # https://github.com/makeevrserg/klibs.mikro
klibs-kdi = "1.4.8" # https://github.com/makeevrserg/klibs.kdi
klibs-kstorage = "3.2.1" # https://github.com/makeevrserg/klibs.kstorage
klibs-kstorage = "3.2.3" # https://github.com/makeevrserg/klibs.kstorage

# Minecraft
minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
minecraft-spigot = "1.21.1-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
minecraft-spigot = "1.21.3-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
minecraft-papi = "2.11.6" # https://github.com/PlaceholderAPI/PlaceholderAPI
minecraft-protocollib = "5.3.0" # https://github.com/dmulloy2/ProtocolLib
minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
minecraft-astralibs = "3.17.1" # https://github.com/Astra-Interactive/AstraLibs
minecraft-astralibs = "3.19.2" # https://github.com/Astra-Interactive/AstraLibs
minecraft-bstats = "3.1.0" # https://github.com/Bastian/bStats
minecraft-mockbukkit = "4.12.0" #https://github.com/MockBukkit/MockBukkit
minecraft-mockbukkit = "4.27.0" #https://github.com/MockBukkit/MockBukkit

# BuildConfig
gradle-buildconfig = "5.5.1" # https://github.com/gmazzo/gradle-buildconfig-plugin


# Exposed
exposed = "0.57.0" # https://github.com/JetBrains/Exposed
exposed = "0.58.0" # https://github.com/JetBrains/Exposed

[libraries]
# Kotlin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ru.astrainteractive.astrarating.command.rating
import kotlinx.coroutines.CoroutineScope
import org.bukkit.plugin.java.JavaPlugin
import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
import ru.astrainteractive.astralibs.logging.JUtiltLogger
import ru.astrainteractive.astralibs.logging.Logger
Expand All @@ -24,7 +24,7 @@ internal class RatingCommandRegistry(
) : Logger by JUtiltLogger("AstraRating-RatingCommandRegistry") {

fun register() {
plugin.registerCommand(
plugin.setCommandExecutor(
alias = "arating",
commandParser = RatingCommandParser(),
commandExecutor = RatingCommandExecutor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package ru.astrainteractive.astrarating.command.reload

import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContextExt.requirePermission
import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
import ru.astrainteractive.astralibs.command.api.exception.DefaultCommandException
import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor
import ru.astrainteractive.astralibs.command.api.parser.CommandParser
import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
import ru.astrainteractive.astrarating.LifecyclePlugin
import ru.astrainteractive.astrarating.core.PluginTranslation
import ru.astrainteractive.astrarating.core.RatingPermission
import javax.naming.NoPermissionException

internal class ReloadCommandRegistry(
private val plugin: LifecyclePlugin,
Expand All @@ -18,7 +18,7 @@ internal class ReloadCommandRegistry(
) : KyoriComponentSerializer by kyoriComponentSerializer {

fun register() {
plugin.registerCommand(
plugin.setCommandExecutor(
alias = "aratingreload",
commandExecutor = CommandExecutor<ReloadCommand.Result> {
it.sender.sendMessage(translation.reload.let(::toComponent))
Expand All @@ -31,7 +31,7 @@ internal class ReloadCommandRegistry(
},
errorHandler = ErrorHandler { commandContext, throwable ->
when (throwable) {
is DefaultCommandException.NoPermissionException -> with(kyoriComponentSerializer) {
is NoPermissionException -> with(kyoriComponentSerializer) {
commandContext.sender.sendMessage(translation.noPermission.component)
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/core-bukkit/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
implementation(libs.minecraft.bstats)
implementation(libs.klibs.mikro.core)
implementation(libs.klibs.kstorage)
implementation("io.github.reactivecircus.cache4k:cache4k-jvm:0.13.0")
implementation("io.github.reactivecircus.cache4k:cache4k-jvm:0.14.0")
// Spigot dependencies
compileOnly(libs.minecraft.paper.api)
}
2 changes: 1 addition & 1 deletion modules/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation(libs.minecraft.astralibs.exposed)
implementation(libs.klibs.mikro.core)
implementation(libs.klibs.kstorage)
implementation("io.github.reactivecircus.cache4k:cache4k-jvm:0.13.0")
implementation("io.github.reactivecircus.cache4k:cache4k-jvm:0.14.0")
// Test
testImplementation(libs.bundles.testing.kotlin)
testImplementation(libs.tests.kotlin.test)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package ru.astrainteractive.astrarating.gui.loading

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -49,9 +50,9 @@ internal class LoadingIndicator(
job = null
}

suspend fun display() {
suspend fun display(scope: CoroutineScope) {
stop()
job = menu.menuScope.launch {
job = scope.launch {
while (isActive) {
render()
delay(100L)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ internal class PlayerRatingsGUI(
if (it.isLoading) {
inventory.clear()
setManageButtons()
loadingIndicator.display()
loadingIndicator.display(menuScope)
} else {
loadingIndicator.stop()
render()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ internal class RatingsGUI(
if (it.isLoading) {
inventory.clear()
setManageButtons()
loadingIndicator.display()
loadingIndicator.display(menuScope)
} else {
loadingIndicator.stop()
render()
Expand Down
Loading