From 7002df0bc74c5b4f40421833c5ccb18723b800c7 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Sat, 18 Dec 2021 23:10:41 +0100
Subject: [PATCH] build: Bump dependencies for 1.18

---
 build.gradle.kts                         | 10 +++++++++-
 gradle/libs.versions.toml                | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2840545a8..91e9f240e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -72,10 +72,18 @@ allprojects {
 
     plugins.withId("java") {
         the<JavaPluginExtension>().toolchain {
-            languageVersion.set(JavaLanguageVersion.of(16))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 
+    tasks.compileJava.configure {
+        options.release.set(16)
+    }
+
+    configurations.all {
+        attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+    }
+
     configure<LicenseExtension> {
         header(rootProject.file("HEADER.txt"))
         include("**/*.java")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9fc14f6f1..192ca7427 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 [versions]
 # Minecraft expectations
-gson = "2.8.0" # Version set by Minecraft
-log4j-api = "2.16.0" # Version set by Minecraft
-guava = "21.0" # Version set by Minecraft
+gson = "2.8.9" # Version set by Minecraft
+log4j-api = "2.17.0" # Version set by Minecraft
+guava = "31.0.1-jre" # Version set by Minecraft
 
 # Platform expectations
-paper = "1.17.1-R0.1-SNAPSHOT"
+paper = "1.18.1-R0.1-SNAPSHOT"
 checker-qual = "3.20.0"
 guice = "5.0.1"
 findbugs = "3.0.1"
-snakeyaml = "1.28" # Version set by Bukkit
+snakeyaml = "1.30" # Version set by Bukkit
 
 # Adventure & MiniMessage
 adventure-api = "4.9.3"
@@ -39,7 +39,7 @@ serverlib = "2.3.1"
 http4j = "1.3"
 
 # Gradle plugins
-shadow = "7.1.0"
+shadow = "7.1.1"
 grgit = "4.1.1"
 licenser = "0.6.1"
 nexus = "1.1.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84d1f85fd..d2880ba80 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists