diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 161db84a2a..4eb6e8fba2 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -17,10 +17,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a /.project diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..eed3e6de0224a03b5ca9dd914b96e2fe4b94793e +index 0000000000000000000000000000000000000000..492e3b592d17bd3d5fb4a36ff123f2bd2d13051e --- /dev/null +++ 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.Log4j2PluginsCacheFileTransformer +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") { + exclude("org.bukkit.craftbukkit.Main*") + } -+ transform(AppendingTransformer::class.java) { -+ resource = "META-INF/services/java.sql.Driver" -+ } ++ mergeServiceFiles() + transform(ModifiedLog4j2PluginsCacheFileTransformer::class.java) +} +