From aed9ef07886b3ac1a8e142ba6ef22818dc23a2ae Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Thu, 8 Jun 2023 17:22:51 -0700 Subject: [PATCH] Update adventure --- patches/api/0005-Adventure.patch | 4 ++-- patches/api/0007-Use-ASM-for-event-executors.patch | 2 +- patches/api/0008-Paper-Plugins.patch | 2 +- patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index 143272a183..747e4d1dca 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -7,14 +7,14 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 3e571743e76b26167e329dbd0a4c04ffd6427572..0bc5c544723e8ea0dc4441b2198b744b1a38b26b 100644 +index 3e571743e76b26167e329dbd0a4c04ffd6427572..a6001fec6b8ff6a0d41336802d202e005ad2db81 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,13 +8,26 @@ java { withJavadocJar() } -+val adventureVersion = "4.13.1" ++val adventureVersion = "4.14.0" +val apiAndDocs: Configuration by configurations.creating { + attributes { + attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) diff --git a/patches/api/0007-Use-ASM-for-event-executors.patch b/patches/api/0007-Use-ASM-for-event-executors.patch index e3b70b3280..c77657240f 100644 --- a/patches/api/0007-Use-ASM-for-event-executors.patch +++ b/patches/api/0007-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index 0bc5c544723e8ea0dc4441b2198b744b1a38b26b..0270849badc82810c8c288a9bd02efff93b18141 100644 +index a6001fec6b8ff6a0d41336802d202e005ad2db81..a626bbad85f8d1b348d4e67f328f4b0141b267c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,9 @@ dependencies { diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch index 73f0d15f0c..48a2b45dc9 100644 --- a/patches/api/0008-Paper-Plugins.patch +++ b/patches/api/0008-Paper-Plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 0270849badc82810c8c288a9bd02efff93b18141..6d4493850bdb0ec72d480ec60bc5ffef540470d7 100644 +index a626bbad85f8d1b348d4e67f328f4b0141b267c1..b0ca0ddffce2524e82d891c7a4d69d3ef9f2c097 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,7 @@ dependencies { diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch index 8279746f20..60758dc706 100644 --- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index 6d4493850bdb0ec72d480ec60bc5ffef540470d7..7cdc47292a33b303eca4601746cdb1705e9ec20e 100644 +index b0ca0ddffce2524e82d891c7a4d69d3ef9f2c097..4b2330bac734cd07f8798ceeb6d9c67bd3f3521d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,6 +42,8 @@ dependencies {