From 08ced2fad817c3aeb6c49cc5de033e77ba8ef90b Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Fri, 11 Jun 2021 20:06:01 +0200 Subject: [PATCH] fix: add pom changes to gradle Signed-off-by: Mariell Hoversholm --- patches/api/Add-FastUtil-to-Bukkit.patch | 12 ++++++++++++ patches/api/POM-changes.patch | 17 +++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/patches/api/Add-FastUtil-to-Bukkit.patch b/patches/api/Add-FastUtil-to-Bukkit.patch index 4e904473c6..2b49ada8de 100644 --- a/patches/api/Add-FastUtil-to-Bukkit.patch +++ b/patches/api/Add-FastUtil-to-Bukkit.patch @@ -5,6 +5,18 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization +diff --git a/build.gradle.kts b/build.gradle.kts +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -0,0 +0,0 @@ dependencies { + api("net.md-5:bungeecord-chat:1.16-R0.4") + api("org.yaml:snakeyaml:1.29") + api("com.googlecode.json-simple:json-simple:1.1.1") // Paper ++ api("it.unimi.dsi:fastutil:8.2.2") + + compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") diff --git a/pom.xml b/pom.xml index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/pom.xml diff --git a/patches/api/POM-changes.patch b/patches/api/POM-changes.patch index 47cb96af58..9c7d8b2c29 100644 --- a/patches/api/POM-changes.patch +++ b/patches/api/POM-changes.patch @@ -4,6 +4,23 @@ Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes +diff --git a/build.gradle.kts b/build.gradle.kts +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -0,0 +0,0 @@ dependencies { + api("com.google.code.gson:gson:2.8.0") + api("net.md-5:bungeecord-chat:1.16-R0.4") + api("org.yaml:snakeyaml:1.29") ++ api("com.googlecode.json-simple:json-simple:1.1.1") // Paper + + compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0") ++ compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper + + val annotations = "org.jetbrains:annotations-java5:21.0.1" + compileOnly(annotations) diff --git a/pom.xml b/pom.xml index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/pom.xml