Relocate Google Common (#1242)

Fixes NoSuchMethodErrors from occuring on certain Spigot servers.
This commit is contained in:
Camotoy 2020-09-02 23:42:53 -04:00 committed by GitHub
parent 4f761c5bde
commit 4c58568eb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions

View file

@ -73,9 +73,13 @@
<pattern>org.reflections</pattern> <pattern>org.reflections</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern> <shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.google.common</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.google.guava</pattern> <pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.guava</shadedPattern> <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.guava</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.dom4j</pattern> <pattern>org.dom4j</pattern>

View file

@ -79,9 +79,13 @@
<pattern>org.reflections</pattern> <pattern>org.reflections</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern> <shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.google.common</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.google.guava</pattern> <pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.guava</shadedPattern> <shadedPattern>org.geysermc.platform.spigot.shaded.google.guava</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.dom4j</pattern> <pattern>org.dom4j</pattern>

View file

@ -73,9 +73,13 @@
<pattern>org.reflections</pattern> <pattern>org.reflections</pattern>
<shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern> <shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.sponge.shaded.google.common</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.google.guava</pattern> <pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.sponge.shaded.guava</shadedPattern> <shadedPattern>org.geysermc.platform.sponge.shaded.google.guava</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.dom4j</pattern> <pattern>org.dom4j</pattern>

View file

@ -69,9 +69,13 @@
<pattern>org.reflections</pattern> <pattern>org.reflections</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern> <shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.google.common</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.google.guava</pattern> <pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.guava</shadedPattern> <shadedPattern>org.geysermc.platform.velocity.shaded.google.guava</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>org.dom4j</pattern> <pattern>org.dom4j</pattern>