diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 3c5eb079f..3b21f975b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -18,6 +18,12 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          cache: gradle
+          java-version: 17
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 461e9deaa..de4d0df68 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -23,7 +23,7 @@ val properties = Properties().also { props ->
 dependencies {
     implementation(gradleApi())
     implementation("org.ajoberstar.grgit:grgit-gradle:5.2.0")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    implementation("com.github.johnrengelman:shadow:8.1.1")
     implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5")
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa..c1962a79e 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 508322917..37aef8d3f 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-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d6..aeb74cbb4 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -144,7 +141,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=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +149,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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 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
diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
index 977b4af10..940dfcb0b 100644
--- a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
@@ -1,3 +1,5 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 applyPaperweightAdapterConfiguration()
 
 plugins {
@@ -19,6 +21,6 @@ configurations.all {
 
 
 dependencies {
-    paperDevBundle("1.17.1-R0.1-20220414.034903-210")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.17.1-R0.1-20220414.034903-210")
     compileOnly("io.papermc:paperlib")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts
index 2f8b75130..aaa4643d2 100644
--- a/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_18_2/build.gradle.kts
@@ -1,3 +1,5 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 plugins {
     java
 }
@@ -10,6 +12,6 @@ repositories {
 
 dependencies {
     // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.18.2-R0.1-20220920.010157-167")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.18.2-R0.1-20220920.010157-167")
     compileOnly("io.papermc:paperlib")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1_19/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_19/build.gradle.kts
index b8c797ee4..cfb2cfe03 100644
--- a/worldedit-bukkit/adapters/adapter-1_19/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_19/build.gradle.kts
@@ -1,3 +1,5 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 plugins {
     java
 }
@@ -9,6 +11,6 @@ repositories {
 }
 
 dependencies {
-    paperDevBundle("1.19.2-R0.1-20221206.184705-189")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.2-R0.1-20221206.184705-189")
     compileOnly("io.papermc:paperlib")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1_19_3/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_19_3/build.gradle.kts
index fb422300e..4706a5752 100644
--- a/worldedit-bukkit/adapters/adapter-1_19_3/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_19_3/build.gradle.kts
@@ -1,3 +1,5 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 plugins {
     java
 }
@@ -10,6 +12,6 @@ repositories {
 
 dependencies {
     // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-    paperDevBundle("1.19.3-R0.1-20230312.180621-141")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.3-R0.1-20230312.180621-141")
     compileOnly("io.papermc:paperlib")
 }
diff --git a/worldedit-bukkit/adapters/adapter-1_19_4/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_19_4/build.gradle.kts
index cf00f80f2..0df6dc795 100644
--- a/worldedit-bukkit/adapters/adapter-1_19_4/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_19_4/build.gradle.kts
@@ -1,3 +1,5 @@
+import io.papermc.paperweight.userdev.PaperweightUserDependenciesExtension
+
 plugins {
     java
 }
@@ -9,6 +11,6 @@ repositories {
 }
 
 dependencies {
-    paperDevBundle("1.19.4-R0.1-20230423.020222-72")
+    the<PaperweightUserDependenciesExtension>().paperDevBundle("1.19.4-R0.1-20230601.025018-99")
     compileOnly("io.papermc:paperlib")
 }
diff --git a/worldedit-core/doctools/build.gradle.kts b/worldedit-core/doctools/build.gradle.kts
index 8f4555040..6f2123f20 100644
--- a/worldedit-core/doctools/build.gradle.kts
+++ b/worldedit-core/doctools/build.gradle.kts
@@ -1,14 +1,14 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.5.30"
+    kotlin("jvm") version "1.8.20"
     application
 }
 
 applyCommonConfiguration()
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
+    kotlinOptions.jvmTarget = "17"
 }
 
 application.mainClass.set("com.sk89q.worldedit.internal.util.DocumentationPrinter")