Merge pull request #20 from Astra-Interactive/dependabot/gradle/versi…

…ons-80745dbabe

build(deps): bump the versions group with 27 updates

gradle.properties

@@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraRating
 makeevrserg.project.group=ru.astrainteractive.astrarating
-makeevrserg.project.version.string=1.15.0-unstable
+makeevrserg.project.version.string=1.16.0-unstable
 makeevrserg.project.description=Rating plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

gradle/libs.versions.toml

@@ -1,35 +1,35 @@
 [versions]
 # Kotlin
 kotlin-version = "1.9.23" # https://github.com/JetBrains/kotlin
-kotlin-coroutines = "1.8.0" # https://github.com/Kotlin/kotlinx.coroutines
+kotlin-coroutines = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines
 kotlin-json = "1.6.3" # https://github.com/Kotlin/kotlinx.serialization
-kotlin-kaml = "0.58.0" # https://github.com/charleskorn/kaml
+kotlin-kaml = "0.59.0" # https://github.com/charleskorn/kaml
 
 # Drivers
-driver-jdbc = "3.45.3.0" # https://github.com/xerial/sqlite-jdbc
+driver-jdbc = "3.46.0.0" # https://github.com/xerial/sqlite-jdbc
 driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
 
 # klibs
 klibs-gradleplugin = "1.2.0" # https://github.com/makeevrserg/gradle-plugin
-klibs-mikro = "1.6.0-beta" # https://github.com/makeevrserg/klibs.mikro
-klibs-kdi = "1.3.2" # https://github.com/makeevrserg/klibs.kdi
+klibs-mikro = "1.8.1" # https://github.com/makeevrserg/klibs.mikro
+klibs-kdi = "1.4.1" # https://github.com/makeevrserg/klibs.kdi
 
 # Minecraft
-minecraft-velocity = "3.3.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
-minecraft-spigot = "1.20.4-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
-minecraft-papi = "2.11.5" # https://github.com/PlaceholderAPI/PlaceholderAPI
-minecraft-protocollib = "4.8.0" # https://github.com/dmulloy2/ProtocolLib
-minecraft-vault = "1.7" # https://github.com/MilkBowl/VaultAPI
-minecraft-astralibs = "3.1.0-alpha" # https://github.com/Astra-Interactive/AstraLibs
-minecraft-bstats = "3.0.0" # https://github.com/Bastian/bStats
-minecraft-mockbukkit = "v1.19-SNAPSHOT" #https://github.com/MockBukkit/MockBukkit
+minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
+minecraft-spigot = "1.20.5-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
+minecraft-papi = "2.11.6" # https://github.com/PlaceholderAPI/PlaceholderAPI
+minecraft-protocollib = "5.1.0" # https://github.com/dmulloy2/ProtocolLib
+minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
+minecraft-astralibs = "3.6.0" # https://github.com/Astra-Interactive/AstraLibs
+minecraft-bstats = "3.0.2" # https://github.com/Bastian/bStats
+minecraft-mockbukkit = "3.88.1" #https://github.com/MockBukkit/MockBukkit
 
 # BuildConfig
-gradle-buildconfig = "3.1.0" # https://github.com/gmazzo/gradle-buildconfig-plugin
+gradle-buildconfig = "5.3.5" # https://github.com/gmazzo/gradle-buildconfig-plugin
 
 
 # Exposed
-exposed = "0.44.0" # https://github.com/JetBrains/Exposed
+exposed = "0.51.0" # https://github.com/JetBrains/Exposed
 
 [libraries]
 # Kotlin

modules/core/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt

@@ -3,9 +3,9 @@ package ru.astrainteractive.astrarating.core.di
 import ru.astrainteractive.astralibs.async.AsyncComponent
 import ru.astrainteractive.astralibs.filemanager.impl.JVMResourceFileManager
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
-import ru.astrainteractive.astralibs.serialization.SerializerExt.parse
-import ru.astrainteractive.astralibs.serialization.SerializerExt.writeIntoFile
-import ru.astrainteractive.astralibs.serialization.YamlSerializer
+import ru.astrainteractive.astralibs.serialization.StringFormatExt.parse
+import ru.astrainteractive.astralibs.serialization.StringFormatExt.writeIntoFile
+import ru.astrainteractive.astralibs.serialization.YamlStringFormat
 import ru.astrainteractive.astrarating.core.EmpireConfig
 import ru.astrainteractive.astrarating.core.PluginTranslation
 import ru.astrainteractive.klibs.kdi.Dependency
