From cbd578c7b541240f4e9405d4db0fe4270125e873 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 3 Dec 2024 20:50:18 -0700 Subject: [PATCH] Fix api build script deprecation --- patches/api/0006-Adventure.patch | 4 ++-- patches/api/0008-Use-ASM-for-event-executors.patch | 2 +- patches/api/0009-Paper-Plugins.patch | 2 +- patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch | 2 +- patches/api/0464-Brigadier-based-command-API.patch | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index 8e33b0a1db..85e754d099 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -8,7 +8,7 @@ Co-authored-by: Jake Potrebic Co-authored-by: Yannick Lamprecht diff --git a/build.gradle.kts b/build.gradle.kts -index 6457e9e11620b9b77f067e2d45d7fb45235f23d3..b533f386bd42886ca23009821450b20c8614026a 100644 +index 6457e9e11620b9b77f067e2d45d7fb45235f23d3..64f7695cf37e9e60712f8b56d3aee0256e71c8e6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,6 +11,18 @@ java { @@ -84,7 +84,7 @@ index 6457e9e11620b9b77f067e2d45d7fb45235f23d3..b533f386bd42886ca23009821450b20c + doFirst { + options.addStringOption( + "sourcepath", -+ apiAndDocs.resolvedConfiguration.files.joinToString(separator = File.pathSeparator, transform = File::getPath) ++ apiAndDocs.elements.get().map { it.asFile }.joinToString(separator = File.pathSeparator, transform = File::getPath) + ) + } + diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch index 54519e4170..9785ffdf7d 100644 --- a/patches/api/0008-Use-ASM-for-event-executors.patch +++ b/patches/api/0008-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 b533f386bd42886ca23009821450b20c8614026a..60209b1a66db201f7b814269240c15051ce455d7 100644 +index 64f7695cf37e9e60712f8b56d3aee0256e71c8e6..3a026fc8671fee2b99ea0a23a4278453c7fab267 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,6 +59,9 @@ dependencies { diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch index c71a96caf6..d1787fdb4b 100644 --- a/patches/api/0009-Paper-Plugins.patch +++ b/patches/api/0009-Paper-Plugins.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index 60209b1a66db201f7b814269240c15051ce455d7..1d39af929759be70ad86d29b396ea04b06b0d8f1 100644 +index 3a026fc8671fee2b99ea0a23a4278453c7fab267..7529e7ccec282e576a3a297ed870915822f8fedb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,7 +64,7 @@ dependencies { diff --git a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index e931bde01e..2e6321fa4f 100644 --- a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0067-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 1d39af929759be70ad86d29b396ea04b06b0d8f1..4f184bce3e9d030989e89f9f5581894734bf2b2d 100644 +index 7529e7ccec282e576a3a297ed870915822f8fedb..037b94a8b21f8f9408cd833823a1e6e48e22dcd6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,8 @@ java { diff --git a/patches/api/0464-Brigadier-based-command-API.patch b/patches/api/0464-Brigadier-based-command-API.patch index 87cebf7f4e..f08a4d705d 100644 --- a/patches/api/0464-Brigadier-based-command-API.patch +++ b/patches/api/0464-Brigadier-based-command-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Brigadier based command API Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 4f184bce3e9d030989e89f9f5581894734bf2b2d..a5db128a44c81576ab6a59107dba32b0332a76e1 100644 +index 037b94a8b21f8f9408cd833823a1e6e48e22dcd6..8d76f0a8b6b67f0cae0b2fa23f0f79fc9fe97f30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -39,6 +39,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {