Merge branch 'version/7.2.x'

buildSrc/build.gradle.kts

@@ -36,14 +36,12 @@
 
 dependencies {
     implementation(gradleApi())
-    implementation("gradle.plugin.net.minecrell:licenser:0.4.1")
+    implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.0")
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
     implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0")
-    implementation("net.ltgt.apt-eclipse:net.ltgt.apt-eclipse.gradle.plugin:0.21")
-    implementation("net.ltgt.apt-idea:net.ltgt.apt-idea.gradle.plugin:0.21")
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.21.0")
     implementation("org.spongepowered:SpongeGradle:0.11.5")
-    implementation("net.minecraftforge.gradle:ForgeGradle:4.1.7")
+    implementation("net.minecraftforge.gradle:ForgeGradle:4.1.12")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.1.0")

buildSrc/src/main/kotlin/CommonConfig.kt

@@ -1,11 +1,10 @@
-import net.minecrell.gradle.licenser.LicenseExtension
+import org.cadixdev.gradle.licenser.LicenseExtension
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.repositories
 import org.gradle.kotlin.dsl.the
 
@@ -41,16 +40,20 @@
 
     dependencies {
         constraints {
-            for (conf in configurations.names) {
-                add(conf, "com.google.guava:guava") {
+            for (conf in configurations) {
+                if (conf.isCanBeConsumed || conf.isCanBeResolved) {
+                    // dependencies don't get declared in these
+                    continue
+                }
+                add(conf.name, "com.google.guava:guava") {
                     version { strictly(Versions.GUAVA) }
                     because("Mojang provides Guava")
                 }
-                add(conf, "com.google.code.gson:gson") {
+                add(conf.name, "com.google.code.gson:gson") {
                     version { strictly(Versions.GSON) }
                     because("Mojang provides Gson")
                 }
-                add(conf, "it.unimi.dsi:fastutil") {
+                add(conf.name, "it.unimi.dsi:fastutil") {
                     version { strictly(Versions.FAST_UTIL) }
                     because("Mojang provides FastUtil")
                 }
@@ -58,9 +61,9 @@
         }
     }
 
-    apply(plugin = "net.minecrell.licenser")
+    apply(plugin = "org.cadixdev.licenser")
     configure<LicenseExtension> {
-        header = rootProject.file("HEADER.txt")
+        header(rootProject.file("HEADER.txt"))
         include("**/*.java")
         include("**/*.kt")
     }

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -64,7 +64,7 @@
         "testImplementation"("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT}")
         "testImplementation"("org.mockito:mockito-core:${Versions.MOCKITO}")
         "testImplementation"("org.mockito:mockito-junit-jupiter:${Versions.MOCKITO}")
-        "testRuntime"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
     }
 
     // Java 8 turns on doclint which we fail

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

worldedit-core/build.gradle.kts

@@ -1,11 +1,9 @@
-import net.minecrell.gradle.licenser.LicenseExtension
+import org.cadixdev.gradle.licenser.LicenseExtension
 import org.gradle.plugins.ide.idea.model.IdeaModel
 
 plugins {
-    id("java-library")
-    id("net.ltgt.apt-eclipse")
-    id("net.ltgt.apt-idea")
-    id("antlr")
+    `java-library`
+    antlr
 }
 
 applyPlatformAndCoreConfiguration()
@@ -84,6 +82,10 @@
     )
 }
 
+tasks.named("sourcesJar") {
+    mustRunAfter("generateGrammarSource")
+}
+
 configure<LicenseExtension> {
     exclude {
         it.file.startsWith(project.buildDir)
@@ -106,12 +108,8 @@
 
 sourceSets.named("main") {
     java {
-        srcDir("src/main/java")
         srcDir("src/legacy/java")
     }
-    resources {
-        srcDir("src/main/resources")
-    }
 }
 
 tasks.named<Copy>("processResources") {

worldedit-fabric/build.gradle.kts

@@ -123,15 +123,8 @@
 tasks.named<Copy>("processResources") {
     // this will ensure that this task is redone when the versions change.
     inputs.property("version", project.ext["internalVersion"])
-
-    from(sourceSets["main"].resources.srcDirs) {
-        include("fabric.mod.json")
-        expand("version" to project.ext["internalVersion"])
-    }
-
-    // copy everything else except the mod json
-    from(sourceSets["main"].resources.srcDirs) {
-        exclude("fabric.mod.json")
+    filesMatching("fabric.mod.json") {
+        this.expand("version" to project.ext["internalVersion"])
     }
 }
 

worldedit-forge/build.gradle.kts

@@ -78,19 +78,10 @@
         inputs.property(key, value)
     }
 
-    // replace stuff in mcmod.info, nothing else
-    from(sourceSets["main"].resources.srcDirs) {
-        include("META-INF/mods.toml")
-
-        // replace version and mcversion
+    filesMatching("META-INF/mods.toml") {
         expand(properties)
     }
 
-    // copy everything else except the mcmod.info
-    from(sourceSets["main"].resources.srcDirs) {
-        exclude("META-INF/mods.toml")
-    }
-
     // copy from -core resources as well
     from(project(":worldedit-core").tasks.named("processResources"))
 }