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

fix: Don't export Paster transitively on the core module (#1808)

Browse Source
This commit is contained in:
Alexander Brandes 2022-06-14 17:02:11 +02:00 committed by GitHub
parent 8a85225523
commit aae696686d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/AdapterConfig.kt
View File

@ -15,7 +15,7 @@ fun Project.applyPaperweightAdapterConfiguration() {
dependencies { dependencies {
"implementation"(project(":worldedit-bukkit")) "implementation"(project(":worldedit-bukkit"))
"implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.4")) "implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.5"))
} }
tasks.named("assemble") { tasks.named("assemble") {

2
buildSrc/src/main/kotlin/CommonJavaConfig.kt
View File

@ -45,7 +45,7 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
"testImplementation"("org.mockito:mockito-core:3.12.4") "testImplementation"("org.mockito:mockito-core:3.12.4")
"testImplementation"("org.mockito:mockito-junit-jupiter:3.12.4") "testImplementation"("org.mockito:mockito-junit-jupiter:3.12.4")
"testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.8.1") "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.8.1")
"implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.4")) "implementation"(platform("com.intellectualsites.bom:bom-1.18.x:1.5"))
} }
// Java 8 turns on doclint which we fail // Java 8 turns on doclint which we fail

4
worldedit-bukkit/build.gradle.kts
View File

@ -99,7 +99,7 @@ dependencies {
implementation("org.bstats:bstats-bukkit") { isTransitive = false } implementation("org.bstats:bstats-bukkit") { isTransitive = false }
implementation(libs.bstatsBase) { isTransitive = false } implementation(libs.bstatsBase) { isTransitive = false }
implementation("dev.notmyfault.serverlib:ServerLib") implementation("dev.notmyfault.serverlib:ServerLib")
api("com.intellectualsites.paster:Paster") { isTransitive = false } implementation("com.intellectualsites.paster:Paster") { isTransitive = false }
api(libs.lz4Java) { isTransitive = false } api(libs.lz4Java) { isTransitive = false }
api(libs.sparsebitset) { isTransitive = false } api(libs.sparsebitset) { isTransitive = false }
api(libs.parallelgzip) { isTransitive = false } api(libs.parallelgzip) { isTransitive = false }
@ -167,7 +167,7 @@ tasks.named<ShadowJar>("shadowJar") {
include(dependency("dev.notmyfault.serverlib:ServerLib:2.3.1")) include(dependency("dev.notmyfault.serverlib:ServerLib:2.3.1"))
} }
relocate("com.intellectualsites.paster", "com.fastasyncworldedit.paster") { relocate("com.intellectualsites.paster", "com.fastasyncworldedit.paster") {
include(dependency("com.intellectualsites.paster:Paster:1.1.4")) include(dependency("com.intellectualsites.paster:Paster"))
} }
relocate("org.lz4", "com.fastasyncworldedit.core.lz4") { relocate("org.lz4", "com.fastasyncworldedit.core.lz4") {
include(dependency("org.lz4:lz4-java:1.8.0")) include(dependency("org.lz4:lz4-java:1.8.0"))

2
worldedit-core/build.gradle.kts
View File

@ -50,7 +50,7 @@ dependencies {
compileOnlyApi(libs.adventureNbt) compileOnlyApi(libs.adventureNbt)
compileOnlyApi("net.kyori:adventure-text-minimessage") compileOnlyApi("net.kyori:adventure-text-minimessage")
implementation(libs.zstd) { isTransitive = false } implementation(libs.zstd) { isTransitive = false }
api("com.intellectualsites.paster:Paster") compileOnly("com.intellectualsites.paster:Paster")
compileOnly(libs.lz4Java) { isTransitive = false } compileOnly(libs.lz4Java) { isTransitive = false }
compileOnly(libs.sparsebitset) compileOnly(libs.sparsebitset)
compileOnly(libs.parallelgzip) { isTransitive = false } compileOnly(libs.parallelgzip) { isTransitive = false }