From ec6d5dec6543f8fccb4550275bee25e013d4fe4a Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Fri, 15 Dec 2023 19:53:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20quartz=20=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 4 +++- core-bukkit/build.gradle.kts | 3 ++- core-bungee/build.gradle.kts | 3 ++- core-common/build.gradle.kts | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 4c25a35..57dcea2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "cn.hamster3.mc.plugin" -version = "1.1.1" +version = "1.1.2" subprojects { apply { @@ -49,6 +49,8 @@ subprojects { shadowJar { archiveClassifier = "" destinationDirectory = rootProject.buildDir + relocate("org.quartz", "cn.hamster3.mc.plugin.core.lib.org.quartz") + relocate("org.terracotta.quartz", "cn.hamster3.mc.plugin.core.lib.org.terracotta.quartz") relocate("net.kyori", "cn.hamster3.mc.plugin.core.lib.net.kyori") relocate("com.zaxxer.hikari", "cn.hamster3.mc.plugin.core.lib.com.zaxxer.hikari") relocate("de.tr7zw.changeme.nbtapi", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi") diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts index b9137db..552e21d 100644 --- a/core-bukkit/build.gradle.kts +++ b/core-bukkit/build.gradle.kts @@ -18,9 +18,10 @@ dependencies { exclude(module = "adventure-api") exclude(group = "org.jetbrains") } - implementation("com.zaxxer:HikariCP:4+") { + implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") } + implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } } tasks { diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts index 9f99887..17e5cc7 100644 --- a/core-bungee/build.gradle.kts +++ b/core-bungee/build.gradle.kts @@ -14,9 +14,10 @@ dependencies { exclude(module = "adventure-api") exclude(group = "org.jetbrains") } - implementation("com.zaxxer:HikariCP:4+") { + implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") } + implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } } tasks { diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts index 9f0328d..98cd631 100644 --- a/core-common/build.gradle.kts +++ b/core-common/build.gradle.kts @@ -14,6 +14,7 @@ dependencies { exclude(group = "org.jetbrains") exclude(group = "com.google.code.gson") } + implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } } tasks {