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

…ons-f39212f0ec

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

.github/dependabot.yaml

@@ -12,6 +12,10 @@ updates:
       versions:
         dependency-type: production
         applies-to: version-updates
+        update-types:
+          - major
+          - minor
+          - patch
     open-pull-requests-limit: 1
 
   - package-ecosystem: "github-actions"
@@ -25,5 +29,9 @@ updates:
       versions:
         dependency-type: production
         applies-to: version-updates
+        update-types:
+          - major
+          - minor
+          - patch
     rebase-strategy: "disabled"
     open-pull-requests-limit: 1

build.gradle.kts

@@ -10,7 +10,6 @@ plugins {
     alias(libs.plugins.klibs.gradle.dokka.root) apply false
     alias(libs.plugins.klibs.gradle.dokka.module) apply false
     alias(libs.plugins.klibs.gradle.java.core) apply false
-    alias(libs.plugins.klibs.gradle.stub.javadoc) apply false
     alias(libs.plugins.klibs.gradle.publication) apply false
     alias(libs.plugins.klibs.gradle.rootinfo) apply false
     // klibs - minecraft

gradle/libs.versions.toml

@@ -3,27 +3,27 @@
 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.61.0" # https://github.com/charleskorn/kaml
+kotlin-kaml = "0.66.0" # https://github.com/charleskorn/kaml
 
 # Drivers
-driver-jdbc = "3.46.1.3" # https://github.com/xerial/sqlite-jdbc
+driver-jdbc = "3.47.1.0" # https://github.com/xerial/sqlite-jdbc
 driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
 
 # klibs
-klibs-gradleplugin = "1.4.0" # https://github.com/makeevrserg/gradle-plugin
+klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
 klibs-mikro = "1.8.8" # https://github.com/makeevrserg/klibs.mikro
 klibs-kdi = "1.4.8" # https://github.com/makeevrserg/klibs.kdi
-klibs-kstorage = "3.1.3" # https://github.com/makeevrserg/klibs.kstorage
+klibs-kstorage = "3.2.0" # https://github.com/makeevrserg/klibs.kstorage
 
 # Minecraft
 minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
 minecraft-spigot = "1.21-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-protocollib = "5.3.0" # https://github.com/dmulloy2/ProtocolLib
 minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
-minecraft-astralibs = "3.15.0" # https://github.com/Astra-Interactive/AstraLibs
+minecraft-astralibs = "3.17.0" # https://github.com/Astra-Interactive/AstraLibs
 minecraft-bstats = "3.1.0" # https://github.com/Bastian/bStats
-minecraft-mockbukkit = "3.129.1" #https://github.com/MockBukkit/MockBukkit
+minecraft-mockbukkit = "4.9.0" #https://github.com/MockBukkit/MockBukkit
 
 # Exposed
 ktor = "2.3.12"
@@ -32,10 +32,10 @@ ktor = "2.3.12"
 gradle-shadow = "7.1.2" # https://github.com/johnrengelman/shadow
 
 # BuildConfig
-gradle-buildconfig = "5.5.0" # https://github.com/gmazzo/gradle-buildconfig-plugin
+gradle-buildconfig = "5.5.1" # https://github.com/gmazzo/gradle-buildconfig-plugin
 
 # Exposed
-exposed = "0.55.0" # https://github.com/JetBrains/Exposed
+exposed = "0.56.0" # https://github.com/JetBrains/Exposed
 
 [libraries]
 # Kotlin

modules/api-market/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     // Test
     testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)
-    testImplementation("com.h2database:h2:2.2.224")
+    testImplementation("com.h2database:h2:2.3.232")
     // Local
     implementation(projects.modules.core)
 }

modules/core/src/main/kotlin/ru/astrainteractive/astramarket/core/Translation.kt

