From c88c31d7c396247d0ce62a26b8b9dbf5a355aa7b Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Sun, 12 Oct 2025 14:27:32 +0300 Subject: [PATCH 1/3] update libs --- gradle.properties | 2 +- gradle/libs.versions.toml | 228 ++++++++++++-------- instances/bukkit/build.gradle.kts | 4 +- modules/command-bukkit/build.gradle.kts | 3 +- modules/core/api/build.gradle.kts | 6 +- modules/core/bukkit/build.gradle.kts | 5 +- modules/core/gui-bukkit/build.gradle.kts | 3 +- modules/data/dao/build.gradle.kts | 3 +- modules/data/exposed/build.gradle.kts | 3 +- modules/event-bukkit/build.gradle.kts | 3 +- modules/integration-papi/build.gradle.kts | 5 +- modules/rating-change/api/build.gradle.kts | 3 +- modules/rating-player/api/build.gradle.kts | 3 +- modules/rating-players/api/build.gradle.kts | 3 +- 14 files changed, 169 insertions(+), 105 deletions(-) diff --git a/gradle.properties b/gradle.properties index 128d089..898ecf4 100644 --- a/gradle.properties +++ b/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.24.0 +makeevrserg.project.version.string=1.25.0 makeevrserg.project.description=Rating plugin for EmpireProjekt makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com makeevrserg.project.url=https://empireprojekt.ru diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b971339..f4be74b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,111 +1,163 @@ [versions] -# Kotlin -kotlin-version = "2.2.0" # https://github.com/JetBrains/kotlin -kotlin-coroutines = "1.10.2" # https://github.com/Kotlin/kotlinx.coroutines -kotlin-json = "1.9.0" # https://github.com/Kotlin/kotlinx.serialization -kotlin-kaml = "0.83.0" # https://github.com/charleskorn/kaml +cache4k = "0.14.0" +discordsrv = "1.30.1" +driver-h2 = "2.4.240" +driver-jdbc = "3.50.3.0" +driver-mariadb = "3.5.6" +driver-mysql = "8.0.33" +exposed = "0.61.0" +forgegradle = "[6.0,6.2)" +gradle-buildconfig = "5.7.0" +gradle-ftp = "0.1.2" +gradle-shadow = "9.2.2" +gson = "2.13.2" +guava = "33.5.0-jre" +jda = "6.0.0-preview" +jda-webhook = "0.8.4" +klibs-gradleplugin = "1.11.1" +klibs-kdi = "1.4.8" +klibs-kstorage = "4.2.3" +klibs-mikro = "1.14.2" +kotlin-benchmark = "0.4.14" +kotlin-coroutines = "1.10.2" +kotlin-datetime = "0.7.1-0.6.x-compat" +kotlin-json = "1.9.0" +kotlin-serialization-kaml = "0.98.0" +kotlin-serialization = "1.9.0" +kotlin-version = "2.2.0" +ktor = "3.3.0" +kyori = "4.24.0" +kyori-adventure = "4.24.0" +mcprotocollib = "1.21.7-SNAPSHOT" +minecraft-astralibs = "3.26.1" +minecraft-bstats = "3.1.0" +minecraft-bungee = "1.21-R0.5-SNAPSHOT" +minecraft-essentialsx = "2.21.2" +minecraft-fabric-api = "0.134.1+" +minecraft-fabric-kotlin = "1.13.1+" +minecraft-fabric-loader = "0.17.2" +minecraft-fabric-loom = "1.11.8" +minecraft-luckperms = "5.5" +minecraft-mockbukkit = "4.33.2" +minecraft-mojang-version = "1.20.1" +minecraft-packetevents = "2.9.5" +minecraft-papi = "2.11.6" +minecraft-protocollib = "5.3.0" +minecraft-spigot = "1.21.9-R0.1-SNAPSHOT" +minecraft-towny = "0.101.2.1" +minecraft-vault = "1.7.1" +minecraft-velocity = "4.0.0-SNAPSHOT" +shadow = "8.1.8" +telegrambots = "9.1.0" +tests-junit-bom = "6.0.0" +tests-junit-jupiter-api = "6.0.0" +tests-mockito = "5.20.0" +tests-org-testing = "7.11.0" +turbine = "1.2.1" -# Drivers -driver-h2 = "2.3.232" # https://github.com/h2database/h2database -driver-jdbc = "3.46.1.0" # https://github.com/xerial/sqlite-jdbc -driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j -driver-mariadb = "3.3.1" # https://github.com/mariadb-corporation/mariadb-connector-j - -# klibs -klibs-gradleplugin = "1.10.0" # https://github.com/makeevrserg/gradle-plugin -klibs-mikro = "1.14.1" # https://github.com/makeevrserg/klibs.mikro -klibs-kstorage = "4.2.2" # https://github.com/makeevrserg/klibs.kstorage - -# Minecraft -minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity -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.26.0" # https://github.com/Astra-Interactive/AstraLibs -minecraft-bstats = "3.1.0" # https://github.com/Bastian/bStats -minecraft-mockbukkit = "4.33.2" #https://github.com/MockBukkit/MockBukkit - -# BuildConfig -gradle-buildconfig = "5.6.7" # https://github.com/gmazzo/gradle-buildconfig-plugin -gradle-shadow = "9.1.0" # https://github.com/johnrengelman/shadow - -# Exposed -exposed = "0.61.0" # https://github.com/JetBrains/Exposed -guava = "33.4.8-jre" [libraries] -# Kotlin -kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" } -kotlin-coroutines-coreJvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "kotlin-coroutines" } -kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin-version" } -kotlin-serializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-json" } -kotlin-serializationKaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kotlin-kaml" } - -# Drivers +minecraft-astralibs-core = { module = "ru.astrainteractive.astralibs:core", version.ref = "minecraft-astralibs" } +cache4k = { module = "io.github.reactivecircus.cache4k:cache4k-jvm", version.ref = "cache4k" } +discord-webhook = { module = "club.minnced:discord-webhooks", version.ref = "jda-webhook" } driver-h2 = { module = "com.h2database:h2", version.ref = "driver-h2" } driver-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "driver-jdbc" } -driver-mysql = { module = "mysql:mysql-connector-java", version.ref = "driver-mysql" } driver-mariadb = { module = "org.mariadb.jdbc:mariadb-java-client", version.ref = "driver-mariadb" } - -# Testing -tests-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } - -# Exposed +driver-mysql = { module = "mysql:mysql-connector-java", version.ref = "driver-mysql" } +exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" } +exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "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" } -minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecraft-spigot" } -minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" } -minecraft-protocollib = { module = "com.comphenix.protocol:ProtocolLib", version.ref = "minecraft-protocollib" } -minecraft-papi = { module = "me.clip:placeholderapi", version.ref = "minecraft-papi" } -minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" } -minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" } -minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" } - -# klibs +gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "gradle-shadow" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +jda = { module = "net.dv8tion:JDA", version.ref = "jda" } +klibs-kdi = { module = "ru.astrainteractive.klibs:kdi-jvm", version.ref = "klibs-kdi" } +klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" } klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" } klibs-mikro-extensions = { module = "ru.astrainteractive.klibs:mikro-extensions", version.ref = "klibs-mikro" } -klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" } - -# AstraLibs -minecraft-astralibs-core = { module = "ru.astrainteractive.astralibs:core", version.ref = "minecraft-astralibs" } -minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" } -minecraft-astralibs-core-bukkit = { module = "ru.astrainteractive.astralibs:core-bukkit", version.ref = "minecraft-astralibs" } +kotlin-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlin-benchmark" } +kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" } +kotlin-coroutines-coreJvm = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version.ref = "kotlin-coroutines" } +kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlin-coroutines" } +kotlin-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime-jvm", version.ref = "kotlin-datetime" } +kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" } +kotlin-serialization-kaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kotlin-serialization-kaml" } +kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin-version" } +kotlin-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" } +kotlin-serialization-protobuf = { module = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf", version.ref = "kotlin-json" } +kotlin-tooling-core = { module = "org.jetbrains.kotlin:kotlin-tooling-core", version.ref = "kotlin-version" } +ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } +ktor-client-contentNegitiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } +ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktor" } +ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } +ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } +kyori-adventure-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "kyori-adventure" } +kyori-api = { module = "net.kyori:adventure-api", version.ref = "kyori" } +kyori-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "kyori" } +kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "kyori" } +kyori-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "kyori" } +mcprotocollib = { module = "org.geysermc.mcprotocollib:protocol", version.ref = "mcprotocollib" } 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" } - -guava = { module = "com.google.guava:guava", version.ref = "guava" } -[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"] - +minecraft-astralibs-core-bukkit = { module = "ru.astrainteractive.astralibs:core-bukkit", version.ref = "minecraft-astralibs" } +minecraft-astralibs-core-forge = { module = "ru.astrainteractive.astralibs:core-forge", version.ref = "minecraft-astralibs" } +minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed", version.ref = "minecraft-astralibs" } +minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" } +minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" } +minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" } +minecraft-bungee = { module = "net.md-5:bungeecord-api", version.ref = "minecraft-bungee" } +minecraft-discordsrv = { module = "com.discordsrv:discordsrv", version.ref = "discordsrv" } +minecraft-essentialsx = { module = "net.essentialsx:EssentialsX", version.ref = "minecraft-essentialsx" } +minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "minecraft-fabric-api" } +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-mojang = { module = "com.mojang:minecraft", version.ref = "minecraft-mojang-version" } +minecraft-luckperms = { module = "net.luckperms:api", version.ref = "minecraft-luckperms" } +minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" } +minecraft-packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "minecraft-packetevents" } +minecraft-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-spigot" } +minecraft-papi = { module = "me.clip:placeholderapi", version.ref = "minecraft-papi" } +minecraft-protocollib = { module = "com.comphenix.protocol:ProtocolLib", version.ref = "minecraft-protocollib" } +minecraft-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "minecraft-spigot" } +minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecraft-spigot" } +minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref = "minecraft-towny" } +minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" } +minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" } +telegrambots-client = { module = "org.telegram:telegrambots-client", version.ref = "telegrambots" } +telegrambots-extensions = { module = "org.telegram:telegrambots-extensions", version.ref = "telegrambots" } +telegrambots-longpolling = { module = "org.telegram:telegrambots-longpolling", version.ref = "telegrambots" } +tests-junit-bom = { module = "org.junit:junit-bom", version.ref = "tests-junit-bom" } +tests-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" } +tests-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "tests-junit-jupiter-api" } +tests-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5" } +tests-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } +tests-mockito = { module = "org.mockito:mockito-core", version.ref = "tests-mockito" } +tests-org-testing = { module = "org.testng:testng", version.ref = "tests-org-testing" } +turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" } [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" } - -# Gradle +fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" } +forgegradle = { id = "net.minecraftforge.gradle", version.ref = "forgegradle" } gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" } - -# klibs - core +gradle-ftp = { id = "ru.astrainteractive.ftpplugin.gradleftp", version.ref = "gradle-ftp" } +gradle-shadow = { id = "com.gradleup.shadow", version.ref = "gradle-shadow" } 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-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", 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-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" } 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-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" } klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource-processor", version.ref = "klibs-gradleplugin" } klibs-minecraft-shadow = { id = "ru.astrainteractive.gradleplugin.minecraft.shadow", version.ref = "klibs-gradleplugin" } - -gradle-shadow = { id = "com.gradleup.shadow", version.ref = "gradle-shadow" } \ No newline at end of file +kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin-version" } +kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" } +kotlin-gradle = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" } +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" } +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" } +shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" } \ No newline at end of file diff --git a/instances/bukkit/build.gradle.kts b/instances/bukkit/build.gradle.kts index 6247d60..7da0dd6 100644 --- a/instances/bukkit/build.gradle.kts +++ b/instances/bukkit/build.gradle.kts @@ -12,7 +12,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.serialization.json) + // AstraLibs implementation(libs.minecraft.astralibs.core) implementation(libs.minecraft.astralibs.menu.bukkit) @@ -25,7 +26,6 @@ dependencies { // Exposed implementation(libs.exposed.core) // Test - testImplementation(libs.bundles.testing.kotlin) testImplementation(libs.tests.kotlin.test) // Spigot dependencies compileOnly(libs.minecraft.paper.api) diff --git a/modules/command-bukkit/build.gradle.kts b/modules/command-bukkit/build.gradle.kts index 626b38e..62c2ec9 100644 --- a/modules/command-bukkit/build.gradle.kts +++ b/modules/command-bukkit/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + // Spigot dependencies compileOnly(libs.minecraft.paper.api) // AstraLibs diff --git a/modules/core/api/build.gradle.kts b/modules/core/api/build.gradle.kts index d8b1cae..685ef5c 100644 --- a/modules/core/api/build.gradle.kts +++ b/modules/core/api/build.gradle.kts @@ -6,12 +6,14 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlin.serialization.json) + implementation(libs.kotlin.serialization.kaml) + implementation(libs.minecraft.astralibs.core) implementation(libs.klibs.mikro.core) implementation(libs.klibs.kstorage) implementation("io.github.reactivecircus.cache4k:cache4k-jvm:0.14.0") // Test - testImplementation(libs.bundles.testing.kotlin) testImplementation(libs.tests.kotlin.test) } diff --git a/modules/core/bukkit/build.gradle.kts b/modules/core/bukkit/build.gradle.kts index dd9a3a2..aa084da 100644 --- a/modules/core/bukkit/build.gradle.kts +++ b/modules/core/bukkit/build.gradle.kts @@ -6,7 +6,10 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlin.serialization.json) + implementation(libs.kotlin.serialization.kaml) + implementation(libs.minecraft.astralibs.core) implementation(libs.minecraft.astralibs.menu.bukkit) implementation(libs.minecraft.astralibs.core.bukkit) diff --git a/modules/core/gui-bukkit/build.gradle.kts b/modules/core/gui-bukkit/build.gradle.kts index 632d8d9..fed86e9 100644 --- a/modules/core/gui-bukkit/build.gradle.kts +++ b/modules/core/gui-bukkit/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + // Spigot dependencies compileOnly(libs.minecraft.paper.api) implementation(libs.klibs.kstorage) diff --git a/modules/data/dao/build.gradle.kts b/modules/data/dao/build.gradle.kts index dc14ea0..3e610ba 100644 --- a/modules/data/dao/build.gradle.kts +++ b/modules/data/dao/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + // klibs implementation(libs.klibs.mikro.core) implementation(libs.klibs.mikro.extensions) @@ -16,7 +16,6 @@ dependencies { implementation(libs.exposed.core) implementation(libs.exposed.dao) // Test - testImplementation(libs.bundles.testing.kotlin) testImplementation(libs.tests.kotlin.test) // Local implementation(projects.modules.data.exposed) diff --git a/modules/data/exposed/build.gradle.kts b/modules/data/exposed/build.gradle.kts index b379daa..fef57ee 100644 --- a/modules/data/exposed/build.gradle.kts +++ b/modules/data/exposed/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.serialization.json) + // klibs implementation(libs.klibs.mikro.core) implementation(libs.klibs.mikro.extensions) diff --git a/modules/event-bukkit/build.gradle.kts b/modules/event-bukkit/build.gradle.kts index ed02ab4..77079ed 100644 --- a/modules/event-bukkit/build.gradle.kts +++ b/modules/event-bukkit/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + // Spigot dependencies compileOnly(libs.minecraft.paper.api) implementation(libs.klibs.kstorage) diff --git a/modules/integration-papi/build.gradle.kts b/modules/integration-papi/build.gradle.kts index 94cd7c9..82d6e06 100644 --- a/modules/integration-papi/build.gradle.kts +++ b/modules/integration-papi/build.gradle.kts @@ -6,7 +6,9 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + implementation(libs.kotlin.serialization.json) + // AstraLibs implementation(libs.minecraft.astralibs.core) implementation(libs.minecraft.astralibs.core.bukkit) @@ -14,7 +16,6 @@ dependencies { implementation(libs.klibs.mikro.core) implementation(libs.klibs.kstorage) // Test - testImplementation(libs.bundles.testing.kotlin) testImplementation(libs.tests.kotlin.test) // Spigot dependencies compileOnly(libs.minecraft.paper.api) diff --git a/modules/rating-change/api/build.gradle.kts b/modules/rating-change/api/build.gradle.kts index 421237d..0016299 100644 --- a/modules/rating-change/api/build.gradle.kts +++ b/modules/rating-change/api/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + // AstraLibs implementation(libs.minecraft.astralibs.core) // klibs diff --git a/modules/rating-player/api/build.gradle.kts b/modules/rating-player/api/build.gradle.kts index 421237d..0016299 100644 --- a/modules/rating-player/api/build.gradle.kts +++ b/modules/rating-player/api/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + // AstraLibs implementation(libs.minecraft.astralibs.core) // klibs diff --git a/modules/rating-players/api/build.gradle.kts b/modules/rating-players/api/build.gradle.kts index 421237d..0016299 100644 --- a/modules/rating-players/api/build.gradle.kts +++ b/modules/rating-players/api/build.gradle.kts @@ -6,7 +6,8 @@ plugins { dependencies { // Kotlin - implementation(libs.bundles.kotlin) + implementation(libs.kotlin.coroutines.core) + // AstraLibs implementation(libs.minecraft.astralibs.core) // klibs From 2f5b9581323dca3443c2786562a38421f13106a2 Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Sun, 12 Oct 2025 14:45:25 +0300 Subject: [PATCH 2/3] update libs --- modules/data/dao/build.gradle.kts | 3 ++- .../astrarating/data/dao/RatingDaoTest.kt | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/data/dao/build.gradle.kts b/modules/data/dao/build.gradle.kts index 3e610ba..f6bcc91 100644 --- a/modules/data/dao/build.gradle.kts +++ b/modules/data/dao/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { // Kotlin - + implementation(libs.kotlin.serialization.json) // klibs implementation(libs.klibs.mikro.core) implementation(libs.klibs.mikro.extensions) @@ -17,6 +17,7 @@ dependencies { implementation(libs.exposed.dao) // Test testImplementation(libs.tests.kotlin.test) + testImplementation(libs.driver.jdbc) // Local implementation(projects.modules.data.exposed) implementation(projects.modules.core.api) diff --git a/modules/data/dao/src/test/java/ru/astrainteractive/astrarating/data/dao/RatingDaoTest.kt b/modules/data/dao/src/test/java/ru/astrainteractive/astrarating/data/dao/RatingDaoTest.kt index efdcf1e..c64c181 100644 --- a/modules/data/dao/src/test/java/ru/astrainteractive/astrarating/data/dao/RatingDaoTest.kt +++ b/modules/data/dao/src/test/java/ru/astrainteractive/astrarating/data/dao/RatingDaoTest.kt @@ -11,7 +11,7 @@ import ru.astrainteractive.astrarating.data.exposed.db.rating.model.DbRatingConf import ru.astrainteractive.astrarating.data.exposed.dto.RatingType import ru.astrainteractive.astrarating.data.exposed.model.UserModel import ru.astrainteractive.klibs.mikro.exposed.model.DatabaseConfiguration -import java.io.File +import java.nio.file.Files import java.util.UUID import kotlin.test.AfterTest import kotlin.test.BeforeTest @@ -38,23 +38,26 @@ class RatingDaoTest { minecraftName = UUID.randomUUID().toString(), ) + private fun getTempFolder() = Files.createTempDirectory("dir").toFile() + @AfterTest fun destroy(): Unit = runBlocking { TransactionManager.Companion.closeAndUnregister(requireModule.databaseFlow.first()) - File("./test").deleteRecursively() } @BeforeTest fun setup(): Unit = runBlocking { + val folder = getTempFolder() module = DBRatingModule( stringFormat = YamlStringFormat(), defaultConfig = { - DbRatingConfiguration(databaseConfiguration = DatabaseConfiguration.SQLite("./test")) + val configuration = folder + .resolve("dbfile") + .absolutePath + .let(DatabaseConfiguration::SQLite) + DbRatingConfiguration(databaseConfiguration = configuration) }, - dataFolder = File("./test").also { - it.mkdirs() - it.deleteOnExit() - } + dataFolder = folder ) } From 3c1db6b0c7123da11cd7a163de47086153617bcb Mon Sep 17 00:00:00 2001 From: Roman Makeev Date: Thu, 23 Oct 2025 12:07:34 +0300 Subject: [PATCH 3/3] fix shadow --- docker-compose.yml | 14 ++++++-- instances/bukkit/build.gradle.kts | 58 +++++++++++++++++-------------- 2 files changed, 43 insertions(+), 29 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9232ca9..e924ef0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,11 +9,19 @@ services: ports: - "25565:25565" environment: - MEMORY: 4G EULA: true - ONLINE_MODE: FALSE + ONLINE_MODE: false + # Forge -------------------- + # TYPE: FORGE + # VERSION: "1.20.1" + # FORGE_VERSION: "47.2.20" # Paper -------------------- TYPE: PAPER - VERSION: 1.21.4 + VERSION: 1.21.8 + # Custom ------------------- + # CUSTOM_SERVER: https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/121/downloads/paper-1.21.1-121.jar volumes: + # - ./build/forge:/data # Forge - ./build/bukkit:/data # Bukkit/Paper/Spigot +# - ./build/velocity:/data # Velocity +# - ./build/fabric:/data # Fabric \ No newline at end of file diff --git a/instances/bukkit/build.gradle.kts b/instances/bukkit/build.gradle.kts index 7da0dd6..3226c36 100644 --- a/instances/bukkit/build.gradle.kts +++ b/instances/bukkit/build.gradle.kts @@ -62,44 +62,50 @@ minecraftProcessResource { val shadowJar = tasks.named("shadowJar") shadowJar.configure { - mergeServiceFiles() - dependsOn(tasks.named("processResources")) + + val projectInfo = requireProjectInfo isReproducibleFileOrder = true - archiveClassifier = null as String? - archiveVersion.set(requireProjectInfo.versionString) - archiveBaseName.set("${requireProjectInfo.name}-bukkit") - destinationDirectory = rootProject - .layout.buildDirectory.asFile.get() + mergeServiceFiles() + dependsOn(configurations) + archiveClassifier.set(null as String?) + + minimize { + exclude(dependency(libs.exposed.jdbc.get())) + exclude(dependency(libs.exposed.dao.get())) + } + archiveVersion.set(projectInfo.versionString) + archiveBaseName.set("${projectInfo.name}-bukkit") + destinationDirectory = rootDir.resolve("build") .resolve("bukkit") .resolve("plugins") .takeIf(File::exists) - ?: rootDir.resolve("jars").also(File::mkdirs) - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - configurations = listOf(project.configurations.runtimeClasspath.get()) + ?: File(rootDir, "jars").also(File::mkdirs) + + relocate("org.bstats", projectInfo.group) listOf( "co.touchlab", - "com.charleskorn", "com.mysql", "google.protobuf", - "io.github", - "it.krzeminski", - "net.thauvin", + "io.github.reactivecircus", + "ch.qos.logback", + "com.charleskorn.kaml", + "com.ibm.icu", + "it.krzeminski.snakeyaml", + "net.thauvin.erik", "okio", - "org.jetbrains", + "org.apache", "org.intellij", - "org.bstats", "org.slf4j", + "org.jetbrains.annotations", "ru.astrainteractive.klibs", - "ru.astrainteractive.astralibs", - "ch.qos.logback", - "com.ibm.icu", - "org.apache", + "ru.astrainteractive.astralibs" + ).forEach { pattern -> relocate(pattern, "${projectInfo.group}.$pattern") } + listOf( + "org.jetbrains.exposed", + "kotlinx", ).forEach { pattern -> - relocate(pattern, "${requireProjectInfo.group}.libs.$pattern") - } - minimize { - exclude(dependency(libs.exposed.jdbc.get())) - exclude(dependency(libs.exposed.dao.get())) - exclude(dependency(libs.exposed.core.get())) + relocate(pattern, "${projectInfo.group}.$pattern") { + exclude("kotlin/kotlin.kotlin_builtins") + } } }