Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Upstream

Browse Source 
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
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
4 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
buildSrc/build.gradle.kts
View File

@ -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")
} }

12
buildSrc/src/main/kotlin/CommonConfig.kt
View File

@ -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
View File

@ -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

14
worldedit-core/build.gradle.kts
View File

@ -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") {