From 087acd16404bd0a4c8a6f79a9ad6c8cd4f94a8a2 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Fri, 9 Jul 2021 02:00:18 -0700 Subject: [PATCH] update paper patch --- 0001-Setup-dev-bundle-publishing.patch | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/0001-Setup-dev-bundle-publishing.patch b/0001-Setup-dev-bundle-publishing.patch index 4cece46..469275b 100644 --- a/0001-Setup-dev-bundle-publishing.patch +++ b/0001-Setup-dev-bundle-publishing.patch @@ -1,16 +1,16 @@ -From fb950cd96500ed930aa561c5f03e777a6c9cec24 Mon Sep 17 00:00:00 2001 +From b5c01c3fb23ad020f61c004fa3efe4edd3e31b4d Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Thu, 8 Jul 2021 19:56:34 -0700 +Date: Fri, 9 Jul 2021 01:43:00 -0700 Subject: [PATCH] Setup dev bundle publishing Gradle property `publishDevBundle` must be set to publish the dev bundle, ex `./gradlew publishToMavenLocal -PpublishDevBundle`. Patches must be already applied in order to generate the dev bundle. --- - build.gradle.kts | 49 ++++++++++++++++++++++++++------------------- + build.gradle.kts | 61 +++++++++++++++++++++++++++++---------------- settings.gradle.kts | 1 + - 2 files changed, 29 insertions(+), 21 deletions(-) + 2 files changed, 41 insertions(+), 21 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts -index cf0754603..23db4352c 100644 +index cf0754603..e5b6cca29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,8 @@ @@ -68,10 +68,22 @@ index cf0754603..23db4352c 100644 mappingsPatch.set(layout.projectDirectory.file("build-data/mappings-patch.tiny")) reobfMappingsPatch.set(layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny")) -@@ -104,6 +89,28 @@ paperweight { +@@ -104,6 +89,40 @@ paperweight { } } ++tasks.generateDevelopmentBundle { ++ apiCoordinates.set("io.papermc.paper:paper-api") ++ mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi") ++ libraryRepositories.set(listOf( ++ "https://libraries.minecraft.net/", ++ "https://maven.quiltmc.org/repository/release/", ++ "https://repo.aikar.co/content/groups/aikar", ++ "https://ci.emc.gs/nexus/content/groups/aikar/", ++ "https://papermc.io/repo/repository/maven-public/" ++ )) ++} ++ +publishing { + if (project.hasProperty("publishDevBundle")) { + publications.create("devBundle") {