Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-25 20:16:19 +01:00
Code Issues Projects Releases Wiki Activity

Use mergeServiceFiles() instead of AppendingTransformer

Browse Source
This commit is contained in:
Jason Penilla 2021-06-12 19:23:21 -07:00
parent 75b99eb454
commit 24e9620d14
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Setup-Gradle-project.patch
View File

@ -17,10 +17,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a
/.project /.project
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..eed3e6de0224a03b5ca9dd914b96e2fe4b94793e index 0000000000000000000000000000000000000000..492e3b592d17bd3d5fb4a36ff123f2bd2d13051e
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,121 @@ @@ -0,0 +1,119 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
@ -96,9 +96,7 @@ index 0000000000000000000000000000000000000000..eed3e6de0224a03b5ca9dd914b96e2fe
+ relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") { + relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") {
+ exclude("org.bukkit.craftbukkit.Main*") + exclude("org.bukkit.craftbukkit.Main*")
+ } + }
+ transform(AppendingTransformer::class.java) { + mergeServiceFiles()
+ resource = "META-INF/services/java.sql.Driver"
+ }
+ transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java) + transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java)
+} +}
+ +