From bc79b1ed48e626184a861591ccc4d423e1a02f8d Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 25 Aug 2023 01:16:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=201.12=20=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ball-bukkit/build.gradle.kts | 1 - build.gradle.kts | 1 + gradle.properties | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ball-bukkit/build.gradle.kts b/ball-bukkit/build.gradle.kts index e86abbf..e71ef3f 100644 --- a/ball-bukkit/build.gradle.kts +++ b/ball-bukkit/build.gradle.kts @@ -12,7 +12,6 @@ dependencies { val redissionVersion = property("redission_version") implementation("org.redisson:redisson:${redissionVersion}") { exclude(group = "io.netty") - exclude(group = "org.yaml") exclude(group = "org.slf4j") } } diff --git a/build.gradle.kts b/build.gradle.kts index fffe567..eb38cd2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,6 +59,7 @@ subprojects { ) } shadowJar { + relocate("org.yaml", "cn.hamster3.mc.plugin.ball.lib.org.yaml") destinationDirectory = rootProject.buildDir } build { diff --git a/gradle.properties b/gradle.properties index 57ab345..9c52522 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx2G +org.gradle.jvmargs=-Xmx8G hamster_core_version=1.1.0-SNAPSHOT redission_version=3.23.2