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

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

@ -1,5 +1,9 @@
import org.gradle.api.Project
import org.gradle.api.plugins.JavaPluginExtension
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.repositories
import org.gradle.kotlin.dsl.the
fun Project.applyCommonConfiguration() {
group = rootProject.group
@ -50,4 +54,29 @@ fun Project.applyCommonConfiguration() {
cacheChangingModulesFor(5, "MINUTES")
}
}
plugins.withId("java") {
the<JavaPluginExtension>().toolchain {
languageVersion.set(JavaLanguageVersion.of(8))
}
}
dependencies {
constraints {
for (conf in configurations.names) {
add(conf, "com.google.guava:guava") {
version { strictly(Versions.GUAVA) }
because("Mojang provides Guava")
}
add(conf, "com.google.code.gson:gson") {
version { strictly(Versions.GSON) }
because("Mojang provides Gson")
}
add(conf, "it.unimi.dsi:fastutil") {
version { strictly(Versions.FAST_UTIL) }
because("Mojang provides FastUtil")
}
}
}
}
}

1
buildSrc/src/main/kotlin/PlatformConfig.kt
View File

@ -116,6 +116,7 @@ fun Project.applyShadowConfiguration() {
include(project(":worldedit-libs:core"))
include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))
include(project(":worldedit-core"))
exclude("com.google.code.findbugs:jsr305")
}
archiveFileName.set("FastAsyncWorldEdit-${project.version}.jar")
exclude("GradleStart**")

17
buildSrc/src/main/kotlin/Versions.kt
View File

@ -1,6 +1,19 @@
/*
import org.gradle.api.Project
object Versions {
const val TEXT = "3.0.4"
const val TEXT_EXTRAS = "3.0.6"
const val PISTON = "0.5.6"
const val AUTO_VALUE = "1.7.4"
const val JUNIT = "5.7.0"
const val MOCKITO = "3.7.7"
const val SLF4J = "1.7.30"
const val LOGBACK = "1.2.3"
const val FAST_UTIL = "8.2.1"
const val GUAVA = "21.0"
const val GSON = "2.8.0"
}
// Properties that need a project reference to resolve:
class ProjectVersions(project: Project) {
val loom = project.rootProject.property("loom.version")
@ -9,5 +22,3 @@ class ProjectVersions(project: Project) {
val Project.versions
get() = ProjectVersions(this)
*/