diff --git a/klang/build.gradle.kts b/klang/build.gradle.kts
index 63460eeb..921951eb 100644
--- a/klang/build.gradle.kts
+++ b/klang/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-	kotlin("jvm") version "1.9.0"
-	kotlin("plugin.serialization") version "1.8.21"
-	id("org.jetbrains.kotlinx.kover") version "0.6.1"
-	id("maven-publish")
+	kotlin("jvm") version "1.9.20"
+	kotlin("plugin.serialization") version "1.9.20"
+	id("org.jetbrains.kotlinx.kover") version "0.7.3"
+	id("com.gradle.plugin-publish") version "1.0.0"
 }
 
 val projectVersion = System.getenv("VERSION")
@@ -23,13 +23,13 @@ allprojects {
 	version = projectVersion
 
 	kotlin {
-		jvmToolchain(17)
+		jvmToolchain(21)
 
 		sourceSets.all {
 			languageSettings {
 				java {
-					sourceCompatibility = JavaVersion.VERSION_17
-					targetCompatibility = JavaVersion.VERSION_17
+					sourceCompatibility = JavaVersion.VERSION_21
+					targetCompatibility = JavaVersion.VERSION_21
 				}
 				languageVersion = "2.0"
 			}
@@ -60,4 +60,3 @@ allprojects {
 	}
 }
 
-
diff --git a/klang/gradle-plugin/build.gradle.kts b/klang/gradle-plugin/build.gradle.kts
index 84aa9a9b..1db7395a 100644
--- a/klang/gradle-plugin/build.gradle.kts
+++ b/klang/gradle-plugin/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
-	id("com.gradle.plugin-publish") version "1.0.0"
+	kotlin("jvm")
+	id("com.gradle.plugin-publish")
 }
 
 gradlePlugin {
diff --git a/klang/gradle/wrapper/gradle-wrapper.jar b/klang/gradle/wrapper/gradle-wrapper.jar
index c1962a79..7f93135c 100644
Binary files a/klang/gradle/wrapper/gradle-wrapper.jar and b/klang/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/klang/gradle/wrapper/gradle-wrapper.properties b/klang/gradle/wrapper/gradle-wrapper.properties
index c30b486a..1af9e093 100644
--- a/klang/gradle/wrapper/gradle-wrapper.properties
+++ b/klang/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/klang/gradlew b/klang/gradlew
index aeb74cbb..1aa94a42 100755
--- a/klang/gradlew
+++ b/klang/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \