diff --git a/build.gradle.kts b/build.gradle.kts index 11ec939..e862baf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { 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.java.version) apply false alias(libs.plugins.klibs.gradle.publication) apply false alias(libs.plugins.klibs.gradle.rootinfo) apply false alias(libs.plugins.klibs.minecraft.resource.processor) apply false diff --git a/gradle.properties b/gradle.properties index 19df81f..95de50d 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.26.0 +makeevrserg.project.version.string=1.26.1 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 4244158..328f1a8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,62 +1,61 @@ [versions] cache4k = "0.14.0" -discordsrv = "1.30.2" +discordsrv = "1.30.3" driver-h2 = "2.4.240" -driver-jdbc = "3.50.3.0" +driver-jdbc = "3.51.1.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-buildconfig = "6.0.6" gradle-ftp = "0.1.2" gradle-shadow = "9.2.2" gson = "2.13.2" guava = "33.5.0-jre" -jda = "6.1.0" +jda = "6.1.3" jda-webhook = "0.8.4" -klibs-gradleplugin = "1.11.1" +klibs-gradleplugin = "1.13.2" klibs-kdi = "1.4.8" klibs-kstorage = "4.4.1" -klibs-mikro = "1.16.0" -kotlin-benchmark = "0.4.14" +klibs-mikro = "1.16.1" +kotlin-benchmark = "0.4.15" kotlin-coroutines = "1.10.2" kotlin-datetime = "0.7.1-0.6.x-compat" kotlin-json = "1.9.0" -kotlin-serialization-kaml = "0.102.0" kotlin-serialization = "1.9.0" +kotlin-serialization-kaml = "0.104.0" kotlin-version = "2.2.0" -ktor = "3.3.1" -kyori = "4.25.0" -kyori-adventure = "4.25.0" -mcprotocollib = "1.21.7-SNAPSHOT" -minecraft-astralibs = "3.28.4" +ktor = "3.3.3" +minecraft-astralibs = "3.31.2" minecraft-bstats = "3.1.0" minecraft-bungee = "1.21-R0.5-SNAPSHOT" minecraft-essentialsx = "2.21.2" -minecraft-fabric-api = "0.136.3+" +minecraft-fabric-api = "0.139.5+" minecraft-fabric-kotlin = "1.13.7+" -minecraft-fabric-loader = "0.17.3" -minecraft-fabric-loom = "1.12.5" +minecraft-fabric-loader = "0.18.2" +minecraft-fabric-loom = "1.14.6" +minecraft-kyori = "4.25.0" minecraft-luckperms = "5.5" +minecraft-mcprotocollib = "1.21.7-SNAPSHOT" minecraft-mockbukkit = "4.33.2" -minecraft-mojang-version = "1.20.1" -minecraft-packetevents = "2.10.0" -minecraft-papi = "2.11.6" +minecraft-mojang-version = "1.21.1" +minecraft-neoforgeversion = "21.1.129" +minecraft-packetevents = "2.11.0" +minecraft-papi = "2.11.7" minecraft-protocollib = "5.3.0" minecraft-spigot = "1.21.9-R0.1-SNAPSHOT" -minecraft-towny = "0.101.2.1" +minecraft-towny = "0.102.0.0" minecraft-vault = "1.7.1" minecraft-velocity = "4.0.0-SNAPSHOT" -shadow = "8.1.8" +minecraft-neoforgegradle = "7.1.11" telegrambots = "9.2.0" tests-junit-bom = "6.0.1" tests-junit-jupiter-api = "6.0.1" -tests-mockito = "5.20.0" +tests-mockito = "5.21.0" tests-org-testing = "7.11.0" -turbine = "1.2.1" +tests-turbine = "1.2.1" [libraries] -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" } @@ -81,9 +80,9 @@ kotlin-coroutines-coreJvm = { module = "org.jetbrains.kotlinx:kotlinx-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-kaml = { module = "com.charleskorn.kaml:kaml", version.ref = "kotlin-serialization-kaml" } 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" } @@ -92,16 +91,12 @@ 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" } +minecraft-astralibs-core = { module = "ru.astrainteractive.astralibs:core", version.ref = "minecraft-astralibs" } 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-core-neoforge = { module = "ru.astrainteractive.astralibs:core-neoforge", 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" } @@ -113,8 +108,15 @@ minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version. 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-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" } +minecraft-kyori-api = { module = "net.kyori:adventure-api", version.ref = "minecraft-kyori" } +minecraft-kyori-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "minecraft-kyori" } +minecraft-kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "minecraft-kyori" } +minecraft-kyori-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "minecraft-kyori" } minecraft-luckperms = { module = "net.luckperms:api", version.ref = "minecraft-luckperms" } +minecraft-mcprotocollib = { module = "org.geysermc.mcprotocollib:protocol", version.ref = "minecraft-mcprotocollib" } minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" } +minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" } 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" } @@ -134,19 +136,21 @@ 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" } +tests-turbine = { module = "app.cash.turbine:turbine", version.ref = "tests-turbine" } [plugins] -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" } +gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" } +gradle-forgegradle = { id = "net.minecraftforge.gradle", version.ref = "forgegradle" } gradle-ftp = { id = "ru.astrainteractive.ftpplugin.gradleftp", version.ref = "gradle-ftp" } +gradle-neoforgegradle = { id = "net.neoforged.gradle.userdev", version.ref = "minecraft-neoforgegradle" } 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-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-java-version = { id = "ru.astrainteractive.gradleplugin.java.version", 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" } @@ -159,5 +163,4 @@ kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotl 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 +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" } \ No newline at end of file diff --git a/instances/bukkit/build.gradle.kts b/instances/bukkit/build.gradle.kts index 3226c36..dcdabcd 100644 --- a/instances/bukkit/build.gradle.kts +++ b/instances/bukkit/build.gradle.kts @@ -5,7 +5,7 @@ import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) alias(libs.plugins.klibs.minecraft.resource.processor) alias(libs.plugins.gradle.shadow) } diff --git a/instances/bukkit/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt b/instances/bukkit/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt index de39c0d..cb562a4 100644 --- a/instances/bukkit/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt +++ b/instances/bukkit/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt @@ -1,6 +1,6 @@ package ru.astrainteractive.astrarating.di -import ru.astrainteractive.astralibs.async.DefaultBukkitDispatchers +import ru.astrainteractive.astralibs.coroutines.DefaultBukkitDispatchers import ru.astrainteractive.astralibs.lifecycle.Lifecycle import ru.astrainteractive.astralibs.lifecycle.LifecyclePlugin import ru.astrainteractive.astrarating.command.di.CommandsModule diff --git a/modules/command-bukkit/build.gradle.kts b/modules/command-bukkit/build.gradle.kts index 62c2ec9..0a9e9c3 100644 --- a/modules/command-bukkit/build.gradle.kts +++ b/modules/command-bukkit/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandExecutor.kt b/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandExecutor.kt index 78c5044..4df9e3b 100644 --- a/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandExecutor.kt +++ b/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandExecutor.kt @@ -6,7 +6,6 @@ import org.bukkit.Bukkit import org.bukkit.OfflinePlayer import org.bukkit.command.ConsoleCommandSender import org.bukkit.entity.Player -import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer import ru.astrainteractive.astralibs.kyori.unwrap import ru.astrainteractive.astralibs.permission.BukkitPermissibleExt.toPermissible @@ -26,8 +25,7 @@ internal class RatingCommandExecutor( translationKrate: CachedKrate, kyoriKrate: CachedKrate, private val router: GuiRouter -) : CommandExecutor, - KyoriComponentSerializer by kyoriKrate.unwrap() { +) : KyoriComponentSerializer by kyoriKrate.unwrap() { private val translation by translationKrate private fun OfflinePlayer.toPlayerModel(): PlayerModel? { @@ -117,7 +115,7 @@ internal class RatingCommandExecutor( } } - override fun execute(input: RatingCommand.Result) { + fun execute(input: RatingCommand.Result) { when (input) { is RatingCommand.Result.ChangeRating -> { changeRating(input) diff --git a/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandNode.kt b/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandNode.kt index 7fa19a0..5cb25a3 100644 --- a/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandNode.kt +++ b/modules/command-bukkit/src/main/kotlin/ru/astrainteractive/astrarating/command/rating/RatingCommandNode.kt @@ -6,7 +6,7 @@ import com.mojang.brigadier.tree.LiteralCommandNode import io.papermc.paper.command.brigadier.CommandSourceStack import org.bukkit.Bukkit import org.bukkit.entity.Player -import ru.astrainteractive.astralibs.command.api.argumenttype.OfflinePlayerArgument +import ru.astrainteractive.astralibs.command.api.argumenttype.OfflinePlayerArgumentConverter import ru.astrainteractive.astralibs.command.api.argumenttype.StringArgumentConverter import ru.astrainteractive.astralibs.command.api.util.argument import ru.astrainteractive.astralibs.command.api.util.command @@ -50,7 +50,7 @@ internal fun createRatingCommandNode( val player = ctx.requirePlayer() val targetPlayer = runCatching { - ctx.requireArgument(playerArg, OfflinePlayerArgument) + ctx.requireArgument(playerArg, OfflinePlayerArgumentConverter) }.getOrNull() val targetPlayerUuid = targetPlayer?.uniqueId val targetPlayerName = targetPlayer?.name @@ -84,7 +84,7 @@ internal fun createRatingCommandNode( hints { listOf("like", "dislike", "+", "-") } argument("player", StringArgumentType.string()) player@{ playerArg -> hints { Bukkit.getOnlinePlayers().map(Player::getName) } - argument("message", StringArgumentType.greedyString()) message@{ messageArg -> + argument("message", StringArgumentType.string()) message@{ messageArg -> hints { listOf("...") } runs { ctx -> val executor = ctx.source.sender as? Player @@ -101,7 +101,7 @@ internal fun createRatingCommandNode( } } val ratedPlayer = runCatching { - ctx.requireArgument(playerArg, OfflinePlayerArgument) + ctx.requireArgument(playerArg, OfflinePlayerArgumentConverter) }.getOrNull() if (ratedPlayer == null) { commandExceptionHandler.handle(ctx, UnknownPlayerCommandException()) diff --git a/modules/core/api/build.gradle.kts b/modules/core/api/build.gradle.kts index 685ef5c..fc9fb52 100644 --- a/modules/core/api/build.gradle.kts +++ b/modules/core/api/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/core/api/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt b/modules/core/api/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt index b57debc..22ca4bc 100644 --- a/modules/core/api/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt +++ b/modules/core/api/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt @@ -4,7 +4,7 @@ import com.charleskorn.kaml.PolymorphismStyle import com.charleskorn.kaml.Yaml import kotlinx.coroutines.cancel import kotlinx.serialization.StringFormat -import ru.astrainteractive.astralibs.async.withTimings +import ru.astrainteractive.astralibs.coroutines.withTimings import ru.astrainteractive.astralibs.lifecycle.Lifecycle import ru.astrainteractive.astralibs.util.YamlStringFormat import ru.astrainteractive.astralibs.util.parseOrWriteIntoDefault diff --git a/modules/core/bukkit/build.gradle.kts b/modules/core/bukkit/build.gradle.kts index aa084da..f15346e 100644 --- a/modules/core/bukkit/build.gradle.kts +++ b/modules/core/bukkit/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/core/gui-bukkit/build.gradle.kts b/modules/core/gui-bukkit/build.gradle.kts index fed86e9..5af8581 100644 --- a/modules/core/gui-bukkit/build.gradle.kts +++ b/modules/core/gui-bukkit/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/data/dao/build.gradle.kts b/modules/data/dao/build.gradle.kts index f6bcc91..3ac2638 100644 --- a/modules/data/dao/build.gradle.kts +++ b/modules/data/dao/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/data/exposed/build.gradle.kts b/modules/data/exposed/build.gradle.kts index fef57ee..eefcf7e 100644 --- a/modules/data/exposed/build.gradle.kts +++ b/modules/data/exposed/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/data/exposed/src/main/kotlin/ru/astrainteractive/astrarating/data/exposed/db/rating/di/DBRatingModule.kt b/modules/data/exposed/src/main/kotlin/ru/astrainteractive/astrarating/data/exposed/db/rating/di/DBRatingModule.kt index bfc0b55..947c7f9 100644 --- a/modules/data/exposed/src/main/kotlin/ru/astrainteractive/astrarating/data/exposed/db/rating/di/DBRatingModule.kt +++ b/modules/data/exposed/src/main/kotlin/ru/astrainteractive/astrarating/data/exposed/db/rating/di/DBRatingModule.kt @@ -13,7 +13,7 @@ import org.jetbrains.exposed.sql.Slf4jSqlDebugLogger import org.jetbrains.exposed.sql.addLogger import org.jetbrains.exposed.sql.transactions.TransactionManager import org.jetbrains.exposed.sql.transactions.transaction -import ru.astrainteractive.astralibs.async.withTimings +import ru.astrainteractive.astralibs.coroutines.withTimings import ru.astrainteractive.astralibs.lifecycle.Lifecycle import ru.astrainteractive.astralibs.util.parseOrWriteIntoDefault import ru.astrainteractive.astrarating.data.exposed.db.rating.entity.UserRatingTable diff --git a/modules/event-bukkit/build.gradle.kts b/modules/event-bukkit/build.gradle.kts index 77079ed..c8cc0ba 100644 --- a/modules/event-bukkit/build.gradle.kts +++ b/modules/event-bukkit/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/integration-papi/build.gradle.kts b/modules/integration-papi/build.gradle.kts index 82d6e06..b72ed2c 100644 --- a/modules/integration-papi/build.gradle.kts +++ b/modules/integration-papi/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/rating-change/api/build.gradle.kts b/modules/rating-change/api/build.gradle.kts index 0016299..ad55c87 100644 --- a/modules/rating-change/api/build.gradle.kts +++ b/modules/rating-change/api/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/rating-player/api/build.gradle.kts b/modules/rating-player/api/build.gradle.kts index 0016299..ad55c87 100644 --- a/modules/rating-player/api/build.gradle.kts +++ b/modules/rating-player/api/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/rating-player/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/ratings/player/presentation/DefaultRatingPlayerComponent.kt b/modules/rating-player/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/ratings/player/presentation/DefaultRatingPlayerComponent.kt index c301be9..ddcde10 100644 --- a/modules/rating-player/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/ratings/player/presentation/DefaultRatingPlayerComponent.kt +++ b/modules/rating-player/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/ratings/player/presentation/DefaultRatingPlayerComponent.kt @@ -3,7 +3,7 @@ package ru.astrainteractive.astrarating.feature.ratings.player.presentation import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import ru.astrainteractive.astralibs.async.withTimings +import ru.astrainteractive.astralibs.coroutines.withTimings import ru.astrainteractive.astrarating.data.dao.RatingDao import ru.astrainteractive.astrarating.data.exposed.dto.UserRatingDTO import ru.astrainteractive.astrarating.data.exposed.model.UserRatingsSort diff --git a/modules/rating-players/api/build.gradle.kts b/modules/rating-players/api/build.gradle.kts index 0016299..ad55c87 100644 --- a/modules/rating-players/api/build.gradle.kts +++ b/modules/rating-players/api/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") kotlin("plugin.serialization") - alias(libs.plugins.klibs.gradle.java.core) + alias(libs.plugins.klibs.gradle.java.version) } dependencies { diff --git a/modules/rating-players/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/rating/players/presentation/DefaultRatingPlayersComponent.kt b/modules/rating-players/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/rating/players/presentation/DefaultRatingPlayersComponent.kt index d9e780e..610e954 100644 --- a/modules/rating-players/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/rating/players/presentation/DefaultRatingPlayersComponent.kt +++ b/modules/rating-players/api/src/main/kotlin/ru/astrainteractive/astrarating/feature/rating/players/presentation/DefaultRatingPlayersComponent.kt @@ -3,7 +3,7 @@ package ru.astrainteractive.astrarating.feature.rating.players.presentation import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import ru.astrainteractive.astralibs.async.withTimings +import ru.astrainteractive.astralibs.coroutines.withTimings import ru.astrainteractive.astrarating.core.util.sortedBy import ru.astrainteractive.astrarating.data.exposed.model.UsersRatingsSort import ru.astrainteractive.astrarating.feature.rating.players.data.RatingPlayersCachedRepository