bootstrap addon dumping

This commit is contained in:
dfsek 2021-11-17 09:22:45 -07:00
parent c0bcc40f6a
commit fb93d417ee
2 changed files with 5 additions and 3 deletions

View File

@ -5,6 +5,7 @@ import java.util.function.Predicate
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.jvm.tasks.Jar
import org.gradle.kotlin.dsl.extra
import kotlin.streams.asStream
@ -23,7 +24,8 @@ fun Project.addonDir(dir: File, task: Task) {
project(":common:addons").subprojects.forEach { addonProject ->
val jar = (addonProject.tasks.named("jar").get() as Jar)
val target = File(dir, jar.archiveFileName.get())
val boot = if (addonProject.project.extra.has("bootstrap") && addonProject.project.extra.get("bootstrap") as Boolean) "bootstrap/" else ""
val target = File(dir, boot + jar.archiveFileName.get())
val base = "${jar.archiveBaseName.get()}-${project.version}"
@ -36,6 +38,6 @@ fun Project.addonDir(dir: File, task: Task) {
fun matchingAddons(dir: File, matcher: Predicate<File>): Set<File> {
val matching = HashSet<File>()
dir.walk().maxDepth(1).asStream().filter(matcher).forEach(matching::add)
dir.walk().asStream().filter(matcher).forEach(matching::add)
return matching
}

@ -1 +1 @@
Subproject commit 3df70cd54fb151c06dcc97d5e92cc12396d35f88
Subproject commit ffc65330dcf0a4b8608e8c35362f2930019dd682