Update dependencies

build.gradle.kts

@@ -1,15 +1,21 @@
-buildscript {
-    dependencies {
-        classpath("ru.astrainteractive.gradleplugin:convention:0.4.0")
-        classpath("ru.astrainteractive.gradleplugin:minecraft:0.4.0")
-    }
-}
-
 plugins {
     java
     `java-library`
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
+
+    // klibs - core
+    alias(libs.plugins.klibs.gradle.detekt) apply false
+    alias(libs.plugins.klibs.gradle.detekt.compose) apply false
+    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
+    alias(libs.plugins.klibs.gradle.minecraft.empty) apply false
+    alias(libs.plugins.klibs.gradle.minecraft.multiplatform) apply false
 }
 
 apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")

gradle/libs.versions.toml

@@ -1,54 +1,34 @@
 [versions]
 # Kotlin
-kotlin-version = "1.9.0"
-kotlin-coroutines = "1.6.3"
-kotlin-json = "1.5.0-RC"
-kotlin-kaml = "0.50.0"
+kotlin-version = "1.9.23" # https://github.com/JetBrains/kotlin
+kotlin-coroutines = "1.8.0" # 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
 
 # Drivers
-driver-jdbc = "3.36.0.3"
-driver-mysql = "8.0.20"
-
+driver-jdbc = "3.45.3.0" # https://github.com/xerial/sqlite-jdbc
+driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
 
+# klibs
+klibs-gradleplugin = "1.0.0-alpha01" # 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
 
 # Minecraft
-minecraft-version = "1.19.2"
-minecraft-velocity = "3.1.1"
-minecraft-spigot = "1.20.1-R0.1-SNAPSHOT"
-minecraft-papi = "2.11.2"
-minecraft-protocollib = "4.8.0"
-minecraft-wg = "7.0.7"
-minecraft-vault = "1.7"
-minecraft-coreprotect = "21.2"
-minecraft-astralibs = "3.0.0-alpha06"
-minecraft-bstats = "3.0.0"
-minecraft-mockbukkit = "v1.19-SNAPSHOT"
-
-# Testing
-tests-org-testing = "7.1.0"
-tests-junit = "4.12"
-tests-mockito = "4.0.0"
-tests-junit-jupiter-api = "5.9.1"
-tests-junit-bom = "5.7.0"
-
-# Fabric
-minecraft-fabric-loom = "1.0-SNAPSHOT"
-minecraft-fabric-kotlin = "1.8.1+kotlin.1.7.0"
-minecraft-fabric-loader = "0.14.9"
-minecraft-fabric-api = "0.60.0+1.19.2"
-
-# Forge
-minecraft-forge-net = "5.1.61"
-minecrft-forge-version = "1.19.2-43.1.52"
+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
 
 # Shadow
-gradle-shadow = "7.1.2"
+gradle-shadow = "7.1.2" # https://github.com/johnrengelman/shadow
 
 # BuildConfig
-gradle-buildconfig = "3.1.0"
-
-# Exposed
-exposed = "0.38.1"
+gradle-buildconfig = "3.1.0" # https://github.com/gmazzo/gradle-buildconfig-plugin
 
 [libraries]
 # Kotlin
@@ -69,13 +49,6 @@ driver-mysql = { module = "mysql:mysql-connector-java", version.ref = "driver-my
 # Testing
 tests-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
 
-# Exposed
-exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
-exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
-exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" }
-
-
 # Minecraft
 minecraft-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-spigot" }
 minecraft-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-spigot" }
@@ -88,8 +61,8 @@ minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecra
 minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" }
 
 # klibs
-klibs-kdi = { module = "ru.astrainteractive.klibs:kdi", version.strictly = "1.1.0" }
-klibs-mikro = { module = "ru.astrainteractive.klibs:mikro-core", version.strictly = "1.4.0" }
+klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
+klibs-kdi = { module = "ru.astrainteractive.klibs:kdi", version.ref = "klibs-kdi" }
 
 # AstraLibs
 minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" }
@@ -99,29 +72,33 @@ minecraft-astralibs-core-bukkit = { module = "ru.astrainteractive.astralibs:core
 minecraft-astralibs-command = { module = "ru.astrainteractive.astralibs:command", version.ref = "minecraft-astralibs" }
 minecraft-astralibs-command-bukkit = { module = "ru.astrainteractive.astralibs:command-bukkit", version.ref = "minecraft-astralibs" }
 
-# Fabric
-minecraft-fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "minecraft-fabric-kotlin" }
-minecraft-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "minecraft-fabric-loader" }
-minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "minecraft-fabric-api" }
-minecraft-mojang = { module = "com.mojang:minecraft", version.ref = "minecraft-version" }
-
 [bundles]
-exposed = ["exposed-java-time", "exposed-jdbc", "exposed-dao", "exposed-core"]
 minecraft-bukkit = ["minecraft-paper-api", "minecraft-spigot-api", "minecraft-spigot-core", "minecraft-vaultapi", "minecraft-papi"]
 testing-kotlin = ["kotlin-coroutines-core", "kotlin-coroutines-coreJvm", "driver-jdbc", "driver-mysql", "kotlin-serialization", "kotlin-serializationJson"]
 kotlin = ["kotlin-coroutines-core", "kotlin-coroutines-coreJvm", "kotlin-serialization", "kotlin-serializationJson", "kotlin-serializationKaml", "kotlin-gradle"]
 
 
 [plugins]