@@ -28,7 +28,7 @@ interface CoreModule {
 
         override val translation: Reloadable<PluginTranslation> = Reloadable {
             val fileManager = JVMResourceFileManager("translations.yml", dataFolder, this::class.java)
-            val serializer = YamlSerializer()
+            val serializer = YamlStringFormat()
             serializer.parse<PluginTranslation>(fileManager.configFile)
                 .onFailure(Throwable::printStackTrace)
                 .getOrElse { PluginTranslation() }
@@ -37,7 +37,7 @@ interface CoreModule {
 
         override val config: Reloadable<EmpireConfig> = Reloadable {
             val fileManager = JVMResourceFileManager("config.yml", dataFolder, this::class.java)
-            val serializer = YamlSerializer()
+            val serializer = YamlStringFormat()
             serializer.parse<EmpireConfig>(fileManager.configFile)
                 .onFailure(Throwable::printStackTrace)
                 .getOrElse { EmpireConfig() }

modules/db-rating/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     implementation(libs.exposed.core)
     implementation(libs.exposed.dao)
     implementation(libs.exposed.jdbc)
-    implementation("mysql:mysql-connector-java:8.0.30")
+    implementation("mysql:mysql-connector-java:8.0.33")
     // Local
     implementation(projects.modules.core)
 }

settings.gradle.kts

@@ -24,6 +24,7 @@ dependencyResolutionManagement {
         mavenCentral()
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
         maven("https://papermc.io/repo/repository/maven-public/")
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://nexus.scarsz.me/content/groups/public/")

spigot/src/main/kotlin/ru/astrainteractive/astrarating/command/di/CommandsDependencies.kt

@@ -8,12 +8,11 @@ import ru.astrainteractive.astrarating.core.PluginTranslation
 import ru.astrainteractive.astrarating.di.RootModule
 import ru.astrainteractive.astrarating.feature.changerating.domain.usecase.AddRatingUseCase
 import ru.astrainteractive.astrarating.gui.router.GuiRouter
-import ru.astrainteractive.klibs.kdi.Module
 import ru.astrainteractive.klibs.kdi.Provider
 import ru.astrainteractive.klibs.kdi.getValue
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
 
-interface CommandsDependencies : Module {
+interface CommandsDependencies {
     val plugin: AstraRating
     val addRatingUseCase: AddRatingUseCase
     val dispatchers: KotlinDispatchers

spigot/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt

@@ -8,9 +8,8 @@ import ru.astrainteractive.astrarating.event.di.EventModule
 import ru.astrainteractive.astrarating.feature.di.SharedModule
 import ru.astrainteractive.astrarating.gui.di.GuiModule
 import ru.astrainteractive.astrarating.integration.papi.di.PapiModule
-import ru.astrainteractive.klibs.kdi.Module
 
-interface RootModule : Module {
+interface RootModule {
 
     val bukkitModule: BukkitModule
 

spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/playerratings/di/PlayerRatingGuiDependencies.kt

@@ -4,10 +4,9 @@ import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astrarating.api.rating.api.RatingDBApi
 import ru.astrainteractive.astrarating.core.EmpireConfig
 import ru.astrainteractive.astrarating.core.PluginTranslation
-import ru.astrainteractive.klibs.kdi.Module
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
 
-interface PlayerRatingGuiDependencies : Module {
+interface PlayerRatingGuiDependencies {
     val dbApi: RatingDBApi
     val dispatchers: KotlinDispatchers
     val translation: PluginTranslation

spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/ratings/di/RatingsGUIDependencies.kt

@@ -4,10 +4,9 @@ import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astrarating.api.rating.api.RatingDBApi
 import ru.astrainteractive.astrarating.core.EmpireConfig
 import ru.astrainteractive.astrarating.core.PluginTranslation
-import ru.astrainteractive.klibs.kdi.Module
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
 
-interface RatingsGUIDependencies : Module {
+interface RatingsGUIDependencies {
     val dbApi: RatingDBApi
     val dispatchers: KotlinDispatchers
     val translation: PluginTranslation