Skip to content

Commit d63606a

Browse files
committed
maybe fix bukkit resource manifest building
1 parent fa0fb3c commit d63606a

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

buildSrc/src/main/kotlin/DistributionConfig.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import java.nio.file.StandardCopyOption
88
import org.gradle.api.DefaultTask
99
import org.gradle.api.Project
1010
import org.gradle.api.plugins.BasePluginExtension
11+
import org.gradle.kotlin.dsl.TaskContainerScope
1112
import org.gradle.kotlin.dsl.apply
1213
import org.gradle.kotlin.dsl.configure
1314
import org.gradle.kotlin.dsl.extra
@@ -88,8 +89,7 @@ fun Project.configureDistribution() {
8889
val jar = getJarTask().archiveFileName.get()
8990
resources.computeIfAbsent(
9091
if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "addons/bootstrap"
91-
else "addons"
92-
) { ArrayList() }.add(jar)
92+
else "addons") { ArrayList() }.add(jar)
9393
}
9494

9595
val options = DumperOptions()
@@ -106,7 +106,9 @@ fun Project.configureDistribution() {
106106

107107
if (manifest.exists()) manifest.delete()
108108
manifest.createNewFile()
109-
yaml.dump(resources, FileWriter(manifest))
109+
FileWriter(manifest).use {
110+
yaml.dump(resources, it)
111+
}
110112
}
111113
}
112114

gradle.properties

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,5 @@ terra.license=MIT
88
# Gradle options
99
org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC
1010
org.gradle.warning.mode=all
11-
12-
# EVIL stuff that BREAKS THINGS, DO NOT USE!
13-
14-
#org.gradle.vfs.watch=true
15-
#kapt.use.worker.api=true
16-
#kapt.include.compile.classpath=false
17-
#org.gradle.parallel=true
18-
#org.gradle.caching=true
11+
org.gradle.parallel=true
1912

0 commit comments

Comments
 (0)