From 990a50389642a6545426f329c8ab725ff41c8677 Mon Sep 17 00:00:00 2001 From: d0by Date: Sun, 21 Aug 2022 15:51:32 +0200 Subject: [PATCH 1/3] Update adventure --- Bukkit/build.gradle.kts | 13 ++++++++++--- Common/build.gradle.kts | 6 ++++-- buildSrc/src/main/kotlin/VersionConstants.kt | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index b906322..1a86c9e 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -14,14 +14,21 @@ base { dependencies { implementation("cloud.commandframework:cloud-paper:${VersionConstants.cloudVersion}") - implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") - implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}") + implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { + exclude("net.kyori", "adventure-text-minimessage") + } + implementation("net.kyori:adventure-platform-bukkit:${VersionConstants.adventurePlatformVersion}") { + exclude("net.kyori", "adventure-api") + exclude("net.kyori", "adventure-text-minimessage") + } implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { exclude("net.kyori", "adventure-api") } implementation("org.bstats:bstats-bukkit:${VersionConstants.bstatsVersion}") implementation(project(":Common")) - compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") + compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") { + exclude("net.kyori", "*") + } } tasks.withType { diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts index 3187980..1a52969 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -15,8 +15,10 @@ repositories { } dependencies { - compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") - compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") + compileOnly("net.kyori:adventure-platform-api:${VersionConstants.adventurePlatformVersion}") { + exclude("net.kyori", "adventure-api") + exclude("net.kyori", "adventure-text-minimessage") + } compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1") testImplementation("net.kyori:adventure-text-serializer-plain:${VersionConstants.adventureVersion}") diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index 42c9a55..6a888ce 100644 --- a/buildSrc/src/main/kotlin/VersionConstants.kt +++ b/buildSrc/src/main/kotlin/VersionConstants.kt @@ -1,7 +1,7 @@ object VersionConstants { const val cloudVersion = "1.8.0-SNAPSHOT" - const val adventureVersion = "4.9.3" - const val adventurePlatformVersion = "4.0.1" + const val adventureVersion = "4.11.0" + const val adventurePlatformVersion = "4.1.2" const val adventureMinimessageVersion = "4.2.0-SNAPSHOT" const val bstatsVersion = "3.0.0" } From a879b69f61cbf9c64c6137d4ab3264799a0babda Mon Sep 17 00:00:00 2001 From: d0by Date: Mon, 22 Aug 2022 13:21:50 +0200 Subject: [PATCH 2/3] Add minimessage to Common --- Common/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/Common/build.gradle.kts b/Common/build.gradle.kts index 1a52969..5290a6b 100644 --- a/Common/build.gradle.kts +++ b/Common/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { exclude("net.kyori", "adventure-api") exclude("net.kyori", "adventure-text-minimessage") } + compileOnly("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") compileOnly("com.github.FrankHeijden:ServerUtilsUpdater:5f722b10d1") testImplementation("net.kyori:adventure-text-serializer-plain:${VersionConstants.adventureVersion}") From 7b49addd51108c10f9a2e7a097b39904847ce526 Mon Sep 17 00:00:00 2001 From: d0by Date: Mon, 22 Aug 2022 14:51:29 +0200 Subject: [PATCH 3/3] Bungee exclusions --- Bungee/build.gradle.kts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts index 6df6fae..a49de7f 100644 --- a/Bungee/build.gradle.kts +++ b/Bungee/build.gradle.kts @@ -18,8 +18,13 @@ repositories { dependencies { implementation("cloud.commandframework:cloud-bungee:${VersionConstants.cloudVersion}") - implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") - implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}") + implementation("net.kyori:adventure-api:${VersionConstants.adventureVersion}") { + exclude("net.kyori", "adventure-text-minimessage") + } + implementation("net.kyori:adventure-platform-bungeecord:${VersionConstants.adventurePlatformVersion}") { + exclude("net.kyori", "adventure-api") + exclude("net.kyori", "adventure-text-minimessage") + } implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") { exclude("net.kyori", "adventure-api") }