Update so many dependencies, merge Forge/Fabric for final jar (#1651)

* Update so many dependencies, merge Forge/Fabric for final

* Clean up contrib docs for Gradle change

* Fix setting compat flags while using toolchain

* Fix deprecation in doc printer

* Restore proper forge JAR name

* Add dist classifier for mod jar

* Properly relocate new bStats

* Fix jar used from fabric

* Fix fabric bom

* Dup the shaded classes for consistency

* Sync Forge/Fabric log4j versions, de-dup

* Downgrade both log4j. This will work

* Update some plugins as well

* Drop the fabric force stuff

* Use duplicate strategy to directly merge jar
This commit is contained in:
Octavia Togami
2021-01-25 05:14:09 -05:00
committed by MattBDev
parent f3d4621589
commit 8b1f043dc5
15 changed files with 156 additions and 54 deletions

View File

@ -1,28 +1,28 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins {
id("org.spongepowered.plugin")
id("org.spongepowered.gradle.plugin")
}
applyPlatformAndCoreConfiguration()
applyShadowConfiguration()
// I can't believe sponge sets this in a base plugin with no opt-out
convention.getPlugin(JavaPluginConvention::class.java).apply {
setSourceCompatibility(null)
setTargetCompatibility(null)
}
repositories {
maven { url = uri("https://repo.codemc.org/repository/maven-public") }
}
dependencies {
compile(project(":worldedit-core"))
compile(project(":worldedit-libs:sponge"))
compile("org.spongepowered:spongeapi:7.1.0")
compile("org.bstats:bstats-sponge:1.5")
testCompile("org.mockito:mockito-core:1.9.0-rc1")
}
sponge {
plugin {
id = "worldedit"
}
api(project(":worldedit-core"))
api(project(":worldedit-libs:sponge"))
api("org.spongepowered:spongeapi:7.1.0")
api("org.bstats:bstats-sponge:1.7")
testImplementation("org.mockito:mockito-core:1.9.0-rc1")
}
<<<<<<< HEAD