3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-09-29 02:21:06 +02:00

Finished adding lin-bus to the dependencies

Dieser Commit ist enthalten in:
Matt 2023-09-21 23:31:48 -04:00
Ursprung a32f1fde34
Commit e61758d3df
4 geänderte Dateien mit 28 neuen und 1 gelöschten Zeilen

Datei anzeigen

@ -1,3 +1,4 @@
import org.gradle.api.Action
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.attributes.java.TargetJvmVersion import org.gradle.api.attributes.java.TargetJvmVersion
import org.gradle.api.plugins.JavaPluginExtension import org.gradle.api.plugins.JavaPluginExtension
@ -10,6 +11,8 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.get import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.gradle.plugins.ide.idea.GenerateIdeaModule
import org.gradle.plugins.ide.idea.model.IdeaProject
fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean = true) { fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean = true) {
applyCommonConfiguration() applyCommonConfiguration()

Datei anzeigen

@ -48,6 +48,9 @@ fun Project.applyLibrariesConfiguration() {
configurations = listOf(project.configurations["shade"]) configurations = listOf(project.configurations["shade"])
archiveClassifier.set("") archiveClassifier.set("")
// Yeet module-info's
exclude("module-info.class")
dependencies { dependencies {
exclude(dependency("com.google.guava:guava")) exclude(dependency("com.google.guava:guava"))
exclude(dependency("com.google.code.gson:gson")) exclude(dependency("com.google.code.gson:gson"))
@ -55,6 +58,9 @@ fun Project.applyLibrariesConfiguration() {
exclude(dependency("org.checkerframework:checker-qual")) exclude(dependency("org.checkerframework:checker-qual"))
exclude(dependency("org.apache.logging.log4j:log4j-api")) exclude(dependency("org.apache.logging.log4j:log4j-api"))
exclude(dependency("com.google.code.findbugs:jsr305")) exclude(dependency("com.google.code.findbugs:jsr305"))
exclude {
it.moduleGroup == "org.jetbrains.kotlin"
}
} }
relocations.forEach { (from, to) -> relocations.forEach { (from, to) ->
@ -84,6 +90,10 @@ fun Project.applyLibrariesConfiguration() {
from({ from({
altConfigFiles("sources") altConfigFiles("sources")
}) })
// Yeet module-info's
exclude("module-info.java")
relocations.forEach { (from, to) -> relocations.forEach { (from, to) ->
val filePattern = Regex("(.*)${from.replace('.', '/')}((?:/|$).*)") val filePattern = Regex("(.*)${from.replace('.', '/')}((?:/|$).*)")
val textPattern = Regex.fromLiteral(from) val textPattern = Regex.fromLiteral(from)

Datei anzeigen

@ -102,6 +102,7 @@ paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref
vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" } vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" } serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" } checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
paranamer = { group = "com.thoughtworks.paranamer", name = "paranamer", version = "2.6" }
# Internal # Internal
## Text ## Text

Datei anzeigen

@ -27,11 +27,24 @@ dependencies {
implementation(libs.guava) implementation(libs.guava)
implementation(libs.gson) implementation(libs.gson)
implementation(libs.paranamer)
implementation(libs.jchronic)
implementation(libs.jlibnoise)
api(platform(libs.linBusBom))
api(libs.linBusTree) {
exclude(group = "org.jetbrains", module = "annotations")
}
api(libs.linBusFormatSnbt) {
exclude(group = "org.jetbrains", module = "annotations")
}
// Platform expectations // Platform expectations
implementation(libs.snakeyaml) implementation(libs.snakeyaml)
// Logging // Logging
implementation(libs.log4jApi) implementation(libs.log4jApi) {
because("Mojang provides Log4j")
}
// Plugins // Plugins
compileOnly(libs.plotSquaredCore) { isTransitive = false } compileOnly(libs.plotSquaredCore) { isTransitive = false }