maybe fix bukkit resource manifest building

This commit is contained in:
dfsek 2022-07-07 09:10:14 -07:00
parent fa0fb3cd15
commit d63606a9b1
2 changed files with 6 additions and 11 deletions

View File

@ -8,6 +8,7 @@ import java.nio.file.StandardCopyOption
import org.gradle.api.DefaultTask import org.gradle.api.DefaultTask
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.BasePluginExtension import org.gradle.api.plugins.BasePluginExtension
import org.gradle.kotlin.dsl.TaskContainerScope
import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.extra
@ -88,8 +89,7 @@ fun Project.configureDistribution() {
val jar = getJarTask().archiveFileName.get() val jar = getJarTask().archiveFileName.get()
resources.computeIfAbsent( resources.computeIfAbsent(
if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap" if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
else "addons" else "addons") { ArrayList() }.add(jar)
) { ArrayList() }.add(jar)
} }
val options = DumperOptions() val options = DumperOptions()
@ -106,7 +106,9 @@ fun Project.configureDistribution() {
if (manifest.exists()) manifest.delete() if (manifest.exists()) manifest.delete()
manifest.createNewFile() manifest.createNewFile()
yaml.dump(resources, FileWriter(manifest)) FileWriter(manifest).use {
yaml.dump(resources, it)
}
} }
} }

View File

@ -8,12 +8,5 @@ terra.license=MIT
# Gradle options # Gradle options
org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
org.gradle.warning.mode=all org.gradle.warning.mode=all
org.gradle.parallel=true
# EVIL stuff that BREAKS THINGS, DO NOT USE!
#org.gradle.vfs.watch=true
#kapt.use.worker.api=true
#kapt.include.compile.classpath=false
#org.gradle.parallel=true
#org.gradle.caching=true