From 82c7957b356f351c505bcc2c81265acc1946d523 Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Mon, 4 Nov 2024 20:05:37 +0100
Subject: [PATCH] Fix InstallPluginsToTestBotTask

---
 .../schlaubi/mikbot/gradle/InstallPluginsToTestBotTask.kt | 8 +++-----
 .../schlaubi/mikbot/gradle/MikBotPluginGradlePlugin.kt    | 2 +-
 gradle/libs.versions.toml                                 | 2 +-
 3 files changed, 5 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 4987a3bf..6fc35603 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,6 +4,7 @@ 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.provider.Provider
 import org.gradle.api.tasks.Input
@@ -16,7 +17,7 @@ import javax.inject.Inject
 abstract class InstallPluginsToTestBotTask : DefaultTask() {
 
     @get:Input
-    abstract val pluginArchive: Property<TaskProvider<Zip>>
+    abstract val pluginArchive: Property<RegularFile>
 
     @get:OutputDirectory
     val outputDirectory: Provider<Directory> = project.layout.buildDirectory.dir("test-bot/plugins")
@@ -26,11 +27,8 @@ abstract class InstallPluginsToTestBotTask : DefaultTask() {
 
     @TaskAction
     fun install() {
-        val task = pluginArchive.get().get()
-
         val result = fs.copy {
-            from(task.destinationDirectory)
-            include(task.archiveFile.get().asFile.name)
+            from(pluginArchive.get())
             into(outputDirectory)
             rename { "plugin-${project.pluginId}.zip" }
         }
diff --git a/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/MikBotPluginGradlePlugin.kt b/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/MikBotPluginGradlePlugin.kt
index 3b14e777..c2f125be 100644
--- a/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/MikBotPluginGradlePlugin.kt
+++ b/gradle-plugin/src/main/kotlin/dev/schlaubi/mikbot/gradle/MikBotPluginGradlePlugin.kt
@@ -85,7 +85,7 @@ class MikBotPluginGradlePlugin : Plugin<Project> {
             val installPlugins = task<InstallPluginsToTestBotTask>("installPluginsToTestBot") {
                 dependsOn(assemblePlugin)
 
-                pluginArchive = assemblePlugin
+                pluginArchive = assemblePlugin.flatMap { it.archiveFile }
             }
 
             task<RunBotTask>("runBot") {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3ef1be04..033d3404 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.0"
+api = "4.0.1"
 ksp = "2.0.21-1.0.26"
 lavakord = "8.0.1"
 kordex-plugin = "1.5.5"