Merge branch 'version/7.2.x' into fix/hybrid-mod-forge-mixin-manifest

build.gradle.kts

@@ -51,12 +51,12 @@ val totalReport = tasks.register<JacocoReport>("jacocoTotalReport") {
         proj.apply(plugin = "jacoco")
         proj.plugins.withId("java") {
             executionData(
-                    fileTree(proj.buildDir.absolutePath).include("**/jacoco/*.exec")
+                    fileTree(proj.layout.buildDirectory).include("**/jacoco/*.exec")
             )
             sourceSets(proj.the<JavaPluginExtension>().sourceSets["main"])
             reports {
                 xml.required.set(true)
-                xml.outputLocation.set(rootProject.buildDir.resolve("reports/jacoco/report.xml"))
+                xml.outputLocation.set(rootProject.layout.buildDirectory.file("reports/jacoco/report.xml"))
                 html.required.set(true)
             }
             dependsOn(proj.tasks.named("test"))

buildSrc/build.gradle.kts

@@ -2,7 +2,6 @@ import java.util.Properties
 
 plugins {
     `kotlin-dsl`
-    kotlin("jvm") version embeddedKotlinVersion
 }
 
 repositories {
@@ -47,15 +46,15 @@ val mixinVersion: String = properties.getProperty("mixin.version")
 dependencies {
     implementation(gradleApi())
     implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1")
-    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.2.1")
     implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0")
+    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.1.14")
     implementation("org.spongepowered:spongegradle-plugin-development:2.2.0")
     implementation("org.spongepowered:vanillagradle:0.2.1-20231105.223944-69")
-    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.16")
+    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.20")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.9")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.11")
     implementation("org.spongepowered:mixingradle:0.7.38")
 }

gradle.properties

@@ -4,5 +4,5 @@ version=7.2.19-SNAPSHOT
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-loom.version=1.4.4
+loom.version=1.5.6
 mixin.version=0.12.5+mixin.0.8.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "worldedit"
 
 include("worldedit-libs")

worldedit-core/build.gradle.kts

@@ -88,7 +88,7 @@ tasks.named("sourcesJar") {
 
 configure<LicenseExtension> {
     exclude {
-        it.file.startsWith(project.buildDir)
+        it.file.startsWith(project.layout.buildDirectory.get().asFile)
     }
 }
 tasks.withType<Checkstyle>().configureEach {