From fae1ee83733c9d483b431982826b1e0d892b4b42 Mon Sep 17 00:00:00 2001
From: derklaro <pasqual.koschmieder@gmail.com>
Date: Tue, 15 Sep 2020 13:27:16 +0200
Subject: [PATCH 1/2] Track some dependency updates

junit: 5.3.0-M1 -> 5.7.0
slf4j: 1.7.25 -> 1.7.30
netty: 4.1.51.Final -> 4.1.52.Final
guava: 25.1-jre -> 29.0-jre
checkerFramework: 2.7.0 -> 3.6.1
jline-terminal-jansi: 3.12.1 -> 3.16.0
fastutil: 8.2.3 -> 8.4.1
async-http-client: 2.10.4 -> 2.12.1
completable-futures: 0.3.2 -> 0.3.3
gradle-wrapper: 6.6 -> 6.6.1

BREAKING CHANGE: No breaking change
---
 build.gradle                             | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 proxy/build.gradle                       |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4d6810e9c..981dd9b90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,12 +22,12 @@ allprojects {
         // dependency versions
         textVersion = '3.0.4'
         adventureVersion = '4.0.0-SNAPSHOT'
-        junitVersion = '5.3.0-M1'
-        slf4jVersion = '1.7.25'
+        junitVersion = '5.7.0'
+        slf4jVersion = '1.7.30'
         log4jVersion = '2.13.3'
-        nettyVersion = '4.1.51.Final'
-        guavaVersion = '25.1-jre'
-        checkerFrameworkVersion = '2.7.0'
+        nettyVersion = '4.1.52.Final'
+        guavaVersion = '29.0-jre'
+        checkerFrameworkVersion = '3.6.1'
         configurateVersion = '3.7.1'
 
         getCurrentShortRevision = {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 01be9d5c3..71796f880 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
diff --git a/proxy/build.gradle b/proxy/build.gradle
index 88175336f..e7eb88a84 100644
--- a/proxy/build.gradle
+++ b/proxy/build.gradle
@@ -56,16 +56,16 @@ dependencies {
 
     implementation 'net.sf.jopt-simple:jopt-simple:5.0.4' // command-line options
     implementation 'net.minecrell:terminalconsoleappender:1.2.0'
-    runtimeOnly 'org.jline:jline-terminal-jansi:3.12.1' // Needed for JLine
+    runtimeOnly 'org.jline:jline-terminal-jansi:3.16.0' // Needed for JLine
     runtimeOnly 'com.lmax:disruptor:3.4.2' // Async loggers
 
-    implementation 'it.unimi.dsi:fastutil:8.2.3'
+    implementation 'it.unimi.dsi:fastutil:8.4.1'
     implementation 'net.kyori:event-method-asm:4.0.0-SNAPSHOT'
     implementation 'net.kyori:adventure-nbt:4.0.0-SNAPSHOT'
 
-    implementation 'org.asynchttpclient:async-http-client:2.10.4'
+    implementation 'org.asynchttpclient:async-http-client:2.12.1'
 
-    implementation 'com.spotify:completable-futures:0.3.2'
+    implementation 'com.spotify:completable-futures:0.3.3'
 
     implementation 'com.electronwill.night-config:toml:3.6.3'
 

From 708094b03a67b3cf3c2dad4a9d2c83037489bdd6 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <andrew@steinborn.me>
Date: Sat, 19 Sep 2020 18:09:05 -0400
Subject: [PATCH 2/2] Revert Guava bump as it is a breaking change

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 981dd9b90..1f41da8da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ allprojects {
         slf4jVersion = '1.7.30'
         log4jVersion = '2.13.3'
         nettyVersion = '4.1.52.Final'
-        guavaVersion = '29.0-jre'
+        guavaVersion = '25.1-jre'
         checkerFrameworkVersion = '3.6.1'
         configurateVersion = '3.7.1'