From 446a2028ce2a0dad4654687adbbf527dabeec040 Mon Sep 17 00:00:00 2001 From: Michael Rittmeister Date: Mon, 4 Nov 2024 20:11:58 +0100 Subject: [PATCH] Fix gradle plugin issues --- .../mikbot/gradle/InstallPluginsToTestBotTask.kt | 11 +++++------ gradle/libs.versions.toml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/InstallPluginsToTestBotTask.kt b/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/InstallPluginsToTestBotTask.kt index ae01ac0e..54066cef 100644 --- a/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/InstallPluginsToTestBotTask.kt +++ b/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/InstallPluginsToTestBotTask.kt @@ -4,18 +4,17 @@ import dev.schlaubi.mikbot.gradle.extension.pluginId import org.gradle.api.DefaultTask import org.gradle.api.file.Directory import org.gradle.api.file.FileSystemOperations -import org.gradle.api.file.RegularFile -import org.gradle.api.provider.Property +import org.gradle.api.file.RegularFileProperty import org.gradle.api.provider.Provider -import org.gradle.api.tasks.Input +import org.gradle.api.tasks.InputFile import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction import javax.inject.Inject abstract class InstallPluginsToTestBotTask : DefaultTask() { - @get:Input - abstract val pluginArchive: Property + @get:InputFile + abstract val pluginArchive: RegularFileProperty @get:OutputDirectory val outputDirectory: Provider = project.layout.buildDirectory.dir("test-bot/plugins") @@ -26,7 +25,7 @@ abstract class InstallPluginsToTestBotTask : DefaultTask() { @TaskAction fun install() { val result = fs.copy { - from(pluginArchive.get()) + from(pluginArchive) into(outputDirectory) rename { "plugin-${project.pluginId}.zip" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 033d3404..8364a889 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ coroutines = "1.9.0" serialization = "1.7.3" ktor = "3.0.1" kord = "feature-user-apps-20241102.180018-12" -api = "4.0.1" +api = "4.0.2" ksp = "2.0.21-1.0.26" lavakord = "8.0.1" kordex-plugin = "1.5.5"