From 1c4742b962c3f44d6e0a6329bb66c1a2e6a95e62 Mon Sep 17 00:00:00 2001 From: makeevrserg Date: Sat, 25 May 2024 15:49:31 +0300 Subject: [PATCH] fix detekt, dependencies --- fabric/build.gradle.kts | 2 ++ forge/build.gradle.kts | 2 +- gradle/klibs.versions.toml | 4 ++-- velocity/build.gradle.kts | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts index aa3a9ab..4181a3b 100644 --- a/fabric/build.gradle.kts +++ b/fabric/build.gradle.kts @@ -22,6 +22,8 @@ dependencies { implementation(klibs.klibs.kdi) implementation(klibs.klibs.kdi) implementation(libs.minecraft.astralibs.command) + // klibs + implementation(klibs.klibs.mikro.core) // Kotlin implementation(libs.bundles.kotlin) // Driver diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index d061fd7..ad40ff0 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -59,7 +59,7 @@ configurations { } } -val processResources = project.tasks.withType() { +val processResources = project.tasks.withType { filteringCharset = "UTF-8" duplicatesStrategy = DuplicatesStrategy.INCLUDE diff --git a/gradle/klibs.versions.toml b/gradle/klibs.versions.toml index 539704b..fccc515 100644 --- a/gradle/klibs.versions.toml +++ b/gradle/klibs.versions.toml @@ -1,8 +1,8 @@ [versions] # klibs -klibs-gradleplugin = "1.0.0-alpha01" # https://github.com/makeevrserg/gradle-plugin +klibs-gradleplugin = "1.0.0-alpha03" # https://github.com/makeevrserg/gradle-plugin klibs-kstorage = "1.3.0" # https://github.com/makeevrserg/klibs.kstorage -klibs-mikro = "1.6.0-beta" # https://github.com/makeevrserg/klibs.mikro +klibs-mikro = "1.7.0" # https://github.com/makeevrserg/klibs.mikro klibs-kdi = "1.3.2" # https://github.com/makeevrserg/klibs.kdi [libraries] diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index de42766..857d726 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -24,7 +24,7 @@ dependencies { implementation(projects.modules.buildKonfig) } - setupVelocityProcessor() - setupSpigotShadow(File("D:\\Minecraft Servers\\Servers\\esmp-configuration\\velocity\\plugins")) { +setupVelocityProcessor() +setupSpigotShadow(File("D:\\Minecraft Servers\\Servers\\esmp-configuration\\velocity\\plugins")) { archiveBaseName.set("${requireProjectInfo.name}-velocity") - } +}