Skip to content

Commit 7d43b73

Browse files
committed
Do not relocate google code from sponge
Fixes an issue where our shaded google code collided with Sponge, causing mass sadness. Caused due to b745236
1 parent 5d79706 commit 7d43b73

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

universal/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
2+
13
import java.nio.file.FileAlreadyExistsException
24
import java.nio.file.Files
35
import java.nio.file.Paths
@@ -26,7 +28,7 @@ shadowJar {
2628
classifier = null
2729
relocate "io.netty", "com.vexsoftware.votifier.netty"
2830
relocate "org.json", "com.vexsoftware.votifier.json"
29-
relocate "com.google.code", "com.vexsoftware.votifier.google.code"
31+
relocate new SimpleRelocator("com.google.code", "com.vexsoftware.votifier.google.code", new ArrayList<String>(), Collections.singletonList("com.vexsoftware.votifier.sponge"))
3032
relocate "com.google.common", "com.vexsoftware.votifier.google.common"
3133
relocate "com.google.guava", "com.vexsoftware.votifier.google.guava"
3234
relocate "org.apache.commons.io", "com.vexsoftware.votifier.commons.io"

0 commit comments

Comments
 (0)