Update Upstream

876108f Prepare for Gradle 7, but due to FG only get to 6.9
Touches #1020

buildSrc/build.gradle.kts

@@ -22,9 +22,6 @@ val properties = Properties().also { props ->
 
 dependencies {
     implementation(gradleApi())
-    implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.5.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")
 }

buildSrc/src/main/kotlin/CommonConfig.kt

@@ -56,16 +56,20 @@ fun Project.applyCommonConfiguration() {
 
     dependencies {
         constraints {
-            for (conf in configurations.names) {
+            for (conf in configurations) {
-                add(conf, "com.google.guava:guava") {
+                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")
                 }

gradle/wrapper/gradle-wrapper.properties

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

worldedit-core/build.gradle.kts

@@ -2,10 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.plugins.ide.idea.model.IdeaModel
 
 plugins {
-    id("java-library")
+    `java-library`
-    id("net.ltgt.apt-eclipse")
+    antlr
-    id("net.ltgt.apt-idea")
-    id("antlr")
 }
 
 repositories {
@@ -74,6 +72,10 @@ tasks.named<AntlrTask>("generateGrammarSource").configure {
     )
 }
 
+tasks.named("sourcesJar") {
+    mustRunAfter("generateGrammarSource")
+}
+
 // Give intellij info about where ANTLR code comes from
 plugins.withId("idea") {
     configure<IdeaModel> {
@@ -87,12 +89,8 @@ plugins.withId("idea") {
 
 sourceSets.named("main") {
     java {
-        srcDir("src/main/java")
         srcDir("src/legacy/java")
     }
-    resources {
-        srcDir("src/main/resources")
-    }
 }
 
 tasks.named<Copy>("processResources") {