Merge pull request #18 from Astra-Interactive/dependabot/gradle/versi…

…ons-acb8f1ed25

build(deps): bump the versions group with 14 updates

build.gradle.kts

@@ -9,17 +9,17 @@ plugins {
     alias(libs.plugins.gradle.shadow) apply false
 
     // klibs - core
-    alias(klibs.plugins.klibs.gradle.detekt) apply false
-    alias(klibs.plugins.klibs.gradle.detekt.compose) apply false
-    alias(klibs.plugins.klibs.gradle.dokka.root) apply false
-    alias(klibs.plugins.klibs.gradle.dokka.module) apply false
-    alias(klibs.plugins.klibs.gradle.java.core) apply false
-    alias(klibs.plugins.klibs.gradle.stub.javadoc) apply false
-    alias(klibs.plugins.klibs.gradle.publication) apply false
-    alias(klibs.plugins.klibs.gradle.rootinfo) apply false
+    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(klibs.plugins.klibs.gradle.minecraft.empty) apply false
-    alias(klibs.plugins.klibs.gradle.minecraft.multiplatform) apply false
+    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")

fabric/build.gradle.kts

@@ -7,23 +7,23 @@ plugins {
     kotlin("jvm")
     id("fabric-loom")
     id("com.github.johnrengelman.shadow")
-    alias(klibs.plugins.klibs.gradle.java.core)
+    alias(libs.plugins.klibs.gradle.java.core)
 }
 
 dependencies {
-    mappings("net.fabricmc:yarn:${libs.versions.minecraft.fabric.yarn.get()}")
+    mappings("net.fabricmc:yarn:${libs.versions.minecraft.fabric.yarn.get()}:v2")
     minecraft(libs.minecraft.mojang.get())
     modImplementation(libs.minecraft.fabric.kotlin.get())
     modImplementation(libs.minecraft.fabric.loader.get())
     modImplementation(libs.minecraft.fabric.api.get())
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.orm)
-    implementation(klibs.klibs.kdi)
-    implementation(klibs.klibs.kdi)
+    implementation(libs.klibs.kdi)
+    implementation(libs.klibs.kdi)
     implementation(libs.minecraft.astralibs.command)
     // klibs
-    implementation(klibs.klibs.mikro.core)
+    implementation(libs.klibs.mikro.core)
     // Kotlin
     implementation(libs.bundles.kotlin)
     // Driver

forge/build.gradle.kts

@@ -6,7 +6,7 @@ import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt
 
 plugins {
     kotlin("jvm")
-    alias(klibs.plugins.klibs.gradle.java.core)
+    alias(libs.plugins.klibs.gradle.java.core)
     id("net.minecraftforge.gradle") version ("[6.0,6.2)")
     id("com.github.johnrengelman.shadow")
 }
@@ -33,11 +33,11 @@ minecraft {
 }
 
 dependencies {
-    minecraft("net.minecraftforge:forge:1.20.6-50.1.3")
+    minecraft("net.minecraftforge:forge:1.21-51.0.8")
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.command)
-    implementation(klibs.klibs.kdi)
+    implementation(libs.klibs.kdi)
     // Kotlin
     implementation(libs.bundles.kotlin)
     // Local

gradle.properties

@@ -9,7 +9,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraTemplate
 makeevrserg.project.group=ru.astrainteractive.astratemplate
-makeevrserg.project.version.string=7.5.1
+makeevrserg.project.version.string=7.5.2
 makeevrserg.project.description=Template plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://github.com/Astra-Interactive/AstraTemplate

gradle/libs.versions.toml

@@ -10,17 +10,17 @@ driver-jdbc = "3.46.0.0" # https://github.com/xerial/sqlite-jdbc
 driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
 
 # Minecraft
-minecraft-version = "1.20.2"
+minecraft-version = "1.21"
 minecraft-velocity = "3.3.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
-minecraft-spigot = "1.20.6-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
+minecraft-spigot = "1.21-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
 minecraft-papi = "2.11.6" # https://github.com/PlaceholderAPI/PlaceholderAPI
 minecraft-protocollib = "5.1.0"
 minecraft-wg = "7.0.7"
 minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
 minecraft-coreprotect = "21.2"
-minecraft-astralibs = "3.7.0"
+minecraft-astralibs = "3.7.1"
 minecraft-bstats = "3.0.2"
-minecraft-mockbukkit = "3.88.1"
+minecraft-mockbukkit = "v3.90.0"
 
 # Testing
 tests-org-testing = "7.10.2"
@@ -30,11 +30,11 @@ tests-junit-jupiter-api = "5.10.2"
 tests-junit-bom = "5.10.2"
 
 # Fabric
-minecraft-fabric-loom = "1.6.12"
-minecraft-fabric-kotlin = "1.11.0+"
+minecraft-fabric-loom = "1.6-SNAPSHOT"
+minecraft-fabric-kotlin = "1.11.0+kotlin.2.0.0"
 minecraft-fabric-loader = "0.15.11"
-minecraft-fabric-api = "0.100.0+"
-minecraft-fabric-yarn = "1.20.2+build.4"
+minecraft-fabric-api = "0.100.3+1.21"
+minecraft-fabric-yarn = "1.21+build.2"
 
 # Shadow
 gradle-shadow = "8.1.1"
@@ -45,6 +45,12 @@ gradle-buildconfig = "5.3.5"
 # Exposed
 exposed = "0.51.1"
 
+# klibs
+klibs-gradleplugin = "1.3.3" # https://github.com/makeevrserg/gradle-plugin
+klibs-kstorage = "2.0.1" # https://github.com/makeevrserg/klibs.kstorage
+klibs-mikro = "1.8.4" # https://github.com/makeevrserg/klibs.mikro
+klibs-kdi = "1.4.5" # https://github.com/makeevrserg/klibs.kdi
+
 [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"]
@@ -110,6 +116,11 @@ minecraft-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref =
 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" }
 
+# klibs - mikro
+klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
+# klibs - kdi
+klibs-kdi = { module = "ru.astrainteractive.klibs:kdi", version.ref = "klibs-kdi" }
+
 [plugins]
 # Kotlin
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }
@@ -121,4 +132,23 @@ minecraft-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-lo
 
 # 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 - android
+klibs-gradle-android-core = { id = "ru.astrainteractive.gradleplugin.android.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-compose = { id = "ru.astrainteractive.gradleplugin.android.compose", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-apk-sign = { id = "ru.astrainteractive.gradleplugin.android.apk.sign", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-apk-name = { id = "ru.astrainteractive.gradleplugin.android.apk.name", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-publication = { id = "ru.astrainteractive.gradleplugin.android.publication", 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-local/build.gradle.kts

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

modules/api-remote/build.gradle.kts

@@ -7,5 +7,5 @@ dependencies {
     // Kotlin
     implementation(libs.bundles.kotlin)
     // klibs
-    implementation(klibs.klibs.kdi)
+    implementation(libs.klibs.kdi)
 }

modules/core/build.gradle.kts

@@ -9,7 +9,7 @@ dependencies {
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     // klibs
-    implementation(klibs.klibs.kdi)
+    implementation(libs.klibs.kdi)
     // Test
     testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)

plugin/build.gradle.kts

@@ -16,8 +16,8 @@ dependencies {
     implementation(libs.minecraft.astralibs.command.bukkit)
     implementation(libs.minecraft.astralibs.menu.bukkit)
     implementation(libs.minecraft.astralibs.core.bukkit)
-    implementation(klibs.klibs.mikro.core)
-    implementation(klibs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
+    implementation(libs.klibs.kdi)
     // Spigot dependencies
     compileOnly(libs.minecraft.paper.api)
     implementation(libs.minecraft.bstats)

plugin/src/main/kotlin/ru/astrainteractive/astratemplate/di/RootModule.kt

@@ -6,9 +6,8 @@ import ru.astrainteractive.astratemplate.command.di.CommandModule
 import ru.astrainteractive.astratemplate.core.di.CoreModule
 import ru.astrainteractive.astratemplate.event.di.EventModule
 import ru.astrainteractive.astratemplate.gui.di.GuiModule
-import ru.astrainteractive.klibs.kdi.Module
 
-interface RootModule : Module {
+interface RootModule {
     val bukkitModule: BukkitModule
 
     val apiLocalModule: ApiLocalModule

plugin/src/main/kotlin/ru/astrainteractive/astratemplate/gui/di/SampleGuiDependencies.kt

@@ -11,10 +11,9 @@ import ru.astrainteractive.astratemplate.gui.domain.GetRandomColorUseCaseImpl
 import ru.astrainteractive.astratemplate.gui.domain.SetDisplayNameUseCaseImpl
 import ru.astrainteractive.astratemplate.gui.sample.DefaultSampleGUIComponent
 import ru.astrainteractive.klibs.kdi.Factory
-import ru.astrainteractive.klibs.kdi.Module
 import ru.astrainteractive.klibs.kdi.getValue
 
-interface SampleGuiDependencies : Module {
+interface SampleGuiDependencies {
     val translation: PluginTranslation
     val dispatchers: BukkitDispatchers
     val kyoriComponentSerializer: KyoriComponentSerializer

settings.gradle.kts

@@ -44,7 +44,6 @@ dependencyResolutionManagement {
         maven("https://maven.playpro.com")
         maven("https://jitpack.io")
     }
-    versionCatalogs { create("klibs") { from(files("./gradle/klibs.versions.toml")) } }
 }
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

velocity/build.gradle.kts

@@ -14,7 +14,7 @@ dependencies {
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.orm)
     // klibs
-    implementation(klibs.klibs.kdi)
+    implementation(libs.klibs.kdi)
     implementation(libs.minecraft.astralibs.command)
     // Velocity
     compileOnly(libs.minecraft.velocity.api)

velocity/src/main/kotlin/ru/astrainteractive/astratemplate/di/RootModule.kt

@@ -1,9 +1,8 @@
 package ru.astrainteractive.astratemplate.di
 
 import ru.astrainteractive.astratemplate.core.di.CoreModule
-import ru.astrainteractive.klibs.kdi.Module
 
-interface RootModule : Module {
+interface RootModule {
     val velocityModule: VelocityModule
     val coreModule: CoreModule
 }

velocity/src/main/kotlin/ru/astrainteractive/astratemplate/di/VelocityModule.kt

@@ -5,10 +5,9 @@ import com.velocitypowered.api.proxy.ProxyServer
 import org.slf4j.Logger
 import ru.astrainteractive.astratemplate.AstraTemplate
 import ru.astrainteractive.klibs.kdi.Lateinit
-import ru.astrainteractive.klibs.kdi.Module
 import java.nio.file.Path
 
-interface VelocityModule : Module {
+interface VelocityModule {
     val injector: Lateinit<Injector>
     val server: Lateinit<ProxyServer>
     val plugin: Lateinit<AstraTemplate>