From d38d302c92890d006fdbc913eeedfb5c0e473fde Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Tue, 21 Nov 2023 01:54:10 +0100 Subject: [PATCH] Fix run bot task specifying wrong pluginsdir --- .../main/kotlin/dev/schlaubi/mikbot/gradle/RunBotTask.kt | 9 +++++++-- gradle/libs.versions.toml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/RunBotTask.kt b/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/RunBotTask.kt index 3037a3693..b3d8e726c 100644 --- a/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/RunBotTask.kt +++ b/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/RunBotTask.kt @@ -4,7 +4,11 @@ import org.gradle.api.provider.Property import org.gradle.api.tasks.Internal import org.gradle.api.tasks.JavaExec import org.gradle.api.tasks.TaskAction - import org.gradle.kotlin.dsl.* +import org.gradle.kotlin.dsl.assign +import kotlin.collections.asSequence +import kotlin.collections.component1 +import kotlin.collections.component2 +import kotlin.collections.set import kotlin.io.path.isDirectory import kotlin.io.path.listDirectoryEntries import kotlin.io.path.notExists @@ -55,6 +59,7 @@ abstract class RunBotTask : JavaExec() { } private fun configureSystemProperties() { - systemProperties["pf4j.pluginsDir"] = project.layout.buildDirectory.dir("test-bot/plugins") + systemProperties["pf4j.pluginsDir"] = + project.layout.buildDirectory.dir("test-bot/plugins").get().asFile.absolutePath } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 48ff6c85b..02fd27cc3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ serialization = "1.6.0" ktor = "2.3.5" kord = "0.11.1" jjwt = "0.11.5" -api = "3.25.0" +api = "3.25.1" ksp = "1.9.20-1.0.13" lavakord = "feature-new-lavasrc-fields-20230814.202530-2"