diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 145621cdd..527f28039 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -12,7 +12,11 @@ dependencies { compileOnly project(':common:loader-utils') compileOnly 'com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT' - compileOnly 'me.lucko:adventure-platform-bukkit:4.0.0' // re: this artifact - see note in common/build.gradle + compileOnly('me.lucko:adventure-platform-bukkit:4.7.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') + exclude(module: 'adventure-nbt') + } compileOnly 'me.lucko:commodore:1.7' compileOnly('net.milkbowl.vault:VaultAPI:1.6') { exclude(module: 'bukkit') diff --git a/bungee/build.gradle b/bungee/build.gradle index b07246622..685657a5a 100644 --- a/bungee/build.gradle +++ b/bungee/build.gradle @@ -7,7 +7,11 @@ dependencies { compileOnly project(':common:loader-utils') compileOnly 'net.md-5:bungeecord-api:1.15-SNAPSHOT' - compileOnly 'me.lucko:adventure-platform-bungeecord:4.0.0' // re: this artifact - see note in common/build.gradle + compileOnly('me.lucko:adventure-platform-bungeecord:4.7.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') + exclude(module: 'adventure-nbt') + } compileOnly 'com.imaginarycode.minecraft:RedisBungee:0.4' } diff --git a/common/build.gradle b/common/build.gradle index c9682db7b..4dfa16756 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -16,11 +16,26 @@ dependencies { compileOnly 'org.slf4j:slf4j-api:1.7.30' compileOnly 'org.apache.logging.log4j:log4j-api:2.14.0' - // This is a special re-packaged version of 'net.kyori:adventure-*' for our own use. - // Don't use it in other projects, you want the net.kyori version instead. - // See here for more info: https://github.com/KyoriPowered/adventure - compile('me.lucko:adventure-api:4.0.0') { + compile('net.kyori:adventure-api:4.7.0') { + exclude(module: 'adventure-bom') exclude(module: 'checker-qual') + exclude(module: 'annotations') + } + + compile('net.kyori:adventure-text-serializer-gson:4.7.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') + exclude(module: 'gson') + } + + compile('net.kyori:adventure-text-serializer-legacy:4.7.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') + } + + compile('net.kyori:adventure-text-serializer-plain:4.7.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') } compile('net.kyori:event-api:3.0.0') { diff --git a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java index ecc2fb3fa..2433a38e1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java +++ b/common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java @@ -63,36 +63,29 @@ public enum Dependency { ADVENTURE( "me{}lucko", "adventure-api", - "4.0.1", - "6dKz0iM9MChLzU5MTLW5HSLFEmmNh/D9Bb6kzJvK/1E=", + "4.7.0", + "6PddEv3Rpe4LuthaVjgG98feIBl4AQAkaYNLY9lldWA=", Relocation.of("adventure", "net{}kyori{}adventure") ), ADVENTURE_PLATFORM( "me{}lucko", "adventure-platform-api", - "4.0.1", - "ie3rz49jg5HU04mWe/f6lXjHt6L+S2SQp/x6YFbhxsc=", + "4.7.0", + "CyYWxQuoN4vHte/5HuFDZEqrBGMi9Vv7uH3toJW1Z5Y=", Relocation.of("adventure", "net{}kyori{}adventure") ), ADVENTURE_PLATFORM_BUKKIT( "me{}lucko", "adventure-platform-bukkit", - "4.0.1", - "dVbYfUJqmde8jeuTvknCL9hbzqxybal00TELTzQgLbk=", + "4.7.0", + "9H5MHWbJlZAHZR5zqqjW3QBU0GhJ1l9KgLGE4mKHDe8=", Relocation.of("adventure", "net{}kyori{}adventure") ), ADVENTURE_PLATFORM_BUNGEECORD( "me{}lucko", "adventure-platform-bungeecord", - "4.0.1", - "4phi0TxNKVj5Lko63nlkrd5snIJcaU+cXUfAWsbCX1U=", - Relocation.of("adventure", "net{}kyori{}adventure") - ), - ADVENTURE_PLATFORM_SPONGEAPI( - "me{}lucko", - "adventure-platform-spongeapi", - "4.0.1", - "6fjWuZMeJ6633RKuZh6sIlMyVIzryQoewONeei2nB+4=", + "4.7.0", + "puM9PtfRzhp1Gq+ZxRAhVZqDblN1P2bb8FUnhLkMVsA=", Relocation.of("adventure", "net{}kyori{}adventure") ), EVENT( diff --git a/sponge/build.gradle b/sponge/build.gradle index 9162e0a90..76d45f106 100644 --- a/sponge/build.gradle +++ b/sponge/build.gradle @@ -25,7 +25,6 @@ dependencies { exclude(module: 'configurate-gson') exclude(module: 'configurate-yaml') } - //compileOnly 'me.lucko:adventure-platform-spongeapi:4.0.0' // re: this artifact - see note in common/build.gradle } blossom {