From 8010e64ecc7d40825ec4022bdbb353de260eec39 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 21 Nov 2021 17:19:37 -0700 Subject: [PATCH] package bootstrap addons correctly --- .../src/main/kotlin/com/dfsek/terra/DistributionConfig.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt index b527de9a3..32182e5eb 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt @@ -14,6 +14,7 @@ import org.gradle.api.plugins.BasePluginExtension import org.gradle.jvm.tasks.Jar import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure +import org.gradle.kotlin.dsl.extra import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.named import org.yaml.snakeyaml.DumperOptions @@ -90,7 +91,10 @@ fun Project.configureDistribution() { project(":common:addons").subprojects.forEach { addonProject -> val jar = (addonProject.tasks.named("jar").get() as Jar).archiveFileName.get() - resources.computeIfAbsent("addons") { ArrayList() }.add(jar) + resources.computeIfAbsent( + if (addonProject.project.extra.has("bootstrap") && addonProject.project.extra.get("bootstrap") as Boolean) "addons/bootstrap" + else "addons" + ) { ArrayList() }.add(jar) } val options = DumperOptions()