Revert to Java 15

This commit is contained in:
lexikiq
2021-05-13 21:35:08 -04:00
parent 41fb7e137a
commit 9c6eb97a28
10 changed files with 11 additions and 85 deletions

View File

@@ -911,7 +911,7 @@ index 9013d043503d175004ad276799e5935b7fa59dc4..9a6e1ebd46d580addf532786842ea64f
private boolean cancelled;
diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
index 77aefda5aac4602bf5bf71c29600e7450defdd4e..e1275a902986ea82187f491503032d60b8c2c784 100644
index c9af02b0f62b3d18da1e91d1ea02ce0864fc60b9..35e8c680309f0a67e941b749240f902be07c22e6 100644
--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
@@ -4,6 +4,7 @@ import java.net.InetAddress;

View File

@@ -1,30 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: lexikiq <noellekiq@gmail.com>
Date: Thu, 13 May 2021 21:24:52 -0400
Subject: [PATCH] Update to Java 16
diff --git a/pom.xml b/pom.xml
index ed910c6c7851dc4c4d2c540c0cb6285ae4e4be46..893c4d14debae398cab2ce4f5a2e420bbdf5d54b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
<properties>
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
<!-- Parchment start -->
- <maven.compiler.source>15</maven.compiler.source>
- <maven.compiler.target>15</maven.compiler.target>
+ <maven.compiler.source>16</maven.compiler.source>
+ <maven.compiler.target>16</maven.compiler.target>
<!-- Parchment end -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<adventure.version>4.7.0</adventure.version> <!-- Paper - When updating this make sure to update the linked JavaDocs on the homepage as well! -->
@@ -225,7 +225,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.2.3</version>
+ <version>3.3.0-SNAPSHOT</version>
<executions>
<execution>
<phase>package</phase>