From d5dbb7dbce0cd9eabf99c2b920f3dc6d5e8787cf Mon Sep 17 00:00:00 2001 From: twisti Date: Sun, 8 Feb 2026 14:21:17 +0100 Subject: [PATCH 1/2] fix: change output property from file to directory in GeneratePluginFile --- .../gradle/generators/GeneratePluginFile.kt | 27 ++++++++++--------- .../common/CommonSurfPluginWithPluginFile.kt | 2 +- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/GeneratePluginFile.kt b/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/GeneratePluginFile.kt index 19b7d9d01..6a2357e53 100644 --- a/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/GeneratePluginFile.kt +++ b/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/GeneratePluginFile.kt @@ -3,35 +3,36 @@ package dev.slne.surf.surfapi.gradle.generators import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import org.gradle.api.DefaultTask -import org.gradle.api.file.RegularFileProperty +import org.gradle.api.file.DirectoryProperty import org.gradle.api.provider.Property import org.gradle.api.tasks.CacheableTask import org.gradle.api.tasks.Input -import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.OutputDirectory import org.gradle.api.tasks.TaskAction @CacheableTask abstract class GeneratePluginFile : DefaultTask() { - @get:Input - abstract val fileName: Property - @get:Input abstract val pluginFileJson: Property - @get:OutputFile - abstract val outputFile: RegularFileProperty + @get:OutputDirectory + abstract val outputDir: DirectoryProperty + + @get:Input + abstract val fileName: Property @TaskAction fun generate() { - val out = outputFile.get().asFile + val outFile = outputDir.file(fileName).get().asFile val json = pluginFileJson.get() - if (json.isNotBlank()) { - out.parentFile.mkdirs() - out.writeText(json) - } else { - if (out.exists()) out.delete() + if (json.isBlank()) { + if (outFile.exists()) outFile.delete() + return } + + outFile.parentFile.mkdirs() + outFile.writeText(json) } @OptIn(ExperimentalSerializationApi::class) diff --git a/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPluginWithPluginFile.kt b/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPluginWithPluginFile.kt index d03c927ca..30e36960e 100644 --- a/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPluginWithPluginFile.kt +++ b/surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPluginWithPluginFile.kt @@ -38,7 +38,7 @@ abstract class CommonSurfPluginWithPluginFile Date: Sun, 8 Feb 2026 14:21:26 +0100 Subject: [PATCH 2/2] chore: update version to 1.12.3 in build.gradle.kts --- surf-api-gradle-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surf-api-gradle-plugin/build.gradle.kts b/surf-api-gradle-plugin/build.gradle.kts index 51ef086cc..275a8e390 100644 --- a/surf-api-gradle-plugin/build.gradle.kts +++ b/surf-api-gradle-plugin/build.gradle.kts @@ -21,7 +21,7 @@ plugins { group = groupId version = buildString { append(mcVersion) - append("-1.12.2") + append("-1.12.3") if (snapshot) append("-SNAPSHOT") }