From 1dd27ff529a36b623bedb6c16c171e8d2f710a6a Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Wed, 1 Dec 2021 16:29:37 +0100
Subject: [PATCH] Restore 1.8 compatibility by shading guava in Spigot versions

---
 bukkit/pom.xml   |  4 ++++
 bungee/pom.xml   |  1 +
 core/pom.xml     | 29 ++++++++++++++++++++++++++---
 velocity/pom.xml |  2 ++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 81a8569b..7ee59060 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -68,6 +68,10 @@
                             <pattern>com.google.gson</pattern>
                             <shadedPattern>fastlogin.gson</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.google.common</pattern>
+                            <shadedPattern>fastlogin.guava</shadedPattern>
+                        </relocation>
                         <relocation>
                             <pattern>io.papermc.lib</pattern>
                             <shadedPattern>fastlogin.paperlib</shadedPattern>
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 778eb077..b4859be1 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -57,6 +57,7 @@
                             <!--Those classes are already present in BungeeCord version-->
                             <exclude>net.md-5:bungeecord-config</exclude>
                             <exclude>com.google.code.gson:gson</exclude>
+                            <exclude>com.google.guava:guava</exclude>
                         </excludes>
                     </artifactSet>
                     <relocations>
diff --git a/core/pom.xml b/core/pom.xml
index e8bbc07a..4436d965 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -113,12 +113,35 @@
             <version>0.4</version>
         </dependency>
 
-        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee) -->
+        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Velocity) -->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
-            <scope>provided</scope>
+            <!-- Old version for velocity -->
+            <version>25.1-jre</version>
+            <!-- Exclude compile time deps not marked as such on upstream  -->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.code.findbugs</groupId>
+                    <artifactId>jsr305</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.j2objc</groupId>
+                    <artifactId>j2objc-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/velocity/pom.xml b/velocity/pom.xml
index a59df9ea..9c993562 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -85,6 +85,8 @@
                         <excludes>
                             <exclude>org.slf4j:*</exclude>
                             <exclude>com.google.code.gson:gson</exclude>
+                            <!-- Ships the same old version -->
+                            <exclude>com.google.guava:guava</exclude>
                         </excludes>
                     </artifactSet>
                 </configuration>