Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 08:32:51 +02:00
Update Upstream
876108f Prepare for Gradle 7, but due to FG only get to 6.9 Touches #1020
Dieser Commit ist enthalten in:
Ursprung
be624d5fe2
Commit
9aa25ce109
@ -22,9 +22,6 @@ val properties = Properties().also { props ->
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(gradleApi())
|
implementation(gradleApi())
|
||||||
implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.5.0")
|
|
||||||
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
|
implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
|
||||||
implementation("com.github.jengelman.gradle.plugins:shadow:6.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")
|
|
||||||
}
|
}
|
||||||
|
@ -56,16 +56,20 @@ fun Project.applyCommonConfiguration() {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
constraints {
|
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) }
|
version { strictly(Versions.GUAVA) }
|
||||||
because("Mojang provides Guava")
|
because("Mojang provides Guava")
|
||||||
}
|
}
|
||||||
add(conf, "com.google.code.gson:gson") {
|
add(conf.name, "com.google.code.gson:gson") {
|
||||||
version { strictly(Versions.GSON) }
|
version { strictly(Versions.GSON) }
|
||||||
because("Mojang provides Gson")
|
because("Mojang provides Gson")
|
||||||
}
|
}
|
||||||
add(conf, "it.unimi.dsi:fastutil") {
|
add(conf.name, "it.unimi.dsi:fastutil") {
|
||||||
version { strictly(Versions.FAST_UTIL) }
|
version { strictly(Versions.FAST_UTIL) }
|
||||||
because("Mojang provides FastUtil")
|
because("Mojang provides FastUtil")
|
||||||
}
|
}
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -2,10 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
|||||||
import org.gradle.plugins.ide.idea.model.IdeaModel
|
import org.gradle.plugins.ide.idea.model.IdeaModel
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("java-library")
|
`java-library`
|
||||||
id("net.ltgt.apt-eclipse")
|
antlr
|
||||||
id("net.ltgt.apt-idea")
|
|
||||||
id("antlr")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@ -74,6 +72,10 @@ tasks.named<AntlrTask>("generateGrammarSource").configure {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.named("sourcesJar") {
|
||||||
|
mustRunAfter("generateGrammarSource")
|
||||||
|
}
|
||||||
|
|
||||||
// Give intellij info about where ANTLR code comes from
|
// Give intellij info about where ANTLR code comes from
|
||||||
plugins.withId("idea") {
|
plugins.withId("idea") {
|
||||||
configure<IdeaModel> {
|
configure<IdeaModel> {
|
||||||
@ -87,12 +89,8 @@ plugins.withId("idea") {
|
|||||||
|
|
||||||
sourceSets.named("main") {
|
sourceSets.named("main") {
|
||||||
java {
|
java {
|
||||||
srcDir("src/main/java")
|
|
||||||
srcDir("src/legacy/java")
|
srcDir("src/legacy/java")
|
||||||
}
|
}
|
||||||
resources {
|
|
||||||
srcDir("src/main/resources")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.named<Copy>("processResources") {
|
tasks.named<Copy>("processResources") {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren