From edbd873a64e86394a202defc86aa3907d10b2423 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Mon, 19 Feb 2024 14:03:43 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=E4=BF=AE=E5=A4=8D=20netty=20=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E4=BB=A5=E6=94=AF=E6=8C=81=201.12=20=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E4=B8=8B=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 3 ++- core-bukkit/build.gradle.kts | 6 +----- core-bungee/build.gradle.kts | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 571dc74..9f8937e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "cn.hamster3.mc.plugin" -version = "1.2.1" +version = "1.2.2" subprojects { apply { @@ -51,6 +51,7 @@ subprojects { shadowJar { archiveClassifier = "" relocate("io.lettuce", "cn.hamster3.mc.plugin.core.lib.io.lettuce") + relocate("io.netty", "cn.hamster3.mc.plugin.core.lib.io.netty") relocate("reactor", "cn.hamster3.mc.plugin.core.lib.reactor") relocate("org.reactivestreams", "cn.hamster3.mc.plugin.core.lib.org.reactivestreams") diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts index c1f8177..68666fc 100644 --- a/core-bukkit/build.gradle.kts +++ b/core-bukkit/build.gradle.kts @@ -29,11 +29,7 @@ dependencies { exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/io.lettuce/lettuce-core - implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") { - exclude(group = "io.netty") - } - // https://mvnrepository.com/artifact/io.netty/netty-codec-dns - implementation("io.netty:netty-codec-dns:4.1.104.Final") + implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts index deb41ae..8e6dd1e 100644 --- a/core-bungee/build.gradle.kts +++ b/core-bungee/build.gradle.kts @@ -21,9 +21,8 @@ dependencies { exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/io.lettuce/lettuce-core - implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") { - exclude(group = "io.netty") - } + implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") + // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false }