Skip to content

Commit

Permalink
Merge pull request #20 from Astra-Interactive/dependabot/gradle/versi…
Browse files Browse the repository at this point in the history
…ons-18af2188f8

build(deps): bump the versions group with 23 updates
  • Loading branch information
makeevrserg authored Jun 10, 2024
2 parents 326a19d + cf7b6eb commit 1d19e57
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 22 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
# Project
makeevrserg.project.name=AstraMarket
makeevrserg.project.group=ru.astrainteractive.astramarket
makeevrserg.project.version.string=1.14.1
makeevrserg.project.version.string=1.14.2
makeevrserg.project.description=Market plugin for EmpireSMP
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
makeevrserg.project.url=https://empireprojekt.ru
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[versions]
# Kotlin
kotlin-version = "1.9.23" # https://github.com/JetBrains/kotlin
kotlin-version = "2.0.0" # https://github.com/JetBrains/kotlin
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.59.0" # https://github.com/charleskorn/kaml
kotlin-json = "1.7.0" # https://github.com/Kotlin/kotlinx.serialization
kotlin-kaml = "0.60.0" # https://github.com/charleskorn/kaml

# Drivers
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.8.1" # https://github.com/makeevrserg/klibs.mikro
klibs-kdi = "1.4.1" # https://github.com/makeevrserg/klibs.kdi
klibs-gradleplugin = "1.3.1" # https://github.com/makeevrserg/gradle-plugin
klibs-mikro = "1.8.2" # https://github.com/makeevrserg/klibs.mikro
klibs-kdi = "1.4.2" # https://github.com/makeevrserg/klibs.kdi

# Minecraft
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-spigot = "1.20.6-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.1" # https://github.com/Astra-Interactive/AstraLibs
minecraft-astralibs = "3.7.1" # 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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ 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.astramarket.AstraMarket
import ru.astrainteractive.klibs.kdi.Lateinit
import ru.astrainteractive.klibs.kdi.Reloadable
Expand All @@ -17,6 +16,5 @@ interface BukkitCoreModule {
val encoder: Single<ObjectEncoder>

val inventoryClickEventListener: Single<EventListener>
val logger: Single<Logger>
val kyoriComponentSerializer: Reloadable<KyoriComponentSerializer>
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ 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.astramarket.AstraMarket
import ru.astrainteractive.astramarket.di.BukkitCoreModule
Expand All @@ -16,7 +14,6 @@ import ru.astrainteractive.klibs.kdi.Lateinit
import ru.astrainteractive.klibs.kdi.Reloadable
import ru.astrainteractive.klibs.kdi.Single
import ru.astrainteractive.klibs.kdi.getValue
import java.io.File

class BukkitCoreModuleImpl : BukkitCoreModule {

Expand All @@ -34,14 +31,6 @@ class BukkitCoreModuleImpl : BukkitCoreModule {
KyoriComponentSerializer.Legacy
}

override val logger: Single<Logger> = Single {
JUtilFileLogger(
tag = "AstraMarket",
folder = File(plugin.value.dataFolder, "logs"),
logger = plugin.value.logger
)
}

private val bStatsFactory = Factory {
val plugin by plugin
Metrics(plugin, 15771)
Expand Down

0 comments on commit 1d19e57

Please sign in to comment.