From 744ca731350150da11aa6f9c36bca315f25398a3 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sat, 12 Jun 2021 19:23:21 -0700
Subject: [PATCH] Use `mergeServiceFiles()` instead of AppendingTransformer

---
 patches/server/Setup-Gradle-project.patch | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch
index 883145ba4d..9d579d391d 100644
--- a/patches/server/Setup-Gradle-project.patch
+++ b/patches/server/Setup-Gradle-project.patch
@@ -96,9 +96,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") {
 +        exclude("org.bukkit.craftbukkit.Main*")
 +    }
-+    transform(AppendingTransformer::class.java) {
-+        resource = "META-INF/services/java.sql.Driver"
-+    }
++    mergeServiceFiles()
 +    transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
 +}
 +