From 742baf8a4d8388598615ba9ca6d603d9a6dea1a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 09:28:42 +0000 Subject: [PATCH 1/2] build(deps): bump the versions group with 27 updates Bumps the versions group with 27 updates: | Package | From | To | | --- | --- | --- | | mysql:mysql-connector-java | `8.0.30` | `8.0.33` | | [org.jetbrains.kotlinx:kotlinx-coroutines-core](https://github.com/Kotlin/kotlinx.coroutines) | `1.8.0` | `1.8.1` | | [org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm](https://github.com/Kotlin/kotlinx.coroutines) | `1.8.0` | `1.8.1` | | [com.charleskorn.kaml:kaml](https://github.com/charleskorn/kaml) | `0.58.0` | `0.59.0` | | [org.xerial:sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) | `3.45.3.0` | `3.46.0.0` | | [org.jetbrains.exposed:exposed-java-time](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.51.0` | | [org.jetbrains.exposed:exposed-jdbc](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.51.0` | | [org.jetbrains.exposed:exposed-dao](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.51.0` | | [org.jetbrains.exposed:exposed-core](https://github.com/JetBrains/Exposed) | `0.44.0` | `0.51.0` | | io.papermc.paper:paper-api | `1.20.4-R0.1-SNAPSHOT` | `1.20.5-R0.1-SNAPSHOT` | | org.spigotmc:spigot-api | `1.20.4-R0.1-SNAPSHOT` | `1.20.5-R0.1-SNAPSHOT` | | org.spigotmc:spigot | `1.20.4-R0.1-SNAPSHOT` | `1.20.5-R0.1-SNAPSHOT` | | com.velocitypowered:velocity-api | `3.3.0-SNAPSHOT` | `4.0.0-SNAPSHOT` | | com.comphenix.protocol:ProtocolLib | `4.8.0` | `5.1.0` | | me.clip:placeholderapi | `2.11.5` | `2.11.6` | | [com.github.MilkBowl:VaultAPI](https://github.com/MilkBowl/VaultAPI) | `1.7` | `1.7.1` | | [org.bstats:bstats-bukkit](https://github.com/Bastian/bStats-Metrics) | `3.0.0` | `3.0.2` | | [com.github.MockBukkit:MockBukkit](https://github.com/MockBukkit/MockBukkit) | `v1.19-SNAPSHOT` | `3.88.1` | | [ru.astrainteractive.klibs:mikro-core](https://github.com/makeevrserg/MiKro) | `1.6.0-beta` | `1.8.1` | | [ru.astrainteractive.klibs:kdi](https://github.com/makeevrserg/KDI) | `1.3.2` | `1.4.1` | | [ru.astrainteractive.astralibs:orm](https://github.com/Astra-Interactive/AstraLibs) | `3.1.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:core](https://github.com/Astra-Interactive/AstraLibs) | `3.1.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:menu-bukkit](https://github.com/Astra-Interactive/AstraLibs) | `3.1.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:core-bukkit](https://github.com/Astra-Interactive/AstraLibs) | `3.1.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:command](https://github.com/Astra-Interactive/AstraLibs) | `3.1.0-alpha` | `3.6.0` | | [ru.astrainteractive.astralibs:command-bukkit](https://github.com/Astra-Interactive/AstraLibs) | `3.1.0-alpha` | `3.6.0` | | com.github.gmazzo.buildconfig | `3.1.0` | `5.3.5` | Updates `mysql:mysql-connector-java` from 8.0.30 to 8.0.33 Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm` from 1.8.0 to 1.8.1 - [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases) - [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md) - [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.8.0...1.8.1) Updates `com.charleskorn.kaml:kaml` from 0.58.0 to 0.59.0 - [Release notes](https://github.com/charleskorn/kaml/releases) - [Commits](https://github.com/charleskorn/kaml/compare/0.58.0...0.59.0) Updates `org.xerial:sqlite-jdbc` from 3.45.3.0 to 3.46.0.0 - [Release notes](https://github.com/xerial/sqlite-jdbc/releases) - [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG) - [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.45.3.0...3.46.0.0) Updates `org.jetbrains.exposed:exposed-java-time` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `org.jetbrains.exposed:exposed-jdbc` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `org.jetbrains.exposed:exposed-dao` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `org.jetbrains.exposed:exposed-core` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `org.jetbrains.exposed:exposed-jdbc` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `org.jetbrains.exposed:exposed-dao` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `org.jetbrains.exposed:exposed-core` from 0.44.0 to 0.51.0 - [Release notes](https://github.com/JetBrains/Exposed/releases) - [Changelog](https://github.com/JetBrains/Exposed/blob/main/CHANGELOG.md) - [Commits](https://github.com/JetBrains/Exposed/commits) Updates `io.papermc.paper:paper-api` from 1.20.4-R0.1-SNAPSHOT to 1.20.5-R0.1-SNAPSHOT Updates `org.spigotmc:spigot-api` from 1.20.4-R0.1-SNAPSHOT to 1.20.5-R0.1-SNAPSHOT Updates `org.spigotmc:spigot` from 1.20.4-R0.1-SNAPSHOT to 1.20.5-R0.1-SNAPSHOT Updates `com.velocitypowered:velocity-api` from 3.3.0-SNAPSHOT to 4.0.0-SNAPSHOT Updates `com.comphenix.protocol:ProtocolLib` from 4.8.0 to 5.1.0 Updates `me.clip:placeholderapi` from 2.11.5 to 2.11.6 Updates `com.github.MilkBowl:VaultAPI` from 1.7 to 1.7.1 - [Release notes](https://github.com/MilkBowl/VaultAPI/releases) - [Commits](https://github.com/MilkBowl/VaultAPI/compare/1.7...1.7.1) Updates `org.bstats:bstats-bukkit` from 3.0.0 to 3.0.2 - [Release notes](https://github.com/Bastian/bStats-Metrics/releases) - [Commits](https://github.com/Bastian/bStats-Metrics/compare/v3.0.0...v3.0.2) Updates `com.github.MockBukkit:MockBukkit` from v1.19-SNAPSHOT to 3.88.1 - [Commits](https://github.com/MockBukkit/MockBukkit/commits/v3.88.1) Updates `ru.astrainteractive.klibs:mikro-core` from 1.6.0-beta to 1.8.1 - [Commits](https://github.com/makeevrserg/MiKro/commits) Updates `ru.astrainteractive.klibs:kdi` from 1.3.2 to 1.4.1 - [Release notes](https://github.com/makeevrserg/KDI/releases) - [Commits](https://github.com/makeevrserg/KDI/compare/1.3.2...1.4.1) Updates `ru.astrainteractive.astralibs:orm` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:menu-bukkit` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core-bukkit` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command-bukkit` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:menu-bukkit` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:core-bukkit` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `ru.astrainteractive.astralibs:command-bukkit` from 3.1.0-alpha to 3.6.0 - [Release notes](https://github.com/Astra-Interactive/AstraLibs/releases) - [Commits](https://github.com/Astra-Interactive/AstraLibs/compare/3.1.0-alpha...3.6.0) Updates `com.github.gmazzo.buildconfig` from 3.1.0 to 5.3.5 --- updated-dependencies: - dependency-name: mysql:mysql-connector-java dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.charleskorn.kaml:kaml dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.xerial:sqlite-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-java-time dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-dao dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-jdbc dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-dao dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: org.jetbrains.exposed:exposed-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: io.papermc.paper:paper-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.spigotmc:spigot-api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.spigotmc:spigot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.velocitypowered:velocity-api dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: com.comphenix.protocol:ProtocolLib dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions - dependency-name: me.clip:placeholderapi dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.github.MilkBowl:VaultAPI dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: org.bstats:bstats-bukkit dependency-type: direct:production update-type: version-update:semver-patch dependency-group: versions - dependency-name: com.github.MockBukkit:MockBukkit dependency-type: direct:production dependency-group: versions - dependency-name: ru.astrainteractive.klibs:mikro-core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.klibs:kdi dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:orm dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:menu-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:menu-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:core-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: ru.astrainteractive.astralibs:command-bukkit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: versions - dependency-name: com.github.gmazzo.buildconfig dependency-type: direct:production update-type: version-update:semver-major dependency-group: versions ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 30 +++++++++++++++--------------- modules/db-rating/build.gradle.kts | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index af20e57..1993b7d 100644 --- a/gradle/libs.versions.toml +++ b/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 diff --git a/modules/db-rating/build.gradle.kts b/modules/db-rating/build.gradle.kts index 102aff9..f9c10b6 100644 --- a/modules/db-rating/build.gradle.kts +++ b/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) } From e89827009c5ae7f24e9903c18eeda52170ef9497 Mon Sep 17 00:00:00 2001 From: makeevrserg Date: Fri, 31 May 2024 12:39:05 +0300 Subject: [PATCH 2/2] fix build --- gradle.properties | 2 +- .../astrainteractive/astrarating/core/di/CoreModule.kt | 10 +++++----- settings.gradle.kts | 1 + .../astrarating/command/di/CommandsDependencies.kt | 3 +-- .../ru/astrainteractive/astrarating/di/RootModule.kt | 3 +-- .../playerratings/di/PlayerRatingGuiDependencies.kt | 3 +-- .../gui/ratings/di/RatingsGUIDependencies.kt | 3 +-- 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 93b10d7..a3f07b2 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.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 diff --git a/modules/core/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt b/modules/core/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt index 8dfde34..ff9ecb4 100644 --- a/modules/core/src/main/kotlin/ru/astrainteractive/astrarating/core/di/CoreModule.kt +++ b/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 = Reloadable { val fileManager = JVMResourceFileManager("translations.yml", dataFolder, this::class.java) - val serializer = YamlSerializer() + val serializer = YamlStringFormat() serializer.parse(fileManager.configFile) .onFailure(Throwable::printStackTrace) .getOrElse { PluginTranslation() } @@ -37,7 +37,7 @@ interface CoreModule { override val config: Reloadable = Reloadable { val fileManager = JVMResourceFileManager("config.yml", dataFolder, this::class.java) - val serializer = YamlSerializer() + val serializer = YamlStringFormat() serializer.parse(fileManager.configFile) .onFailure(Throwable::printStackTrace) .getOrElse { EmpireConfig() } diff --git a/settings.gradle.kts b/settings.gradle.kts index 027f812..67bddfd 100644 --- a/settings.gradle.kts +++ b/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/") diff --git a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/command/di/CommandsDependencies.kt b/spigot/src/main/kotlin/ru/astrainteractive/astrarating/command/di/CommandsDependencies.kt index 6330faa..53b341c 100644 --- a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/command/di/CommandsDependencies.kt +++ b/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 diff --git a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt b/spigot/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt index ff9c577..19f61b4 100644 --- a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/di/RootModule.kt +++ b/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 diff --git a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/playerratings/di/PlayerRatingGuiDependencies.kt b/spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/playerratings/di/PlayerRatingGuiDependencies.kt index e8dfe12..f0a842e 100644 --- a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/playerratings/di/PlayerRatingGuiDependencies.kt +++ b/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 diff --git a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/ratings/di/RatingsGUIDependencies.kt b/spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/ratings/di/RatingsGUIDependencies.kt index 72ee4d2..5a81789 100644 --- a/spigot/src/main/kotlin/ru/astrainteractive/astrarating/gui/ratings/di/RatingsGUIDependencies.kt +++ b/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