Skip to content

Fix/plugin file generation #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
twisti-dev merged 2 commits into from
Feb 8, 2026
Merged

Fix/plugin file generation #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5dbb7d
fix: change output property from file to directory in GeneratePluginFile
twisti-dev Feb 8, 2026
7f8c41f
chore: update version to 1.12.3 in build.gradle.kts
twisti-dev Feb 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion surf-api-gradle-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
group = groupId
version = buildString {
append(mcVersion)
append("-1.12.2")
append("-1.12.3")
if (snapshot) append("-SNAPSHOT")
}

Expand Down
27 changes: 14 additions & 13 deletions ...adle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/generators/GeneratePluginFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>

@get:Input
abstract val pluginFileJson: Property<String>

@get:OutputFile
abstract val outputFile: RegularFileProperty
@get:OutputDirectory
abstract val outputDir: DirectoryProperty

@get:Input
abstract val fileName: Property<String>

@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)
Comment on lines +26 to +35

Copilot AI Feb 8, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GeneratePluginFile now declares an @OutputDirectory but only deletes the specific outFile when pluginFileJson is blank. If fileName changes across builds (or older outputs exist), stale files can remain in outputDir and be picked up as resources, and it also makes the @CacheableTask output less deterministic. Consider cleaning outputDir at the start of the task (similar to GenerateLibrariesLoaderTask), or switch back to an @OutputFile that is derived from outputDir + fileName so Gradle tracks a single output file.

Copilot uses AI. Check for mistakes.
}

@OptIn(ExperimentalSerializationApi::class)
Expand Down
2 changes: 1 addition & 1 deletion ...ain/kotlin/dev/slne/surf/surfapi/gradle/platform/common/CommonSurfPluginWithPluginFile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ abstract class CommonSurfPluginWithPluginFile<E : CommonSurfExtension, F : Commo
group = "surf-api"

fileName.set(pluginFileName)
outputFile.set(generatedResourcesDirectory.map { it.file(pluginFileName) })
outputDir.set(generatedResourcesDirectory)
pluginFileJson.set(provider {
if (createdPluginFile.isApplied()) {
createdPluginFile.validate()
Expand Down
Loading