Merge remote-tracking branch 'upstream/master' into merge

worldedit-core/build.gradle.kts

@@ -21,14 +21,14 @@ configurations.all {
 dependencies {
     "compile"(project(":worldedit-libs:core"))
     "compile"("de.schlichtherle:truezip:6.8.3")
-    "compile"("rhino:js:1.7R2")
+    "compile"("rhino:js:1.7.11")
     "compile"("org.yaml:snakeyaml:1.23")
     "compile"("com.google.guava:guava:21.0")
     "compile"("com.google.code.findbugs:jsr305:3.0.2")
     "compile"("com.google.code.gson:gson:2.8.0")
     "compile"("org.slf4j:slf4j-api:1.7.26")
     "compile"("it.unimi.dsi:fastutil:8.2.1")
-    "compile"("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false }
+    "compile"("com.googlecode.json-simple:json-simple:1.3.9") { isTransitive = false }
     "compileOnly"(project(":worldedit-libs:core:ap"))
     "annotationProcessor"(project(":worldedit-libs:core:ap"))
     // ensure this is on the classpath for the AP
@@ -48,6 +48,26 @@ tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.add("-Aarg.name.key.prefix=")
 }
 
+tasks.named<AntlrTask>("generateGrammarSource").configure {
+    val pkg = "com.sk89q.worldedit.antlr"
+    outputDirectory = file("build/generated-src/antlr/main/${pkg.replace('.', '/')}")
+    arguments = listOf(
+        "-visitor", "-package", pkg,
+        "-Xexact-output-dir"
+    )
+}
+
+// Give intellij info about where ANTLR code comes from
+plugins.withId("idea") {
+    configure<IdeaModel> {
+        afterEvaluate {
+            module.sourceDirs.add(file("src/main/antlr"))
+            module.sourceDirs.add(file("build/generated-src/antlr/main"))
+            module.generatedSourceDirs.add(file("build/generated-src/antlr/main"))
+        }
+    }
+}
+
 sourceSets {
     main {
         java {