Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci-skip] Use shadowJar output as input for paperclip

Browse Source
This commit is contained in:
jmp
2020-12-26 00:34:57 -08:00
parent 822a35a0ba
commit 7152b72d25
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
buildSrc/src/main/kotlin/InitTasks.kt
View File

@@ -42,8 +42,9 @@ internal fun Project.initToothpickTasks() {
} }
val paperclip = createPaperclipTask { val paperclip = createPaperclipTask {
dependsOn(tasks.getByName("build")) val shadowJar = toothpick.serverProject.project.tasks.getByName("shadowJar")
dependsOn(subprojects.map { it.tasks.getByName("build") }) dependsOn(shadowJar)
inputs.file(shadowJar.outputs.files.singleFile)
} }
val applyPatches = createApplyPatchesTask { val applyPatches = createApplyPatchesTask {

4
buildSrc/src/main/kotlin/task/Paperclip.kt
View File

@@ -19,9 +19,7 @@ internal fun Project.createPaperclipTask(
val paperclipDir = workDir.resolve("Paperclip") val paperclipDir = workDir.resolve("Paperclip")
val vanillaJarPath = val vanillaJarPath =
workDir.resolve("Minecraft/${toothpick.minecraftVersion}/${toothpick.minecraftVersion}.jar").absolutePath workDir.resolve("Minecraft/${toothpick.minecraftVersion}/${toothpick.minecraftVersion}.jar").absolutePath
val patchedJarPath = toothpick.serverProject.projectDir.resolve( val patchedJarPath = inputs.files.singleFile.absolutePath
"build/libs/${toothpick.forkNameLowercase}-server-$version.jar"
).absolutePath
logger.lifecycle(">>> Building paperclip") logger.lifecycle(">>> Building paperclip")
val paperclipCmd = arrayListOf( val paperclipCmd = arrayListOf(
"mvn", "clean", "package", "mvn", "clean", "package",