From aae696686d1537b63ad4ceeb9f1ee8951fe4c631 Mon Sep 17 00:00:00 2001
From: Alexander Brandes <mc.cache@web.de>
Date: Tue, 14 Jun 2022 17:02:11 +0200
Subject: [PATCH] fix: Don't export Paster transitively on the core module
 (#1808)

---
 buildSrc/src/main/kotlin/AdapterConfig.kt    | 2 +-
 buildSrc/src/main/kotlin/CommonJavaConfig.kt | 2 +-
 worldedit-bukkit/build.gradle.kts            | 4 ++--
 worldedit-core/build.gradle.kts              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/kotlin/AdapterConfig.kt b/buildSrc/src/main/kotlin/AdapterConfig.kt
index 31ac7986c..dfe5a5ca1 100644
--- a/buildSrc/src/main/kotlin/AdapterConfig.kt
+++ b/buildSrc/src/main/kotlin/AdapterConfig.kt
@@ -15,7 +15,7 @@ fun Project.applyPaperweightAdapterConfiguration() {
 
     dependencies {
         "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") {
diff --git a/buildSrc/src/main/kotlin/CommonJavaConfig.kt b/buildSrc/src/main/kotlin/CommonJavaConfig.kt
index c0901f6dc..676b3fc4a 100644
--- a/buildSrc/src/main/kotlin/CommonJavaConfig.kt
+++ b/buildSrc/src/main/kotlin/CommonJavaConfig.kt
@@ -45,7 +45,7 @@ fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, banSlf4j: Boolean
         "testImplementation"("org.mockito:mockito-core:3.12.4")
         "testImplementation"("org.mockito:mockito-junit-jupiter:3.12.4")
         "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
diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts
index b554c3bdd..cc18d1221 100644
--- a/worldedit-bukkit/build.gradle.kts
+++ b/worldedit-bukkit/build.gradle.kts
@@ -99,7 +99,7 @@ dependencies {
     implementation("org.bstats:bstats-bukkit") { isTransitive = false }
     implementation(libs.bstatsBase) { isTransitive = false }
     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.sparsebitset) { isTransitive = false }
     api(libs.parallelgzip) { isTransitive = false }
@@ -167,7 +167,7 @@ tasks.named<ShadowJar>("shadowJar") {
             include(dependency("dev.notmyfault.serverlib:ServerLib:2.3.1"))
         }
         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") {
             include(dependency("org.lz4:lz4-java:1.8.0"))
diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts
index 94d8e21d7..944b44fa2 100644
--- a/worldedit-core/build.gradle.kts
+++ b/worldedit-core/build.gradle.kts
@@ -50,7 +50,7 @@ dependencies {
     compileOnlyApi(libs.adventureNbt)
     compileOnlyApi("net.kyori:adventure-text-minimessage")
     implementation(libs.zstd) { isTransitive = false }
-    api("com.intellectualsites.paster:Paster")
+    compileOnly("com.intellectualsites.paster:Paster")
     compileOnly(libs.lz4Java) { isTransitive = false }
     compileOnly(libs.sparsebitset)
     compileOnly(libs.parallelgzip) { isTransitive = false }