diff --git a/build.gradle.kts b/build.gradle.kts
index 5a4bfe7..adcd6a5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     `java-library`
     id("io.papermc.paperweight.userdev") version "1.5.11"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.github.goooler.shadow") version "8.1.7"
     id("org.sonarqube") version "4.4.1.3373"
 }
 
@@ -13,6 +13,8 @@ val mcVersion = "1.20.4-R0.1-SNAPSHOT"
 val redisVersion = "5.1.2"
 val invuiVersion = "1.26"
 
+val javaVersion = 22
+
 repositories {
     mavenCentral()
     maven("https://repo.xenondevs.xyz/releases")
@@ -27,7 +29,7 @@ dependencies {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersion))
 }
 
 tasks {
@@ -38,7 +40,7 @@ tasks {
     compileJava {
         options.encoding = Charsets.UTF_8.name()
 
-        options.release.set(17)
+        options.release.set(javaVersion)
     }
     javadoc {
         options.encoding = Charsets.UTF_8.name()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME