From 1e81a91d4d8cd0699f980f8854c3cc70b50c92e4 Mon Sep 17 00:00:00 2001 From: wizjany Date: Thu, 23 Mar 2023 11:47:02 -0400 Subject: [PATCH] Bump squirrelid, remove workaround. --- buildSrc/src/main/kotlin/Versions.kt | 2 +- worldguard-libs/core/build.gradle.kts | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 2fefee73..751c0c03 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -4,7 +4,7 @@ object Versions { const val WORLDEDIT = "7.2.12" const val JUNIT = "5.9.1" const val MOCKITO = "4.9.0" - const val SQUIRRELID = "0.3.1" + const val SQUIRRELID = "0.3.2" const val GUAVA = "31.1-jre" const val FINDBUGS = "3.0.2" } diff --git a/worldguard-libs/core/build.gradle.kts b/worldguard-libs/core/build.gradle.kts index 7e3a7450..035191ed 100644 --- a/worldguard-libs/core/build.gradle.kts +++ b/worldguard-libs/core/build.gradle.kts @@ -3,9 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar applyLibrariesConfiguration() dependencies { - "shade"("org.enginehub:squirrelid:${Versions.SQUIRRELID}") { - exclude(group = "com.destroystokyo.paper", module = "paper-api") - } + "shade"("org.enginehub:squirrelid:${Versions.SQUIRRELID}") "shade"("org.khelekore:prtree:1.5.0") } @@ -17,4 +15,4 @@ tasks.named("jar") { include(dependency("org.khelekore:prtree")) } -} \ No newline at end of file +}