Update Upstream

876108f Prepare for Gradle 7, but due to FG only get to 6.9
Touches #1020
This commit is contained in:
NotMyFault
2021-05-14 10:31:32 +02:00
parent be624d5fe2
commit 9aa25ce109
4 changed files with 15 additions and 16 deletions

View File

@ -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")
id("net.ltgt.apt-eclipse")
id("net.ltgt.apt-idea")
id("antlr")
`java-library`
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") {