Skip to content
This repository has been archived by the owner on May 29, 2022. It is now read-only.

Commit

Permalink
Update Guava and GSON (#323)
Browse files Browse the repository at this point in the history
* Update Guava and gson

* Update CraftServer.java

* Update EntitySlice.java

* Update BlockState.java

* Update BaseBlockPosition.java

* Update BlockStateList.java

* Update PacketPlayOutPlayerInfo.java

* Fix compile errors

* Some fixes

* Add old Objects

* Finally get WorldGuard working

* Fix Java 9-15

* Add tests

* Use Java 17 for workflows

* Revert "Add tests"

This reverts commit 0c0461f.

* Reverting everything

* Overwrite Guava classes instead of modifing them at runtime
  • Loading branch information
Elier authored Jan 19, 2022
1 parent a3ba27f commit 0763e30
Show file tree
Hide file tree
Showing 18 changed files with 2,239 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-nachospigot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ jobs:
if: "!contains(github.event.head_commit.message, '[skip]')"
steps:
- uses: actions/checkout@v2
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 15
java-version: 17
server-id: github
settings-path: ${{ github.workspace }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
if: ${{ !contains(github.event.head_commit.message, '[skip]') || github.repository != github.event.pull_request.head.repo.full_name}}
steps:
- uses: actions/checkout@v2
- name: Set up JDK 15
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 15
java-version: 17
server-id: github
settings-path: ${{ github.workspace }}
- name: Install minecraft-server to local repo
Expand Down
16 changes: 4 additions & 12 deletions NachoSpigot-API/pom.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -7,6 +6,7 @@
<groupId>dev.cobblesword.nachospigot</groupId>
<artifactId>parent</artifactId>
<version>dev-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>api</artifactId>
Expand Down Expand Up @@ -44,25 +44,17 @@
<type>jar</type>
<scope>compile</scope>
</dependency>
<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>17.0</version>
<!-- Update modified guava classes when updating -->
<version>31.0.1-jre</version>
<scope>compile</scope>
</dependency>
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.github.ben-manes.caffeine</groupId>-->
<!-- <artifactId>caffeine</artifactId>-->
<!-- <version>2.8.5</version>-->
<!-- </dependency>-->

<!-- bundled with Minecraft, should be kept in sync -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>org.avaje</groupId>
Expand Down
Loading

0 comments on commit 0763e30

Please sign in to comment.