@@ -124,50 +124,50 @@ data class Translation(
         @SerializedName("sort.player_asc")
         val sortPlayerAsc: StringDesc.Raw = StringDesc.Raw("&#FFFFFFпо игроку &#d6a213&l↓"),
     ) {
-        fun auctionPrice(price: Number): StringDesc.Raw {
+        fun auctionPrice(price: Number): StringDesc {
             return auctionPrice
                 .replace("%price%", "$price")
         }
 
-        fun auctionLast(time: String): StringDesc.Raw {
+        fun auctionLast(time: String): StringDesc {
             return auctionLast
                 .replace("%pricetime%", time)
         }
 
-        fun auctionCreatedAgo(time: String): StringDesc.Raw {
+        fun auctionCreatedAgo(time: String): StringDesc {
             return auctionCreatedAgo
                 .replace("%time%", time)
         }
 
-        fun auctionBy(playerOwner: String): StringDesc.Raw {
+        fun auctionBy(playerOwner: String): StringDesc {
             return auctionBy
                 .replace("%player_owner%", playerOwner)
         }
 
-        fun notifyAuctionExpired(item: String, price: Number): StringDesc.Raw {
+        fun notifyAuctionExpired(item: String, price: Number): StringDesc {
             return notifyAuctionExpired
                 .replace("%item%", item)
                 .replace("%price%", "$price")
         }
 
-        fun auctionsAmount(amount: Int): StringDesc.Raw {
+        fun auctionsAmount(amount: Int): StringDesc {
             return auctionsAmount
                 .replace("%amount%", "$amount")
         }
 
-        fun broadcast(playerName: String): StringDesc.Raw {
+        fun broadcast(playerName: String): StringDesc {
             return broadcast
                 .replace("%player%", playerName)
         }
 
-        fun notifyOwnerUserBuy(playerName: String, itemName: String, price: Number): StringDesc.Raw {
+        fun notifyOwnerUserBuy(playerName: String, itemName: String, price: Number): StringDesc {
             return notifyOwnerUserBuy
                 .replace("%player%", playerName)
                 .replace("%item%", itemName)
                 .replace("%price%", "$price")
         }
 
-        fun notifyUserBuy(playerOwner: String, itemName: String, price: Number): StringDesc.Raw {
+        fun notifyUserBuy(playerOwner: String, itemName: String, price: Number): StringDesc {
             return notifyUserBuy
                 .replace("%item%", itemName)
                 .replace("%player_owner%", playerOwner)
@@ -194,7 +194,7 @@ data class Translation(
         @SerializedName("time_format")
         val timeAgoFormat: StringDesc.Raw = StringDesc.Raw("%days%дн. %hours%ч. %minutes%м. назад")
     ) {
-        fun timeAgoFormat(days: Int, hours: Int, minutes: Int): StringDesc.Raw {
+        fun timeAgoFormat(days: Int, hours: Int, minutes: Int): StringDesc {
             return timeAgoFormat
                 .replace("%days%", "$days")
                 .replace("%hours%", "$hours")

modules/gui-bukkit/src/main/kotlin/ru/astrainteractive/astramarket/gui/util/DurationExt.kt

@@ -6,7 +6,7 @@ import java.util.concurrent.TimeUnit
 import kotlin.time.Duration
 
 internal object DurationExt {
-    fun Duration.getTimeFormatted(format: StringDesc.Raw): StringDesc.Raw {
+    fun Duration.getTimeFormatted(format: StringDesc): StringDesc {
         val time = System.currentTimeMillis().minus(inWholeMilliseconds)
         val unit = TimeUnit.MILLISECONDS
         val days = unit.toDays(time)

modules/market-view-bukkit/src/main/kotlin/ru/astrainteractive/astramarket/market/data/bridge/BukkitPlayerInteractionBridge.kt

@@ -8,12 +8,12 @@ import java.util.UUID
 internal class BukkitPlayerInteractionBridge(
     private val stringSerializer: KyoriComponentSerializer
 ) : PlayerInteractionBridge {
-    override fun sendTranslationMessage(uuid: UUID, message: () -> StringDesc.Raw) {
+    override fun sendTranslationMessage(uuid: UUID, message: () -> StringDesc) {
         val component = stringSerializer.toComponent(message.invoke())
         Bukkit.getPlayer(uuid)?.sendMessage(component)
     }
 
-    override fun broadcast(string: StringDesc.Raw) {
+    override fun broadcast(string: StringDesc) {
         val component = stringSerializer.toComponent(string)
         Bukkit.broadcast(component)
     }

modules/market-view/src/main/kotlin/ru/astrainteractive/astramarket/market/data/bridge/PlayerInteractionBridge.kt

@@ -5,9 +5,9 @@ import java.util.UUID
 
 interface PlayerInteractionBridge {
 
-    fun sendTranslationMessage(uuid: UUID, message: () -> StringDesc.Raw)
+    fun sendTranslationMessage(uuid: UUID, message: () -> StringDesc)
 
-    fun broadcast(string: StringDesc.Raw)
+    fun broadcast(string: StringDesc)
 
     fun playSound(uuid: UUID, sound: () -> String)
 }

spigot/build.gradle.kts

@@ -40,10 +40,10 @@ dependencies {
 }
 
 minecraftProcessResource {
-    spigotResourceProcessor.process()
+    bukkit()
 }
 
-setupShadow {
+astraShadowJar {
     requireShadowJarTask {
         destination = File("/home/makeevrserg/Desktop/server/data/plugins")
             .takeIf { it.exists() }