+
 # Kotlin
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
 kotlin-gradle = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" }
 
-# Minecraft
-minecraft-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
-minecraft-forge-net = { id = "net.minecraftforge.gradle", version.ref = "minecraft-forge-net" }
-
 # Gradle
 gradle-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "gradle-shadow" }
-gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
+gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
+
+# klibs - core
+klibs-gradle-detekt = { id = "ru.astrainteractive.gradleplugin.detekt", version.ref = "klibs-gradleplugin" }
+klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.compose", version.ref = "klibs-gradleplugin" }
+klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" }
+klibs-gradle-dokka-module = { id = "ru.astrainteractive.gradleplugin.dokka.module", version.ref = "klibs-gradleplugin" }
+klibs-gradle-java-core = { id = "ru.astrainteractive.gradleplugin.java.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" }
+klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }
+klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" }
+
+# klibs - minecraft
+klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" }
+klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" }

modules/api-market/build.gradle.kts

@@ -11,6 +11,7 @@ dependencies {
     implementation(libs.minecraft.astralibs.menu.bukkit)
     implementation(libs.minecraft.astralibs.orm)
     implementation(libs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
     implementation(libs.minecraft.bstats)
     // Test
     testImplementation(libs.bundles.testing.kotlin)

modules/core/build.gradle.kts

@@ -9,4 +9,5 @@ dependencies {
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
 }

modules/shared/build.gradle.kts

@@ -1,4 +1,3 @@
-// import ru.astrainteractive.gradleplugin.sourceset.JvmSourceSet.Companion.configureAstraSourceSet
 
 plugins {
     kotlin("jvm")
@@ -19,6 +18,7 @@ dependencies {
     implementation(libs.minecraft.astralibs.menu.bukkit)
     implementation(libs.minecraft.astralibs.orm)
     implementation(libs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
     implementation(libs.minecraft.bstats)
     // Test
     testImplementation(libs.bundles.testing.kotlin)

modules/shared/src/bukkitMain/kotlin/ru/astrainteractive/astramarket/data/bridge/BukkitPlayerInteractionBridge.kt

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astramarket.data.bridge
 
 import org.bukkit.Bukkit
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astralibs.string.StringDesc
 import java.util.UUID
 

modules/shared/src/bukkitMain/kotlin/ru/astrainteractive/astramarket/data/di/BukkitSharedDataModule.kt

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astramarket.data.di
 
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.data.bridge.AuctionsBridge
 import ru.astrainteractive.astramarket.data.bridge.BukkitAuctionsBridge
 import ru.astrainteractive.astramarket.data.bridge.BukkitPlayerInteractionBridge

spigot/build.gradle.kts

@@ -20,6 +20,7 @@ dependencies {
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.orm)
     implementation(libs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
     implementation(libs.minecraft.astralibs.menu.bukkit)
     implementation(libs.minecraft.astralibs.core.bukkit)
     implementation(libs.minecraft.astralibs.command)

spigot/src/main/kotlin/ru/astrainteractive/astramarket/command/auction/di/AuctionCommandDependencies.kt

@@ -3,7 +3,7 @@ package ru.astrainteractive.astramarket.command.auction.di
 import kotlinx.coroutines.CoroutineScope
 import org.bukkit.plugin.java.JavaPlugin
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.core.Translation
 import ru.astrainteractive.astramarket.di.RootModule
 import ru.astrainteractive.astramarket.domain.usecase.CreateAuctionUseCase

spigot/src/main/kotlin/ru/astrainteractive/astramarket/command/common/di/CommonCommandDependencies.kt

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astramarket.command.common.di
 
 import org.bukkit.plugin.java.JavaPlugin
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.core.Translation
 import ru.astrainteractive.astramarket.di.RootModule
 import ru.astrainteractive.klibs.kdi.getValue

spigot/src/main/kotlin/ru/astrainteractive/astramarket/di/BukkitCoreModule.kt

@@ -2,9 +2,9 @@ package ru.astrainteractive.astramarket.di
 
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.event.EventListener
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.astralibs.logging.Logger
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.AstraMarket
 import ru.astrainteractive.klibs.kdi.Lateinit
 import ru.astrainteractive.klibs.kdi.Reloadable

spigot/src/main/kotlin/ru/astrainteractive/astramarket/di/impl/BukkitCoreModuleImpl.kt

@@ -4,11 +4,11 @@ import org.bstats.bukkit.Metrics
 import ru.astrainteractive.astralibs.encoding.encoder.BukkitObjectEncoder
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.event.EventListener
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.astralibs.logging.JUtilFileLogger
 import ru.astrainteractive.astralibs.logging.Logger
 import ru.astrainteractive.astralibs.menu.event.DefaultInventoryClickEvent
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.AstraMarket
 import ru.astrainteractive.astramarket.di.BukkitCoreModule
 import ru.astrainteractive.klibs.kdi.Factory

spigot/src/main/kotlin/ru/astrainteractive/astramarket/presentation/base/di/AuctionGuiDependencies.kt

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astramarket.presentation.base.di
 
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
-import ru.astrainteractive.astralibs.serialization.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astramarket.core.PluginConfig
 import ru.astrainteractive.astramarket.core.Translation
 import ru.astrainteractive.astramarket.core.di.CoreModule