From 43bef851c7b18e6905aa43f5f85478c45ceb13f0 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sun, 26 Sep 2021 20:54:44 -0400
Subject: [PATCH] Don't shade any Google dependency

All server platforms have modern enough Google dependencies that nothing should break. Tested with Velocity, BungeeCord, Spigot 1.12.2/1.16.5/1.17.1.
---
 bootstrap/bungeecord/pom.xml | 10 +---------
 bootstrap/spigot/pom.xml     | 10 +---------
 bootstrap/velocity/pom.xml   | 10 +---------
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/bootstrap/bungeecord/pom.xml b/bootstrap/bungeecord/pom.xml
index bef37d453..089fd5b04 100644
--- a/bootstrap/bungeecord/pom.xml
+++ b/bootstrap/bungeecord/pom.xml
@@ -72,14 +72,6 @@
                                     <pattern>io.netty.channel.kqueue</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.io.netty.channel.kqueue</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.common</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.bungeecord.shaded.google.guava</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>org.geysermc.platform.bungeecord.shaded.kyori</shadedPattern>
@@ -91,7 +83,7 @@
                 <configuration>
                     <artifactSet>
                         <excludes>
-                            <exclude>com.google.code.gson:*</exclude>
+                            <exclude>com.google.*:*</exclude>
                             <exclude>org.yaml:*</exclude>
                             <exclude>io.netty:netty-transport-native-epoll:*</exclude>
                             <exclude>io.netty:netty-transport-native-unix-common:*</exclude>
diff --git a/bootstrap/spigot/pom.xml b/bootstrap/spigot/pom.xml
index dd6b28473..4b5b50de9 100644
--- a/bootstrap/spigot/pom.xml
+++ b/bootstrap/spigot/pom.xml
@@ -83,14 +83,6 @@
                                     <pattern>com.fasterxml.jackson</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.jackson</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>org.geysermc.platform.spigot.shaded.google.common</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.spigot.shaded.google.guava</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori</pattern>
                                     <shadedPattern>org.geysermc.platform.spigot.shaded.kyori</shadedPattern>
@@ -106,7 +98,7 @@
                 <configuration>
                     <artifactSet>
                         <excludes>
-                            <exclude>com.google.code.gson:*</exclude>
+                            <exclude>com.google.*:*</exclude>
                             <exclude>org.yaml:*</exclude>
                             <!-- We cannot shade Netty, or else native libraries will not load -->
                             <!-- Needed because older Spigot builds do not provide the haproxy module -->
diff --git a/bootstrap/velocity/pom.xml b/bootstrap/velocity/pom.xml
index 33df2be80..fe984e974 100644
--- a/bootstrap/velocity/pom.xml
+++ b/bootstrap/velocity/pom.xml
@@ -65,14 +65,6 @@
                                     <pattern>it.unimi.dsi.fastutil</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>com.google.common</pattern>
-                                    <shadedPattern>org.geysermc.platform.velocity.shaded.google.common</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>com.google.guava</pattern>
-                                    <shadedPattern>org.geysermc.platform.velocity.shaded.google.guava</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>net.kyori.adventure.text.serializer.gson.legacyimpl</pattern>
                                     <shadedPattern>org.geysermc.platform.velocity.shaded.kyori.legacyimpl</shadedPattern>
@@ -84,7 +76,7 @@
                 <configuration>
                     <artifactSet>
                         <excludes>
-                            <exclude>com.google.code.gson:*</exclude>
+                            <exclude>com.google.*:*</exclude>
                             <!-- Needed because Velocity provides every dependency except netty-resolver-dns -->
                             <exclude>io.netty:netty-transport-native-epoll:*</exclude>
                             <exclude>io.netty:netty-transport-native-unix-common:*</exclude>