Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-12 04:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-fabric/build.gradle.kts
View File

@ -18,8 +18,11 @@ configurations.all {
}
dependencies {
"compile"(project(":worldedit-core"))
"compile"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1")
"api"(project(":worldedit-core"))
"implementation"(enforcedPlatform("org.apache.logging.log4j:log4j-bom:2.8.1") {
because("Mojang provides Log4J, we bump to match Forge")
})
"implementation"("org.apache.logging.log4j:log4j-slf4j-impl")
"minecraft"("com.mojang:minecraft:$minecraftVersion")
"mappings"("net.fabricmc:yarn:$yarnMappings")
@ -73,7 +76,7 @@ tasks.named<ShadowJar>("shadowJar") {
archiveClassifier.set("dist-dev")
dependencies {
relocate("org.slf4j", "com.sk89q.worldedit.slf4j")
relocate("org.apache.logging.slf4j", "com.sk89q.worldedit.log4jbridge")
relocate("org.apache.logging.slf4j", "com.sk89q.worldedit.l4j")
relocate("org.antlr.v4", "com.sk89q.worldedit.antlr4")
include(dependency("org.slf4j:slf4j-api"))