diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle
index 1392d251..38da7921 100644
--- a/LaunchServer/build.gradle
+++ b/LaunchServer/build.gradle
@@ -22,8 +22,11 @@
     }
 }
 
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 configurations {
     bundleOnly
@@ -112,6 +115,7 @@
     bundle group: 'com.google.code.gson', name: 'gson', version: rootProject['verGson']
     annotationProcessor(group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j'])
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 
     bundle 'io.micrometer:micrometer-core:1.14.4'
     bundle('com.zaxxer:HikariCP:6.2.1') {
diff --git a/Launcher/build.gradle b/Launcher/build.gradle
index 2852258a..c9cccb35 100644
--- a/Launcher/build.gradle
+++ b/Launcher/build.gradle
@@ -7,8 +7,11 @@
         url "https://repo.spring.io/plugins-release/"
     }
 }
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 configurations {
     bundle
diff --git a/LauncherAPI/build.gradle b/LauncherAPI/build.gradle
index 76b3a3eb..8d6a84d6 100644
--- a/LauncherAPI/build.gradle
+++ b/LauncherAPI/build.gradle
@@ -1,9 +1,13 @@
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 dependencies {
     api project(':LauncherCore')
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 test {
diff --git a/LauncherClient/build.gradle b/LauncherClient/build.gradle
index 8562cfe8..6084858a 100644
--- a/LauncherClient/build.gradle
+++ b/LauncherClient/build.gradle
@@ -7,8 +7,11 @@
         url "https://repo.spring.io/plugins-release/"
     }
 }
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 jar {
     archiveClassifier.set('clean')
@@ -28,6 +31,7 @@
 
 dependencies {
     implementation project(':LauncherAPI')
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 publishing {
diff --git a/LauncherCore/build.gradle b/LauncherCore/build.gradle
index 131a0dc9..635addcf 100644
--- a/LauncherCore/build.gradle
+++ b/LauncherCore/build.gradle
@@ -1,5 +1,8 @@
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 dependencies {
     compileOnly group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']
@@ -12,6 +15,7 @@
     testImplementation group: 'org.jline', name: 'jline', version: rootProject['verJline']
     testImplementation group: 'org.jline', name: 'jline-reader', version: rootProject['verJline']
     testImplementation group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline']
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 test {
diff --git a/LauncherStart/build.gradle b/LauncherStart/build.gradle
index 94b2c502..f5957036 100644
--- a/LauncherStart/build.gradle
+++ b/LauncherStart/build.gradle
@@ -8,8 +8,11 @@
         url "https://repo.spring.io/plugins-release/"
     }
 }
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 jar {
     archiveClassifier.set('clean')
@@ -31,6 +34,7 @@
 dependencies {
     implementation project(':LauncherAPI')
     implementation project(':LauncherClient')
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher"
 }
 
 publishing {
diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle
index 99c23468..bf7521a5 100644
--- a/ServerWrapper/build.gradle
+++ b/ServerWrapper/build.gradle
@@ -14,8 +14,11 @@
     }
 }
 
-sourceCompatibility = '21'
-targetCompatibility = '21'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 jar {
     archiveClassifier.set('clean')
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c..8bdaf60c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6514f919..48b43d35 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.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index faf93008..ef07e016 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9d21a218..db3a6ac2 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/modules b/modules
index e6b8af9b..57ac09fc 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit e6b8af9b107ea8c7dab4fc5968cfd0cff05b7d61
+Subproject commit 57ac09fcd56007f7c80314a6652815d5e99d3be7