3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-11-17 00:20:09 +01:00

Add lin-bus as a dependency

Dieser Commit ist enthalten in:
Matt Bonanno 2022-11-04 19:23:58 -04:00 committet von Matt Bonanno
Ursprung 983e4407b5
Commit f5b358641c
8 geänderte Dateien mit 43 neuen und 15 gelöschten Zeilen

Datei anzeigen

@ -6,19 +6,19 @@ plugins {
} }
repositories { repositories {
mavenCentral()
gradlePluginPortal()
maven {
name = "EngineHub"
url = uri("https://maven.enginehub.org/repo/")
}
maven { maven {
name = "PaperMC" name = "PaperMC"
url = uri("https://repo.papermc.io/repository/maven-public/") url = uri("https://papermc.io/repo/repository/maven-public/")
content { content {
includeGroupByRegex("io\\.papermc\\..*") includeGroupByRegex("io\\.papermc\\..*")
} }
} }
mavenCentral()
gradlePluginPortal()
maven {
name = "EngineHub Repository"
url = uri("https://maven.enginehub.org/repo/")
}
} }
val properties = Properties().also { props -> val properties = Properties().also { props ->

Datei anzeigen

@ -18,6 +18,9 @@ fun Project.applyCommonConfiguration() {
maven { maven {
name = "OSS Sonatype Snapshots" name = "OSS Sonatype Snapshots"
url = uri("https://oss.sonatype.org/content/repositories/snapshots/") url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
mavenContent {
snapshotsOnly()
}
} }
maven { maven {
name = "Athion" name = "Athion"

Datei anzeigen

@ -50,6 +50,7 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
// Java 8 turns on doclint which we fail // Java 8 turns on doclint which we fail
tasks.withType<Javadoc>().configureEach { tasks.withType<Javadoc>().configureEach {
options.encoding = "UTF-8"
(options as StandardJavadocDocletOptions).apply { (options as StandardJavadocDocletOptions).apply {
addStringOption("Xdoclint:none", "-quiet") addStringOption("Xdoclint:none", "-quiet")
tags( tags(
@ -57,7 +58,6 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
"implSpec:a:Implementation Requirements:", "implSpec:a:Implementation Requirements:",
"implNote:a:Implementation Note:" "implNote:a:Implementation Note:"
) )
options.encoding = "UTF-8"
links( links(
"https://jd.adventure.kyori.net/api/latest/", "https://jd.adventure.kyori.net/api/latest/",
"https://logging.apache.org/log4j/2.x/log4j-api/apidocs/", "https://logging.apache.org/log4j/2.x/log4j-api/apidocs/",

Datei anzeigen

@ -41,7 +41,6 @@ fun Project.applyLibrariesConfiguration() {
val relocations = mapOf( val relocations = mapOf(
"net.kyori.text" to "com.sk89q.worldedit.util.formatting.text", "net.kyori.text" to "com.sk89q.worldedit.util.formatting.text",
"net.kyori.minecraft" to "com.sk89q.worldedit.util.kyori", "net.kyori.minecraft" to "com.sk89q.worldedit.util.kyori",
"net.kyori.adventure.nbt" to "com.sk89q.worldedit.util.nbt"
) )
@ -49,13 +48,20 @@ 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"))
exclude(dependency("com.google.errorprone:error_prone_annotations")) exclude(dependency("com.google.errorprone:error_prone_annotations"))
exclude(dependency("org.checkerframework:checker-qual")) exclude(dependency("org.checkerframework:checker-qual"))
exclude(dependency("org.jetbrains:annotations"))
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) ->
@ -85,6 +91,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

@ -31,6 +31,8 @@ jlibnoise = "1.0.0"
jchronic = "0.2.4a" jchronic = "0.2.4a"
lz4-java = "1.8.0" lz4-java = "1.8.0"
lz4-stream = "1.0.0" lz4-stream = "1.0.0"
lin-bus-bom = "0.1.0-SNAPSHOT"
## Internal ## Internal
adventure-text-minimessage = "4.2.0-SNAPSHOT" adventure-text-minimessage = "4.2.0-SNAPSHOT"
text-adapter = "3.0.6" text-adapter = "3.0.6"

Datei anzeigen

@ -14,7 +14,7 @@ applyShadowConfiguration()
repositories { repositories {
maven { maven {
name = "PaperMC" name = "PaperMC"
url = uri("https://repo.papermc.io/repository/maven-public/") url = uri("https://papermc.io/repo/repository/maven-public/")
} }
maven { maven {
name = "EngineHub" name = "EngineHub"

Datei anzeigen

@ -27,6 +27,19 @@ dependencies {
implementation("com.google.guava:guava") implementation("com.google.guava:guava")
implementation("com.google.code.gson:gson") implementation("com.google.code.gson:gson")
implementation(libs.jchronic) {
exclude(group = "junit", module = "junit")
}
implementation("com.thoughtworks.paranamer:paranamer:2.6")
implementation(libs.jlibnoise)
api(platform("org.enginehub.lin-bus:lin-bus-bom:0.1.0-SNAPSHOT"))
api("org.enginehub.lin-bus:lin-bus-tree:0.1.0-SNAPSHOT") {
exclude(group = "org.jetbrains", module = "annotations")
}
api("org.enginehub.lin-bus.format:lin-bus-format-snbt:0.1.0-SNAPSHOT") {
exclude(group = "org.jetbrains", module = "annotations")
}
// Platform expectations // Platform expectations
implementation("org.yaml:snakeyaml") implementation("org.yaml:snakeyaml")

Datei anzeigen

@ -5,12 +5,12 @@ dependencies {
"shade"(libs.adventureTextSerializerGson) "shade"(libs.adventureTextSerializerGson)
"shade"(libs.adventureTextSerializerLegacy) "shade"(libs.adventureTextSerializerLegacy)
"shade"(libs.adventureTextSerializerPlain) "shade"(libs.adventureTextSerializerPlain)
"shade"(libs.jchronic) {
exclude(group = "junit", module = "junit")
}
"shade"(libs.jlibnoise)
"shade"(libs.piston) "shade"(libs.piston)
"shade"(libs.pistonRuntime) "shade"(libs.pistonRuntime)
"shade"(libs.pistonImpl) "shade"(libs.pistonImpl)
"shade"(libs.adventureNbt) // Linbus
"shade"("org.enginehub.lin-bus:lin-bus-common:0.1.0-SNAPSHOT")
"shade"("org.enginehub.lin-bus:lin-bus-stream:0.1.0-SNAPSHOT")
"shade"("org.enginehub.lin-bus:lin-bus-tree:0.1.0-SNAPSHOT")
"shade"("org.enginehub.lin-bus.format:lin-bus-format-snbt:0.1.0-SNAPSHOT")
} }