diff --git a/COMPILING.md b/COMPILING.md index d43218db..cd34b7de 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -1,11 +1,11 @@ Compiling ========= -You can compile WorldGuard as long as you have some version of Java greater than or equal to 16 installed. Gradle will download JDK 16 specifically if needed, +You can compile WorldGuard as long as you have some version of Java greater than or equal to 17 installed. Gradle will download JDK 17 specifically if needed, but it needs some version of Java to bootstrap from. -Note that if you have JRE 16 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 16 and -replace it with JDK 16. +Note that if you have JRE 17 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 16 and +replace it with JDK 17. The build process uses Gradle, which you do *not* need to download. WorldGuard is a multi-module project with three modules: diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6d018412..6f55c313 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,7 +11,7 @@ repositories { dependencies { implementation(gradleApi()) implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1") - implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0") - implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0") - implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0") + implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1") + implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2") + implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 2a01ea90..6126bb49 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -25,7 +25,7 @@ fun Project.applyCommonConfiguration() { plugins.withId("java") { the().toolchain { - languageVersion.set(JavaLanguageVersion.of(16)) + languageVersion.set(JavaLanguageVersion.of(17)) } } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index f90e6d74..39d5fe98 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { // const val PISTON = "0.4.3" // const val AUTO_VALUE = "1.6.5" - const val WORLDEDIT = "7.2.7" + const val WORLDEDIT = "7.2.10" const val JUNIT = "5.7.0" const val SQUIRRELID = "0.3.0" const val GUAVA = "31.0.1-jre" diff --git a/worldguard-bukkit/build.gradle.kts b/worldguard-bukkit/build.gradle.kts index 3773dd7e..0a0a41f2 100644 --- a/worldguard-bukkit/build.gradle.kts +++ b/worldguard-bukkit/build.gradle.kts @@ -28,8 +28,8 @@ configurations { dependencies { "api"(project(":worldguard-core")) - "compileOnly"("io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT") - "runtimeOnly"("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT") { + "compileOnly"("io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT") + "runtimeOnly"("org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT") { exclude("junit", "junit") } "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }