From 598a1cb947bc71f8c50a9ae305d3c8538ba578a1 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:41:25 -0700 Subject: [PATCH] Apply shadow removal patch --- .../server/0024-build-replace-use-of-shadow-plugin.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename patches/{unapplied => }/server/0024-build-replace-use-of-shadow-plugin.patch (88%) diff --git a/patches/unapplied/server/0024-build-replace-use-of-shadow-plugin.patch b/patches/server/0024-build-replace-use-of-shadow-plugin.patch similarity index 88% rename from patches/unapplied/server/0024-build-replace-use-of-shadow-plugin.patch rename to patches/server/0024-build-replace-use-of-shadow-plugin.patch index bafba6a491..2a28c1e266 100644 --- a/patches/unapplied/server/0024-build-replace-use-of-shadow-plugin.patch +++ b/patches/server/0024-build-replace-use-of-shadow-plugin.patch @@ -5,7 +5,7 @@ Subject: [PATCH] build: replace use of shadow plugin diff --git a/build.gradle.kts b/build.gradle.kts -index 73b3e61cbbdf5025c24d289597648f01f632a5e3..c7210eb94000eaac8be6e127a9eb9867daec303b 100644 +index 3b9eb1fdc0685aec10b13a8e0e6b3afa4d953250..d9dc7a131d92efea9f37220227e1964e673cd024 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,6 @@ import xyz.jpenilla.runpaper.task.RunServer @@ -16,12 +16,12 @@ index 73b3e61cbbdf5025c24d289597648f01f632a5e3..c7210eb94000eaac8be6e127a9eb9867 id("xyz.jpenilla.run-paper") version "2.2.3" apply false } -@@ -109,14 +108,22 @@ publishing { +@@ -99,14 +98,22 @@ publishing { } } -tasks.shadowJar { -- configurations = listOf(project.configurations.vanillaServer.get(), alsoShade) +- configurations = listOf(project.configurations.vanillaServer.get(), alsoShade) // Paper +tasks.serverJar { + from(alsoShade.elements.map { + it.map { f ->