Restore 1.8 compatibility by shading guava in Spigot versions

This commit is contained in:
games647
2021-12-01 16:29:37 +01:00
parent 2cdfdcb5c5
commit 1dd27ff529
4 changed files with 33 additions and 3 deletions

View File

@ -68,6 +68,10 @@
<pattern>com.google.gson</pattern> <pattern>com.google.gson</pattern>
<shadedPattern>fastlogin.gson</shadedPattern> <shadedPattern>fastlogin.gson</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>fastlogin.guava</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>io.papermc.lib</pattern> <pattern>io.papermc.lib</pattern>
<shadedPattern>fastlogin.paperlib</shadedPattern> <shadedPattern>fastlogin.paperlib</shadedPattern>

View File

@ -57,6 +57,7 @@
<!--Those classes are already present in BungeeCord version--> <!--Those classes are already present in BungeeCord version-->
<exclude>net.md-5:bungeecord-config</exclude> <exclude>net.md-5:bungeecord-config</exclude>
<exclude>com.google.code.gson:gson</exclude> <exclude>com.google.code.gson:gson</exclude>
<exclude>com.google.guava:guava</exclude>
</excludes> </excludes>
</artifactSet> </artifactSet>
<relocations> <relocations>

View File

@ -113,12 +113,35 @@
<version>0.4</version> <version>0.4</version>
</dependency> </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> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>31.0.1-jre</version> <!-- Old version for velocity -->
<scope>provided</scope> <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>
<dependency> <dependency>

View File

@ -85,6 +85,8 @@
<excludes> <excludes>
<exclude>org.slf4j:*</exclude> <exclude>org.slf4j:*</exclude>
<exclude>com.google.code.gson:gson</exclude> <exclude>com.google.code.gson:gson</exclude>
<!-- Ships the same old version -->
<exclude>com.google.guava:guava</exclude>
</excludes> </excludes>
</artifactSet> </artifactSet>
</configuration> </configuration>